Bug fix in DiffGenerator with cycling schema types.

membrane · Aug 21, 2013 · 6b582e4 · 6b582e4
1 parent 5bea005
commit 6b582e4
Show file tree

Hide file tree

Showing 29 changed files with 283 additions and 77 deletions.
diff --git a/core/src/main/groovy/com/predic8/schema/All.groovy b/core/src/main/groovy/com/predic8/schema/All.groovy
@@ -14,7 +14,9 @@
 
 package com.predic8.schema;
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.wstool.creator.*
 
 class All extends ModelGroup {
@@ -30,8 +32,8 @@ class All extends ModelGroup {
     creator.createAll(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareAll(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareAll(this, other, ctx)
   }
 
   String toString(){

diff --git a/core/src/main/groovy/com/predic8/schema/Any.groovy b/core/src/main/groovy/com/predic8/schema/Any.groovy
@@ -14,8 +14,11 @@
 
 package com.predic8.schema;
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.wstool.creator.*
+
 import javax.xml.namespace.QName as JQName
 
 class Any extends SchemaComponent {
@@ -48,8 +51,8 @@ class Any extends SchemaComponent {
     creator.createAny(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareAny(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareAny(this, other, ctx)
   }
 
   String toString(){

diff --git a/core/src/main/groovy/com/predic8/schema/Attribute.groovy b/core/src/main/groovy/com/predic8/schema/Attribute.groovy
@@ -14,8 +14,12 @@
 
 package com.predic8.schema;
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
+
 import groovy.xml.*
+
 import javax.xml.namespace.QName as JQName
 
 class Attribute extends Declaration {
@@ -72,8 +76,8 @@ class Attribute extends Declaration {
     creator.createAttribute(this, ctx)
   }
 
-  def compare(generator, other){
-    generator.compareAttribute(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareAttribute(this, other, ctx)
   }
 
   def getElementName(){

diff --git a/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy b/core/src/main/groovy/com/predic8/schema/BuiltInSchemaType.groovy
@@ -16,7 +16,9 @@
 
 package com.predic8.schema
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext;
+import com.predic8.soamodel.DiffGeneratorContext;
 
 import groovy.xml.QName
 
@@ -38,7 +40,7 @@ class BuiltInSchemaType extends TypeDefinition {
 		throw new RuntimeException('BuiltInSchemaType have to be created by the given creator itself.')
 	}
 
-	def compare(generator, other){
-		generator.compareBuiltInSchemaType(this, other)
+	def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+		generator.compareBuiltInSchemaType(this, other, ctx)
 	}
 }

diff --git a/core/src/main/groovy/com/predic8/schema/Choice.groovy b/core/src/main/groovy/com/predic8/schema/Choice.groovy
@@ -14,7 +14,9 @@
 
 package com.predic8.schema
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.wstool.creator.*
 
 
@@ -29,8 +31,8 @@ class Choice extends ModelGroup{
     creator.createChoice(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareChoice(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareChoice(this, other, ctx)
   }
 
   String toString(){

diff --git a/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy b/core/src/main/groovy/com/predic8/schema/ComplexContent.groovy
@@ -13,10 +13,13 @@
    limitations under the License. */
 
 package com.predic8.schema
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
-
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.schema.restriction.*
+
 import javax.xml.namespace.QName as JQName
+
 import static com.predic8.soamodel.Consts.SCHEMA_NS
 
 class ComplexContent extends SchemaComponent {
@@ -55,8 +58,8 @@ class ComplexContent extends SchemaComponent {
     creator.createComplexContent(this, ctx)
   }
 
-  def compare(generator, other){
-    generator.compareComplexContent(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareComplexContent(this, other, ctx)
   }
 
 

diff --git a/core/src/main/groovy/com/predic8/schema/ComplexType.groovy b/core/src/main/groovy/com/predic8/schema/ComplexType.groovy
@@ -15,12 +15,15 @@
 package com.predic8.schema;
 
 import groovy.xml.*
+
 import javax.xml.namespace.QName as JQName;
 
 import sun.org.mozilla.classfile.internal.SuperBlock;
 
 import com.predic8.wstool.creator.*
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext;
+import com.predic8.soamodel.DiffGeneratorContext;
 
 class ComplexType extends TypeDefinition {
 
@@ -91,8 +94,8 @@ class ComplexType extends TypeDefinition {
     creator.createComplexType(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareComplexType(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareComplexType(this, other, ctx)
   }
 
   Sequence getSequence(){

diff --git a/core/src/main/groovy/com/predic8/schema/Element.groovy b/core/src/main/groovy/com/predic8/schema/Element.groovy
@@ -22,7 +22,9 @@ import org.apache.commons.logging.*
 
 import com.predic8.wstool.creator.*
 import com.predic8.schema.creator.*;
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.xml.util.*
 
 class Element extends Declaration {
@@ -81,8 +83,8 @@ class Element extends Declaration {
     creator.createElement(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareElement(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareElement(this, other, ctx)
   }
 
   String getRequest(formParams){

diff --git a/core/src/main/groovy/com/predic8/schema/GroupRef.groovy b/core/src/main/groovy/com/predic8/schema/GroupRef.groovy
@@ -15,8 +15,12 @@
 package com.predic8.schema;
 
 import groovy.xml.*
+
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.wstool.creator.*
+
 import javax.xml.stream.*
 
 class GroupRef extends SchemaComponent{
@@ -27,8 +31,8 @@ class GroupRef extends SchemaComponent{
     creator.createGroupRef(this, ctx)
   }
 
-  def compare( generator, other ) {
-    generator.compareGroupRef( this, other )
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareGroupRef( this, other, ctx)
   }
 
   public boolean equals(obj) {

diff --git a/core/src/main/groovy/com/predic8/schema/Sequence.groovy b/core/src/main/groovy/com/predic8/schema/Sequence.groovy
@@ -15,7 +15,9 @@
 package com.predic8.schema;
 
 import com.predic8.wstool.creator.*
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 
 class Sequence extends ModelGroup{
 
@@ -28,8 +30,8 @@ class Sequence extends ModelGroup{
     creator.createSequence(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareSequence(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareSequence(this, other, ctx)
   }
 
   String toString(){

diff --git a/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy b/core/src/main/groovy/com/predic8/schema/SimpleContent.groovy
@@ -12,10 +12,14 @@
 package com.predic8.schema
 
 import java.util.List
+
 import javax.xml.namespace.QName as JQName
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.schema.restriction.*
+
 import static com.predic8.soamodel.Consts.SCHEMA_NS
 
 class SimpleContent extends SchemaComponent {
@@ -53,8 +57,8 @@ class SimpleContent extends SchemaComponent {
     creator.createSimpleContent(this, ctx)
   }
 
-  def compare(generator, other){
-    generator.compareSimpleContent(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareSimpleContent(this, other, ctx)
   }
 }
 
diff --git a/core/src/main/groovy/com/predic8/schema/SimpleType.groovy b/core/src/main/groovy/com/predic8/schema/SimpleType.groovy
@@ -18,11 +18,13 @@ import groovy.xml.QName;
 
 import java.util.List;
 
+import com.predic8.soamodel.AbstractDiffGenerator;
 import com.predic8.soamodel.CreatorContext 
+import com.predic8.soamodel.DiffGeneratorContext;
 import com.predic8.wstool.creator.*
 import com.predic8.schema.restriction.*
-import static com.predic8.soamodel.Consts.SCHEMA_NS
 
+import static com.predic8.soamodel.Consts.SCHEMA_NS
 import groovy.xml.*
 
 class SimpleType extends TypeDefinition {
@@ -81,8 +83,8 @@ class SimpleType extends TypeDefinition {
     creator.createSimpleType(this, ctx.clone())
   }
 
-  def compare(generator, other){
-    generator.compareSimpleType(this, other)
+  def compare(AbstractDiffGenerator generator, other, DiffGeneratorContext ctx = new DiffGeneratorContext()){
+    generator.compareSimpleType(this, other, ctx)
   }
 
   String toString(){

diff --git a/core/src/main/groovy/com/predic8/schema/diff/BuiltInSchemaTypeDiffGenerator.groovy b/core/src/main/groovy/com/predic8/schema/diff/BuiltInSchemaTypeDiffGenerator.groovy
@@ -14,10 +14,9 @@
 
 package com.predic8.schema.diff
 
-import java.util.List;
 import com.predic8.soamodel.*
 
-class BuiltInSchemaTypeDiffGenerator {
+class BuiltInSchemaTypeDiffGenerator extends AbstractDiffGenerator {
 
 	def generator
 	def a,b
@@ -35,5 +34,11 @@ class BuiltInSchemaTypeDiffGenerator {
 //		}
 		[]
 	}
+
+
+	@Override
+  protected Object updateLabels() {
+	  return null;
+  }
 }
 
diff --git a/core/src/main/groovy/com/predic8/schema/diff/ComplexContentDiffGenerator.groovy b/core/src/main/groovy/com/predic8/schema/diff/ComplexContentDiffGenerator.groovy
@@ -59,7 +59,7 @@ class ComplexContentDiffGenerator extends AbstractDiffGenerator{
       return [new Difference(description:"${a.derivation.elementName.localPart.capitalize()} ${labelHasChanged}: " , type: 'complexContent', 
 				diffs: [new Difference(description:"ModelGroup has changed from '${a.derivation.model.elementName}' to '${b.derivation.model.elementName}'." , type: 'model', breaks:true, exchange: a.exchange)], exchange: a.exchange)]
     } 
-		def lDiffs = a.derivation.model?.compare(generator, b.derivation.model)
+		def lDiffs = a.derivation.model?.compare(generator, b.derivation.model, ctx.clone())
 		if(lDiffs){
 			return [new Difference(description:"${a.derivation.elementName.localPart.capitalize()} ${labelHasChanged}: " , type: 'complexContent', diffs: lDiffs, exchange: a.exchange)]
 		}

diff --git a/core/src/main/groovy/com/predic8/schema/diff/ComplexTypeDiffGenerator.groovy b/core/src/main/groovy/com/predic8/schema/diff/ComplexTypeDiffGenerator.groovy
@@ -33,7 +33,7 @@ class ComplexTypeDiffGenerator extends UnitDiffGenerator{
   }
 
   List<Difference> compareUnit(){
-    def lDiffs = new AnnotationDiffGenerator(a: a.annotation, b: b.annotation, generator: generator).compare()
+		def lDiffs = new AnnotationDiffGenerator(a: a.annotation, b: b.annotation, generator: generator).compare()
     lDiffs.addAll( compareModel())
     lDiffs
   }
@@ -45,7 +45,7 @@ class ComplexTypeDiffGenerator extends UnitDiffGenerator{
     } else if(a.model) {
 			a.model.exchange.addAll(a.exchange)
 			b.model?.exchange?.addAll(b.exchange)
-      lDiffs.addAll(a.model.compare(generator, b.model ))
+      lDiffs.addAll(a.model.compare(generator, b.model, ctx.clone()))
     }
 
     lDiffs.addAll(generator.compareAttributes(a, b))

diff --git a/core/src/main/groovy/com/predic8/schema/diff/ElementDiffGenerator.groovy b/core/src/main/groovy/com/predic8/schema/diff/ElementDiffGenerator.groovy
@@ -45,8 +45,8 @@ class ElementDiffGenerator extends UnitDiffGenerator {
   }
 
   List<Difference> compareUnit(){
-    log.debug("compareElement")
-    def lDiffs = []
+  	log.debug("compareElement")
+		def lDiffs = []
     lDiffs.addAll(generator.compareAnnotation(a.annotation, b.annotation))
     lDiffs.addAll(compareType())
     lDiffs.addAll(compareMinMaxOccurs())
@@ -73,20 +73,24 @@ class ElementDiffGenerator extends UnitDiffGenerator {
     lDiffs
   }
 
+	//Recursion is possible if an element in the embedded type references a complexType, which returns to the wrapping element of the embedded type.
   private List<Difference> compareEmbeddedType() {
 		a.embeddedType?.exchange.addAll(a.exchange)
 		b.embeddedType?.exchange.addAll(b.exchange)
-    a.embeddedType?.compare(generator, b.embeddedType) ?: []
+    a.embeddedType?.compare(generator, b.embeddedType, ctx.clone()) ?: []
   }
 
+	//Recursion is possible if an element references a type, which returns to the element in further steps.
 	List<Difference> compare4WSDL() {
 		def diffs = []
 		def aT = a.schema.getType(a.type)
 		def bT = b.schema.getType(b.type)
-		if(aT && bT &&a.type == b.type){
+		if(aT && bT && a.type == b.type){
+			//exchange marks the message direction in the using wsdl:operation 
 			aT?.exchange.addAll(a.exchange)
 			bT?.exchange.addAll(b.exchange)
-			diffs.addAll(aT.compare(generator, bT))
+
+			diffs.addAll(aT.compare(generator, bT, ctx.clone()))
 		}
 		diffs
 	}