fix #932

brunobuzzi · Oct 11, 2019 · cc81208 · cc81208
1 parent 8de131a
commit cc81208
Show file tree

Hide file tree

Showing 51 changed files with 111 additions and 170 deletions.
diff --git a/...e.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptComplexGateway..st b/...e.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptComplexGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptComplexGateway: aBpmComplexGatewayDefinition
+acceptComplexGateway: aBpmComplexGatewayDefinition
+
+	self acceptGateway: aBpmComplexGatewayDefinition
diff --git a/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptEventBasedGateway..st b/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptEventBasedGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptEventBasedGateway: aBpmEventBasedGatewayDefinition
+acceptEventBasedGateway: aBpmEventBasedGatewayDefinition
+
+	self acceptGateway: aBpmEventBasedGatewayDefinition
diff --git a/...mFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptExclusiveEventBasedGateway..st b/...mFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptExclusiveEventBasedGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptExclusiveEventBasedGateway: aBpmExclusiveEventBasedGatewayDefinition
+acceptExclusiveEventBasedGateway: aBpmExclusiveEventBasedGatewayDefinition
+
+	self acceptGateway: aBpmExclusiveEventBasedGatewayDefinition
diff --git a/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptExclusiveGateway..st b/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptExclusiveGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptExclusiveGateway: aBpmExclusiveGatewayDefinition
+acceptExclusiveGateway: aBpmExclusiveGatewayDefinition
+
+	self acceptGateway: aBpmExclusiveGatewayDefinition
diff --git a/.../BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptGateway..st b/.../BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptGateway: aBpmGatewayDefinition
+acceptGateway: aBpmGatewayDefinition
+
+	aBpmGatewayDefinition outTransitions do: [:each | each acceptVisitor: self].
diff --git a/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptInclusiveGateway..st b/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptInclusiveGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptInclusiveGateway: aBpmInclusiveGatewayDefinition
+acceptInclusiveGateway: aBpmInclusiveGatewayDefinition
+
+	self acceptGateway: aBpmInclusiveGatewayDefinition
diff --git a/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptIntermediateEvent..st b/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptIntermediateEvent..st
@@ -1,2 +1,4 @@
 events
-acceptIntermediateEvent: aBpmIntermediateComponentDefinition
+acceptIntermediateEvent: aBpmIntermediateComponentDefinition
+
+	aBpmIntermediateComponentDefinition eventDefinition outTransitions do: [:transition | transition acceptVisitor: self]
diff --git a/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptOrbeonTask..st b/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptOrbeonTask..st
@@ -1,2 +1,4 @@
 tasks
-acceptOrbeonTask: aBpmOrbeonTaskDefinition
+acceptOrbeonTask: aBpmOrbeonTaskDefinition
+
+	self acceptTask: aBpmOrbeonTaskDefinition
diff --git a/...pmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptParallelEventBasedGateway..st b/...pmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptParallelEventBasedGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptParallelEventBasedGateway: aBpmParallelEventBasedGatewayDefinition
+acceptParallelEventBasedGateway: aBpmParallelEventBasedGatewayDefinition
+
+	self acceptGateway: aBpmParallelEventBasedGatewayDefinition
diff --git a/....package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptParallelGateway..st b/....package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptParallelGateway..st
@@ -1,2 +1,4 @@
 gateways
-acceptParallelGateway: aBpmParallelGatewayDefinition
+acceptParallelGateway: aBpmParallelGatewayDefinition
+
+	self acceptGateway: aBpmParallelGatewayDefinition
diff --git a/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptScriptTask..st b/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptScriptTask..st
@@ -1,2 +1,4 @@
 tasks
-acceptScriptTask: aBpmScriptTaskDefinition
+acceptScriptTask: aBpmScriptTaskDefinition
+
+	self acceptTask: aBpmScriptTaskDefinition
diff --git a/...Core.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSeasideTask..st b/...Core.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSeasideTask..st
@@ -1,2 +1,4 @@
 tasks
-acceptSeasideTask: aBpmSeasideTaskDefinition
+acceptSeasideTask: aBpmSeasideTaskDefinition
+
+	self acceptTask: aBpmSeasideTaskDefinition
diff --git a/...BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSendTask..st b/...BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSendTask..st
@@ -1,2 +1,4 @@
 tasks
-acceptSendTask: aBpmSendTaskDefinition
+acceptSendTask: aBpmSendTaskDefinition
+
+	self acceptTask: aBpmSendTaskDefinition
diff --git a/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptStartEvent..st b/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptStartEvent..st
@@ -1,2 +1,4 @@
 events
