Removed unnecessary code of jackson SerializerModifier. Removed deps to custom jackson-bind fork
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c4c7ed66 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c4c7ed66 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c4c7ed66 Branch: refs/heads/ODE-912 Commit: c4c7ed668ce5e0012e50772da2497cf9cae218c0 Parents: 7899f73 Author: fangzhen <[email protected]> Authored: Mon Aug 11 13:14:35 2014 +0800 Committer: fangzhen <[email protected]> Committed: Mon Aug 11 13:14:35 2014 +0800 ---------------------------------------------------------------------- .../ode/bpel/obj/serde/JsonOmDeserializer.java | 23 ++++-------- .../ode/bpel/obj/serde/JsonOmSerializer.java | 38 -------------------- 2 files changed, 7 insertions(+), 54 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/c4c7ed66/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java index e5e4efc..e9f955d 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmDeserializer.java @@ -118,15 +118,6 @@ public class JsonOmDeserializer implements OmDeserializer { this.is = is; } - public static class OModelDeserModifier extends BeanDeserializerModifier { - @Override - public JsonDeserializer<?> modifyDeserializer( - DeserializationConfig config, BeanDescription beanDesc, - JsonDeserializer<?> deserializer) { - return deserializer; - } - } - public static class OperationTypeDeserializer extends StdScalarDeserializer<OperationType> { private static final long serialVersionUID = 2015036061829834379L; @@ -256,27 +247,27 @@ public class JsonOmDeserializer implements OmDeserializer { return propDefs; } Iterator<BeanPropertyDefinition> itor = propDefs.iterator(); - POJOPropertyBuilder modified = null; while(itor.hasNext()){ BeanPropertyDefinition prop = itor.next(); if (prop.getName().equalsIgnoreCase("extensibilityElements")){ - modified = new POJOPropertyBuilder((POJOPropertyBuilder)prop, new PropertyName("extElements")); try { AnnotatedField f = new AnnotatedField(AbstractWSDLElement.class.getDeclaredField("extElements"), null); - modified.addField(f, new PropertyName("extElements"), false, true, false); + ((POJOPropertyBuilder)prop).addField(f, new PropertyName("extElements"), false, true, false); } catch (NoSuchFieldException e) { SerializaionRtException e1 = new SerializaionRtException( "cann't find field, probably implementation of AbstractWSDLElement has changed"); e1.initCause(e); throw e1; + } catch (ClassCastException e){ + SerializaionRtException e1 = new SerializaionRtException( + "Cast to POJOPropertyBuilder failde, probably underlying impl of " + + "BeanPropertyDefinition has changed"); + e1.initCause(e); + throw e1; } - itor.remove(); break; } } - if (modified != null){ - propDefs.add(modified); - } return propDefs; } } http://git-wip-us.apache.org/repos/asf/ode/blob/c4c7ed66/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java ---------------------------------------------------------------------- diff --git a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java index db73328..69c5c4b 100644 --- a/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java +++ b/bpel-nobj/src/main/java/org/apache/ode/bpel/obj/serde/JsonOmSerializer.java @@ -5,8 +5,6 @@ import java.io.OutputStream; import java.lang.reflect.Field; import java.lang.reflect.Type; import java.util.HashMap; -import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Vector; @@ -23,21 +21,15 @@ import org.w3c.dom.Element; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.io.SerializedString; -import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; -import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; import com.fasterxml.jackson.databind.ser.std.StdScalarSerializer; import com.fasterxml.jackson.module.jaxb.ser.DomElementJsonSerializer; -import com.ibm.wsdl.AbstractWSDLElement; import com.ibm.wsdl.MessageImpl; @@ -85,7 +77,6 @@ public class JsonOmSerializer implements OmSerializer { } simpleModule.addKeySerializer(Object.class, new KeyAsJsonSerializer()); - simpleModule.setSerializerModifier(new WsdlElementSerModifier()); mapper.registerModule(simpleModule); mapper.enable(SerializationFeature.INDENT_OUTPUT); @@ -212,33 +203,4 @@ public class JsonOmSerializer implements OmSerializer { } - public static class WsdlElementSerModifier extends BeanSerializerModifier{ - public static class MyBeanPropertyWriter extends BeanPropertyWriter{ - public MyBeanPropertyWriter(BeanPropertyWriter origi, String newName){ - super(origi, new SerializedString(newName)); - } - } - public List<BeanPropertyWriter> changeProperties(SerializationConfig config, - BeanDescription beanDesc, - List<BeanPropertyWriter> beanProperties){ - if (!AbstractWSDLElement.class.isAssignableFrom(beanDesc.getBeanClass())) { - return beanProperties; - } - Iterator<BeanPropertyWriter> itor = beanProperties.iterator(); - BeanPropertyWriter modified = null; - while(itor.hasNext()){ - BeanPropertyWriter prop = itor.next(); - if (prop.getName().equalsIgnoreCase("extensibilityElements")){ - modified = new MyBeanPropertyWriter(prop, "extElements"); - itor.remove(); - - break; - } - } - if (modified != null){ - beanProperties.add(modified); - } - return beanProperties; - } - } }
