inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix/mnt 22686 allow complex rest action params (#1569)

Browse Source 
* MNT-22686 Allow more complex action params

* MNT-22686 Add email template test

Co-authored-by: pzurek <Piotr.Zurek@hyland.com>
Co-authored-by: Sara Aspery <sara.aspery@alfresco.com>
This commit is contained in:
Kacper Magdziarz
2022-11-23 16:11:48 +01:00
committed by GitHub
parent 38a9f6d3e1
commit a5f16f1b11
5 changed files with 107 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote-api/src/main/java/org/alfresco/rest/api/impl/ActionsImpl.java
View File

@@ -363,13 +363,13 @@ public class ActionsImpl implements Actions
Map.Entry::getValue));
}
private Map<String, Serializable> extractActionParams(org.alfresco.service.cmr.action.ActionDefinition actionDefinition, Map<String, String> params)
private Map<String, Serializable> extractActionParams(org.alfresco.service.cmr.action.ActionDefinition actionDefinition, Map<String, ?> params)
{
Map<String, Serializable> parameterValues = new HashMap<>();
try
{
for (Map.Entry<String, String> entry : params.entrySet())
for (Map.Entry<String, ?> entry : params.entrySet())
{
String propertyName = entry.getKey();
Object propertyValue = entry.getValue();

6
remote-api/src/main/java/org/alfresco/rest/api/model/Action.java
View File

@@ -32,7 +32,7 @@ public class Action
private String id;
private String actionDefinitionId;
private String targetId;
Map<String, String> params;
private Map<String, ?> params;
public String getId()
{
@@ -64,12 +64,12 @@ public class Action
this.targetId = targetId;
}
public Map<String, String> getParams()
public Map<String, ?> getParams()
{
return params;
}
public void setParams(Map<String, String> params)
public void setParams(Map<String, ? extends Object> params)
{
this.params = params;
}

2
remote-api/src/test/java/org/alfresco/rest/api/tests/client/data/Action.java
View File

@@ -78,7 +78,7 @@ public class Action extends org.alfresco.rest.api.model.Action implements Serial
String id = (String) jsonObject.get("id");
String actionDefinitionId = (String) jsonObject.get("actionDefinitionId");
String targetId = (String) jsonObject.get("targetId");
Map<String, String> params = (Map<String, String>) jsonObject.get("params");
Map<String, Object> params = (Map<String, Object>) jsonObject.get("params");
Action action = new Action();
action.setId(id);