a little simplify on deep equality of debuginfo
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/0e1a5780 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/0e1a5780 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/0e1a5780 Branch: refs/heads/master Commit: 0e1a57803e448390be84b53d3b2ebe4494b3f13f Parents: 349eacb Author: fangzhen <[email protected]> Authored: Tue Jul 29 12:06:46 2014 +0800 Committer: fangzhen <[email protected]> Committed: Tue Jul 29 12:06:46 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/compiler_2_0/MigrationTest.java | 2 - .../bpel/obj/migrate/DebugInfoComparator.java | 40 -------------------- .../obj/migrate/ExtensibeImplEqualityComp.java | 12 +++++- 3 files changed, 10 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/0e1a5780/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java ---------------------------------------------------------------------- diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java index 314c036..3051c9b 100644 --- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java +++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/MigrationTest.java @@ -11,7 +11,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.o.Serializer; import org.apache.ode.bpel.obj.OProcess; -import org.apache.ode.bpel.obj.migrate.DebugInfoComparator; import org.apache.ode.bpel.obj.migrate.EqualityVisitor; import org.apache.ode.bpel.obj.migrate.ExtensibeImplEqualityComp; import org.apache.ode.bpel.obj.migrate.OmOld2new; @@ -44,7 +43,6 @@ public class MigrationTest extends GoodCompileTest{ TraverseObject traverse = new TraverseObject(); EqualityVisitor visitor = new EqualityVisitor(nu); visitor.addCustomComparator(new ExtensibeImplEqualityComp(visitor)); - visitor.addCustomComparator(new DebugInfoComparator(visitor)); traverse.accept(visitor); boolean res = (Boolean)traverse.traverseObject(migrated); assertEquals(Boolean.TRUE, res); http://git-wip-us.apache.org/repos/asf/ode/blob/0e1a5780/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DebugInfoComparator.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DebugInfoComparator.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DebugInfoComparator.java deleted file mode 100644 index 9d562ae..0000000 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/DebugInfoComparator.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.ode.bpel.obj.migrate; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.ode.bpel.obj.DebugInfo; - -public class DebugInfoComparator implements EqualityComparator{ - private static final Log __log = LogFactory.getLog(DebugInfoComparator.class); - private EqualityVisitor visitor; - public DebugInfoComparator(EqualityVisitor visitor){ - this.visitor = visitor; - } - - @Override - public Boolean objectsEqual(Object obj1, Object obj2) { - if (!(obj2 instanceof DebugInfo)){ - if (!visitor.logFalseThrough){ - __log.debug("Unequal in DebugInfo, object2 is not a DebugInfo"); - } - return false; - } - DebugInfo o1 = (DebugInfo)obj1; - DebugInfo o2 = (DebugInfo)obj2; - boolean res = o1.getStartLine() == o2.getStartLine() && - o1.getEndLine() == o2.getEndLine() && - o1.getSourceURI().equals(o2.getSourceURI()); - if (!res){ - if (!visitor.logFalseThrough){ - __log.info("Unequal in DebugInfo, " + o1 + " and " + o2); - } - } - return res; - } - - @Override - public Boolean canHanle(Object obj) { - return obj instanceof DebugInfo; - } - -} http://git-wip-us.apache.org/repos/asf/ode/blob/0e1a5780/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java index 14db7d8..1c32e62 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/migrate/ExtensibeImplEqualityComp.java @@ -8,11 +8,12 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.ode.bpel.obj.DebugInfo; import org.apache.ode.bpel.obj.ExtensibleImpl; import org.apache.ode.bpel.obj.OProcess; public class ExtensibeImplEqualityComp implements EqualityComparator{ - private static final Log __log = LogFactory.getLog(DebugInfoComparator.class); + private static final Log __log = LogFactory.getLog(ExtensibeImplEqualityComp.class); private EqualityVisitor visitor; public ExtensibeImplEqualityComp() { @@ -50,13 +51,20 @@ public class ExtensibeImplEqualityComp implements EqualityComparator{ Map m2 = new LinkedHashMap(esio.getFieldContainer()); dehydrate(m1); dehydrate(m2); - if (obj1.getClass() == OProcess.class){ + if (obj1 instanceof OProcess){ dehydrateOProcess(m1); dehydrateOProcess(m2); } + if (obj1 instanceof DebugInfo){ + dehydrateDebugInfo(m1); + dehydrateDebugInfo(m2); + } visitor.setOther(m2); return (Boolean) visitor.getTraverse().traverseObject(m1); } + private void dehydrateDebugInfo(Map m) { + m.remove("description"); + } private void dehydrateOProcess(Map m) { m.remove("compileDate"); }
