trival commit, cleaning code
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/6ff01cfc Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/6ff01cfc Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/6ff01cfc Branch: refs/heads/master Commit: 6ff01cfc3c894c8158dba622087556cd89b3936f Parents: ad1d122 Author: fangzhen <[email protected]> Authored: Sat Jul 26 12:55:09 2014 +0800 Committer: fangzhen <[email protected]> Committed: Sat Jul 26 13:10:30 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/compiler_2_0/GoodCompileTest.java | 28 +------------------- .../java/org/apache/ode/bpel/obj/OBase.java | 2 -- .../java/org/apache/ode/bpel/obj/OScope.java | 1 - 3 files changed, 1 insertion(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/6ff01cfc/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java ---------------------------------------------------------------------- diff --git a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java index cb1dac5..a27fb39 100644 --- a/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java +++ b/bpel-compiler/src/test/java/org/apache/ode/bpel/compiler_2_0/GoodCompileTest.java @@ -19,14 +19,12 @@ package org.apache.ode.bpel.compiler_2_0; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.net.URI; import java.net.URL; import org.apache.ode.bpel.compiler.api.CompileListener; -import org.apache.ode.bpel.obj.OBase; import org.apache.ode.bpel.obj.OProcess; import org.apache.ode.bpel.obj.OProcessWrapper; import org.apache.ode.bpel.obj.serde.OmDeserializer; @@ -34,14 +32,6 @@ import org.apache.ode.bpel.obj.serde.OmSerdeFactory; import org.junit.Assert; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import de.danielbechler.diff.Configuration; -import de.danielbechler.diff.ObjectDiffer; -import de.danielbechler.diff.ObjectDifferFactory; -import de.danielbechler.diff.node.Node; -import de.danielbechler.diff.path.PropertyPath; -import de.danielbechler.diff.visitor.PrintingVisitor; - public class GoodCompileTest extends AbstractCompileTestCase implements CompileListener { public void runTest(String bpel) throws Exception { @@ -54,27 +44,11 @@ public class GoodCompileTest extends AbstractCompileTestCase implements CompileL OProcess origi = _compiler.compile2OProcess(bpelFile, 0); String bpelPath = bpelFile.getAbsolutePath(); String cbpPath = bpelPath.substring(0, bpelPath.lastIndexOf(".")) + ".cbp"; - ByteArrayOutputStream out1 = new ByteArrayOutputStream(); - _compiler._outputStream = out1; _compiler.serializeOProcess(origi, cbpPath); OmDeserializer deserializer = new OmSerdeFactory().createOmDeserializer(new FileInputStream(cbpPath)); OProcessWrapper wrapper = deserializer.deserialize(); - OProcess desered = wrapper.getProcess(); - - String cbpPath2 = bpelPath.substring(0, bpelPath.lastIndexOf(".")) + "_2.cbp"; - ByteArrayOutputStream out2 = new ByteArrayOutputStream(); - _compiler._outputStream = out2; - _compiler.serializeOProcess(desered, cbpPath2); - -// final Configuration configuration = new Configuration(); -// configuration.withoutProperty(PropertyPath.buildWith("nextSibling")); -// configuration.withoutProperty(PropertyPath.buildWith("ownerDocument")); -// configuration.withoutProperty(PropertyPath.buildWith("parentNode")); -// configuration.withCompareToOnlyType(OBase.class); -// ObjectDiffer objectDiffer = ObjectDifferFactory.getInstance(configuration); -// Node root = objectDiffer.compare(desered, origi); -// root.visit(new PrintingVisitor(desered, origi)); + wrapper.getProcess(); } catch (Exception ex) { ex.printStackTrace(); Assert.fail("Compilation did not succeed."); http://git-wip-us.apache.org/repos/asf/ode/blob/6ff01cfc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java index 1e0942e..76b3089 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OBase.java @@ -21,9 +21,7 @@ package org.apache.ode.bpel.obj; import java.io.Serializable; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.ObjectIdGenerators; /** * base class for compiled BPEL objects. It gives some common fields. http://git-wip-us.apache.org/repos/asf/ode/blob/6ff01cfc/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java index 8bd18fb..6c2f602 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/OScope.java @@ -27,7 +27,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.collections.FastArrayList; import org.apache.ode.bpel.obj.OProcess.OProperty; import com.fasterxml.jackson.annotation.JsonCreator;