-acceptStartEvent: aBpmStartComponentDefinition
+acceptStartEvent: aBpmStartComponentDefinition
+
+	aBpmStartComponentDefinition eventDefinition outTransitions do: [:transition | transition acceptVisitor: self]
diff --git a/...e.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSubProcessTask..st b/...e.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptSubProcessTask..st
@@ -1,2 +1,4 @@
 tasks
-acceptSubProcessTask: aBpmSubProcessTaskDefinition
+acceptSubProcessTask: aBpmSubProcessTaskDefinition
+
+	self acceptTask: aBpmSubProcessTaskDefinition
diff --git a/...ory/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptTask..st b/...ory/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptTask..st
@@ -1,2 +1,11 @@
 tasks
-acceptTask: aBpmAbstractTaskDefinition
+acceptTask: aBpmAbstractTaskDefinition
+
+	(visitedTasks identityIncludes: aBpmAbstractTaskDefinition) ifTrue: [^self].
+
+	visitedTasks add: aBpmAbstractTaskDefinition.
+
+	aBpmAbstractTaskDefinition outTransitions do: [:each | each acceptVisitor: self].
+
+	aBpmAbstractTaskDefinition isTaskDefinition
+	ifTrue: [aBpmAbstractTaskDefinition attachedEvents do: [:each | each acceptVisitor: self]].
diff --git a/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptTransition..st b/...mCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/acceptTransition..st
@@ -1,2 +1,15 @@
 transition
-acceptTransition: aBpmTransitionDefinition
+acceptTransition: aBpmTransitionDefinition
+	"The receiver accept the transition <aBpmTransitionDefinition> and check if it has a condition.
+	Get all fields used in the condition and search in all <visitedTasks> for the used field.
+	If the field is not found --> the condition is going to fail"
+
+	(visitedTransitions identityIncludes: aBpmTransitionDefinition) ifTrue: [^self].
+
+	visitedTransitions add: aBpmTransitionDefinition.
+	aBpmTransitionDefinition getUsedFieldsNamesInCondition do: [:fieldName | 
+		((visitedTasks select: [:each | each isOrbeonTask or:[each isSeasideTask]]) anySatisfy: [:task | task getComponentClass getFieldsNames includes: fieldName]) 
+		ifFalse: [missingEvaluationFields add: fieldName].
+	].
+
+	aBpmTransitionDefinition endArtifact acceptVisitor: self.
diff --git a/...kage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/hasMissingEvaluationFields.st b/...kage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/hasMissingEvaluationFields.st
@@ -0,0 +1,4 @@
+other
+hasMissingEvaluationFields
+
+	^missingEvaluationFields size
diff --git a/...lyzerVisitor.class/instance/initialize.st → ...tewayVisitor.class/instance/initialize.st b/...lyzerVisitor.class/instance/initialize.st → ...tewayVisitor.class/instance/initialize.st
diff --git a/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/missingEvaluationFields..st b/...ackage/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/missingEvaluationFields..st
@@ -0,0 +1,3 @@
+Updating
+missingEvaluationFields: newValue
+	missingEvaluationFields := newValue
diff --git a/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/missingEvaluationFields.st b/...package/BpmFieldsInCondtionsAfterGatewayVisitor.class/instance/missingEvaluationFields.st
@@ -0,0 +1,3 @@
+Accessing
+missingEvaluationFields
+	^missingEvaluationFields
diff --git a/...erVisitor.class/instance/visitedTasks..st → ...ayVisitor.class/instance/visitedTasks..st b/...erVisitor.class/instance/visitedTasks..st → ...ayVisitor.class/instance/visitedTasks..st
diff --git a/...zerVisitor.class/instance/visitedTasks.st → ...wayVisitor.class/instance/visitedTasks.st b/...zerVisitor.class/instance/visitedTasks.st → ...wayVisitor.class/instance/visitedTasks.st
diff --git a/...tor.class/instance/visitedTransitions..st → ...tor.class/instance/visitedTransitions..st b/...tor.class/instance/visitedTransitions..st → ...tor.class/instance/visitedTransitions..st
diff --git a/...itor.class/instance/visitedTransitions.st → ...itor.class/instance/visitedTransitions.st b/...itor.class/instance/visitedTransitions.st → ...itor.class/instance/visitedTransitions.st
diff --git a/...itory/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/methodProperties.json b/...itory/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/methodProperties.json
@@ -2,21 +2,29 @@
 	"class" : {
 		 },
 	"instance" : {
-		"acceptComplexGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptEndEvent:" : "brunobb 08/14/2019 13:01",
-		"acceptEventBasedGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptExclusiveEventBasedGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptExclusiveGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptInclusiveGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptIntermediateEvent:" : "brunobb 08/14/2019 13:01",
-		"acceptOrbeonTask:" : "brunobb 08/14/2019 13:01",
-		"acceptParallelEventBasedGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptParallelGateway:" : "brunobb 08/14/2019 13:01",
-		"acceptScriptTask:" : "brunobb 08/14/2019 13:01",
-		"acceptSeasideTask:" : "brunobb 08/14/2019 13:01",
-		"acceptSendTask:" : "brunobb 08/14/2019 13:01",
-		"acceptStartEvent:" : "brunobb 08/14/2019 13:01",
-		"acceptSubProcessTask:" : "brunobb 08/14/2019 13:01",
-		"acceptTask:" : "brunobb 10/09/2019 13:21",
-		"acceptTransition:" : "brunobb 08/14/2019 13:01" } }
+		"acceptComplexGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptEndEvent:" : "brunobb 10/11/2019 06:47",
+		"acceptEventBasedGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptExclusiveEventBasedGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptExclusiveGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptInclusiveGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptIntermediateEvent:" : "brunobb 10/11/2019 06:47",
+		"acceptOrbeonTask:" : "brunobb 10/11/2019 06:47",
+		"acceptParallelEventBasedGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptParallelGateway:" : "brunobb 10/11/2019 06:47",
+		"acceptScriptTask:" : "brunobb 10/11/2019 06:47",
+		"acceptSeasideTask:" : "brunobb 10/11/2019 06:47",
+		"acceptSendTask:" : "brunobb 10/11/2019 06:47",
+		"acceptStartEvent:" : "brunobb 10/11/2019 06:47",
+		"acceptSubProcessTask:" : "brunobb 10/11/2019 06:47",
+		"acceptTask:" : "brunobb 10/11/2019 06:47",
+		"acceptTransition:" : "brunobb 10/11/2019 06:47",
+		"hasMissingEvaluationFields" : "brunobb 10/11/2019 06:47",
+		"initialize" : "brunobb 10/11/2019 06:47",
+		"missingEvaluationFields" : "brunobb 10/11/2019 06:47",
+		"missingEvaluationFields:" : "brunobb 10/11/2019 06:47",
+		"visitedTasks" : "brunobb 10/11/2019 06:47",
+		"visitedTasks:" : "brunobb 10/11/2019 06:47",
+		"visitedTransitions" : "brunobb 10/11/2019 06:47",
+		"visitedTransitions:" : "brunobb 10/11/2019 06:47" } }
diff --git a/repository/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/properties.json b/repository/BpmCore.package/BpmFieldsInCondtionsAfterGatewayVisitor.class/properties.json
@@ -6,7 +6,9 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		 ],
+		"visitedTasks",
+		"visitedTransitions",
+		"missingEvaluationFields" ],
 	"name" : "BpmFieldsInCondtionsAfterGatewayVisitor",
 	"pools" : [
 		 ],

diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/README.md b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/README.md
diff --git a/...ory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptComplexGateway..st b/...ory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptComplexGateway..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptEndEvent..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptEndEvent..st
diff --git a/.../BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptEventBasedGateway..st b/.../BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptEventBasedGateway..st
diff --git a/...package/BpmProcessPathAnalyzerVisitor.class/instance/acceptExclusiveEventBasedGateway..st b/...package/BpmProcessPathAnalyzerVisitor.class/instance/acceptExclusiveEventBasedGateway..st
diff --git a/...y/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptExclusiveGateway..st b/...y/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptExclusiveGateway..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptGateway..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptGateway..st
diff --git a/...y/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptInclusiveGateway..st b/...y/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptInclusiveGateway..st
diff --git a/.../BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptIntermediateEvent..st b/.../BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptIntermediateEvent..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptOrbeonTask..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptOrbeonTask..st
diff --git a/....package/BpmProcessPathAnalyzerVisitor.class/instance/acceptParallelEventBasedGateway..st b/....package/BpmProcessPathAnalyzerVisitor.class/instance/acceptParallelEventBasedGateway..st
diff --git a/...ry/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptParallelGateway..st b/...ry/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptParallelGateway..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptScriptTask..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptScriptTask..st
diff --git a/...sitory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSeasideTask..st b/...sitory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSeasideTask..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSendTask..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSendTask..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptStartEvent..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptStartEvent..st
diff --git a/...ory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSubProcessTask..st b/...ory/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptSubProcessTask..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptTask..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptTask..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptTransition..st b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/instance/acceptTransition..st
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/methodProperties.json b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/methodProperties.json
diff --git a/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/properties.json b/repository/BpmCore.package/BpmProcessPathAnalyzerVisitor.class/properties.json
diff --git a/repository/BpmCore.package/monticello.meta/version b/repository/BpmCore.package/monticello.meta/version