improved MigrationTest; change default serialization to JAVA
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/a191003a Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/a191003a Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/a191003a Branch: refs/heads/master Commit: a191003ade103781f2a0420a66449f7a8300edda Parents: 32fa79b Author: fangzhen <[email protected]> Authored: Sat Aug 9 22:14:49 2014 +0800 Committer: fangzhen <[email protected]> Committed: Sat Aug 9 22:14:49 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/compiler_2_0/MigrationTest.java | 20 +++++++------------- .../apache/ode/bpel/obj/serde/DeSerializer.java | 9 +++++---- .../ode/bpel/obj/serde/OmSerdeFactory.java | 2 +- 3 files changed, 13 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/a191003a/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 2afc036..c9e4094 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 @@ -18,6 +18,7 @@ import org.apache.ode.bpel.obj.migrate.ObjectTraverser; import org.apache.ode.bpel.obj.migrate.OmOld2new; import org.apache.ode.bpel.obj.migrate.OmUpgradeVisitor; import org.apache.ode.bpel.obj.migrate.UpgradeChecker; +import org.apache.ode.bpel.obj.serde.DeSerializer; import org.junit.Assert; import org.junit.Test; @@ -40,19 +41,12 @@ public class MigrationTest extends GoodCompileTest{ OProcess nu = _compiler.compile2OProcess(bpelFile, 0); __log.debug("compiled new OProcess " + nu.getFieldContainer()); - org.apache.ode.bpel.o.OProcess old = new Serializer(new FileInputStream(oldCbpFile)).readOProcess(); - OmOld2new mig = new OmOld2new(); - ObjectTraverser mtraverse = new ObjectTraverser(); - mtraverse.accept(mig); - OProcess migrated = (OProcess) mtraverse.traverseObject(old); - __log.debug("migrated new OProcess " + migrated.getFieldContainer()); - //upgrade - OmUpgradeVisitor upgrader = new OmUpgradeVisitor(); - ObjectTraverser traverser = new ObjectTraverser(); - traverser.accept(upgrader); - traverser.traverseObject(migrated); - + DeSerializer deSerializer = new DeSerializer(new FileInputStream(oldCbpFile)); + deSerializer.setWriteBackFile(oldCbpFile); //writeback newest + OProcess migrated = deSerializer.deserialize(); + __log.debug("Read and migrated old OProcess " + migrated.getFieldContainer()); + //check DeepEqualityHelper de = new DeepEqualityHelper(); de.addCustomComparator(new ExtensibeImplEqualityComp()); @@ -61,7 +55,7 @@ public class MigrationTest extends GoodCompileTest{ assertEquals(Boolean.TRUE, res); UpgradeChecker checker = new UpgradeChecker(); - traverser = new ObjectTraverser(); + ObjectTraverser traverser = new ObjectTraverser(); traverser.accept(checker); traverser.traverseObject(migrated); assertEquals(true, checker.isNewest()); http://git-wip-us.apache.org/repos/asf/ode/blob/a191003a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java index 374e676..24ec9fa 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/DeSerializer.java @@ -1,5 +1,6 @@ package org.apache.ode.bpel.obj.serde; +import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; @@ -33,7 +34,7 @@ public class DeSerializer { private File writeBackFile; public DeSerializer(InputStream is) { - this.is = is; + this.is = new BufferedInputStream(is); deserializeHeader(); } @@ -77,12 +78,12 @@ public class DeSerializer { private void deserializeHeader() { try { DataInputStream oin = new DataInputStream(is); - is.mark(OProcessWrapper.CURRENT_MAGIC_NUMBER.length + 2); + oin.mark(OProcessWrapper.CURRENT_MAGIC_NUMBER.length + 2); byte[] magic = new byte[OProcessWrapper.CURRENT_MAGIC_NUMBER.length]; oin.read(magic, 0, magic.length); if (Arrays.equals(Serializer.MAGIC_NUMBER_OFH_20040908, magic) || Arrays.equals(Serializer.MAGIC_NUMBER_OFH_20061101, magic)){ - is.reset(); + oin.reset(); Serializer serializer = new Serializer(is); wrapper.setMagic(magic); wrapper.setGuid(serializer.guid); @@ -113,6 +114,7 @@ public class DeSerializer { factory.setFormat(wrapper.getFormat()); OmDeserializer de = factory.createOmDeserializer(is); OProcess process = de.deserialize(); + wrapper.setProcess(process); //upgrade UpgradeChecker checker = new UpgradeChecker(); ObjectTraverser traverser = new ObjectTraverser(); @@ -127,7 +129,6 @@ public class DeSerializer { writeBack(); } } - wrapper.setProcess(process); return process; } http://git-wip-us.apache.org/repos/asf/ode/blob/a191003a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/OmSerdeFactory.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/OmSerdeFactory.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/OmSerdeFactory.java index baf967c..81941bf 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/OmSerdeFactory.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/OmSerdeFactory.java @@ -7,7 +7,7 @@ import org.apache.ode.bpel.obj.OProcess; import org.apache.ode.bpel.obj.migrate.LegacySerializerAdapter; public class OmSerdeFactory { - public static final SerializeFormat FORMAT_SERIALIZED_DEFAULT = SerializeFormat.FORMAT_SERIALIZED_SMILE; + public static final SerializeFormat FORMAT_SERIALIZED_DEFAULT = SerializeFormat.FORMAT_SERIALIZED_JAVA; private SerializeFormat format = FORMAT_SERIALIZED_DEFAULT;
