Commit8399ff3

authored

Merge pull request#647 from fjtirado/Fix_combine

Ensure not workflowmodel is returned within a Map or Collection

2 parentsf08c840 +70e4f52 commit8399ff3Copy full SHA for 8399ff3

File tree

+23

-7

lines changed

+23

-7

lines changed

Lines changed: 18 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,12 @@`
`21`	`21`	`importjava.util.Collection;`
`22`	`22`	`importjava.util.Collections;`
`23`	`23`	`importjava.util.Map;`
	`24`	`+importjava.util.Map.Entry;`
`24`	`25`	`importjava.util.Optional;`
`25`	`26`	`importjava.util.function.BiConsumer;`
	`27`	`+importjava.util.stream.Collectors;`
`26`	`28`
`27`		`-publicclassJavaModelimplementsWorkflowModel {`
	`29`	`+classJavaModelimplementsWorkflowModel {`
`28`	`30`
`29`	`31`	`privateObjectobject;`
`30`	`32`
`@@ -33,7 +35,7 @@ public class JavaModel implements WorkflowModel {`
`33`	`35`	`staticfinalJavaModelNullModel =newJavaModel(null);`
`34`	`36`
`35`	`37`	`JavaModel(Objectobject) {`
`36`		`-this.object =object;`
	`38`	`+this.object =asJavaObject(object);`
`37`	`39`	`}`
`38`	`40`
`39`	`41`	`@Override`
`@@ -89,6 +91,20 @@ public Object asJavaObject() {`
`89`	`91`	`returnobject;`
`90`	`92`	`}`
`91`	`93`
	`94`	`+staticObjectasJavaObject(Objectobject) {`
	`95`	`+if (objectinstanceofWorkflowModelmodel) {`
	`96`	`+returnmodel.asJavaObject();`
	`97`	`+ }elseif (objectinstanceofMapmap) {`
	`98`	`+return ((Map<String,Object>)map)`
	`99`	`+ .entrySet().stream()`
	`100`	`+ .collect(Collectors.toMap(Entry::getKey,e ->asJavaObject(e.getValue())));`
	`101`	`+ }elseif (objectinstanceofCollectioncol) {`
	`102`	`+returncol.stream().map(JavaModel::asJavaObject).collect(Collectors.toList());`
	`103`	`+ }else {`
	`104`	`+returnobject;`
	`105`	`+ }`
	`106`	`+ }`
	`107`	`+`
`92`	`108`	`@Override`
`93`	`109`	`publicObjectasIs() {`
`94`	`110`	`returnobject;`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`importjava.util.Iterator;`
`23`	`23`	`importjava.util.Optional;`
`24`	`24`
`25`		`-publicclassJavaModelCollectionimplementsCollection<WorkflowModel>,WorkflowModelCollection {`
	`25`	`+classJavaModelCollectionimplementsCollection<WorkflowModel>,WorkflowModelCollection {`
`26`	`26`
`27`	`27`	`privatefinalCollectionobject;`
`28`	`28`
`@@ -31,7 +31,7 @@ public class JavaModelCollection implements Collection<WorkflowModel>, WorkflowM`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`JavaModelCollection(Collection<?>object) {`
`34`		`-this.object =object;`
	`34`	`+this.object =(Collection)JavaModel.asJavaObject(object);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@Override`
`@@ -86,12 +86,12 @@ public <T> T[] toArray(T[] a) {`
`86`	`86`
`87`	`87`	`@Override`
`88`	`88`	`publicbooleanadd(WorkflowModele) {`
`89`		`-returnobject.add(e.asIs());`
	`89`	`+returnobject.add(e.asJavaObject());`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@Override`
`93`	`93`	`publicbooleanremove(Objecto) {`
`94`		`-returnobject.remove(((WorkflowModel)o).asIs());`
	`94`	`+returnobject.remove(((WorkflowModel)o).asJavaObject());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`@Override`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`importjava.time.OffsetDateTime;`
`24`	`24`	`importjava.util.Map;`
`25`	`25`
`26`		`-publicclassJavaModelFactoryimplementsWorkflowModelFactory {`
	`26`	`+classJavaModelFactoryimplementsWorkflowModelFactory {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`publicWorkflowModelcombine(Map<String,WorkflowModel>workflowVariables) {`

Comments

(0)