[CXF-6711] Remove old deserialization code which was very difficult to enable and didn't work correctly anyway.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/894a1b17 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/894a1b17 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/894a1b17 Branch: refs/heads/3.0.x-fixes Commit: 894a1b175217f90de1279429243241db5d026539 Parents: b3ccbb9 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Dec 15 16:14:24 2015 -0500 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Dec 15 16:24:01 2015 -0500 ---------------------------------------------------------------------- .../apache/cxf/aegis/type/basic/ObjectType.java | 30 -------------------- .../cxf/aegis/type/encoded/TrailingBlocks.java | 1 - 2 files changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/894a1b17/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java index 435c2f8..8bf15de 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java @@ -54,7 +54,6 @@ public class ObjectType extends AegisType { private static final QName XSI_NIL = new QName(Constants.URI_2001_SCHEMA_XSI, "nil"); private Set<AegisType> dependencies; - private boolean serializedWhenUnknown; private boolean readToDocument; @SuppressWarnings("unchecked") @@ -67,14 +66,8 @@ public class ObjectType extends AegisType { this(dependencies, false); } - @SuppressWarnings("unchecked") - public ObjectType(boolean serializeWhenUnknown) { - this(Collections.EMPTY_SET, serializeWhenUnknown); - } - public ObjectType(Set<AegisType> dependencies, boolean serializeWhenUnknown) { this.dependencies = dependencies; - this.serializedWhenUnknown = serializeWhenUnknown; } @Override @@ -132,11 +125,6 @@ public class ObjectType extends AegisType { } if (null == type) { - // TODO should check namespace as well.. - if (serializedWhenUnknown && "serializedJavaObject".equals(typeName)) { - return reconstituteJavaObject(reader); - } - throw new DatabindingException("No mapped type for '" + typeName + "' (" + typeQName + ")"); } @@ -241,14 +229,6 @@ public class ObjectType extends AegisType { this.readToDocument = readToDocument; } - public boolean isSerializedWhenUnknown() { - return serializedWhenUnknown; - } - - public void setSerializedWhenUnknown(boolean serializedWhenUnknown) { - this.serializedWhenUnknown = serializedWhenUnknown; - } - public void setDependencies(Set<AegisType> dependencies) { this.dependencies = dependencies; } @@ -263,14 +243,4 @@ public class ObjectType extends AegisType { return true; } - @Override - public void writeSchema(XmlSchema root) { - if (serializedWhenUnknown) { - XmlSchemaSimpleType simple = new XmlSchemaSimpleType(root, true); - simple.setName("serializedJavaObject"); - XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction(); - simple.setContent(restriction); - restriction.setBaseTypeName(Constants.XSD_BASE64); - } - } } http://git-wip-us.apache.org/repos/asf/cxf/blob/894a1b17/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java ---------------------------------------------------------------------- diff --git a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java index 2c95897..b7cdee3 100644 --- a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java +++ b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java @@ -48,7 +48,6 @@ public class TrailingBlocks { // we only work with mapped types objectType = new ObjectType(); objectType.setReadToDocument(false); - objectType.setSerializedWhenUnknown(false); } public TrailingBlocks(TypeMapping typeMapping) {