Minor clean up

FasterXML · Apr 25, 2021 · 02f1a05 · 02f1a05
1 parent 1161d5d
commit 02f1a05
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 100 deletions.
diff --git a/...va/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java b/...va/com/fasterxml/jackson/module/jakarta/xmlbind/JakartaXmlBindAnnotationIntrospector.java
@@ -24,8 +24,8 @@
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.databind.util.Converter;
-import com.fasterxml.jackson.module.jakarta.xmlbind.deser.DataHandlerJsonDeserializer;
-import com.fasterxml.jackson.module.jakarta.xmlbind.ser.DataHandlerJsonSerializer;
+import com.fasterxml.jackson.module.jakarta.xmlbind.deser.DataHandlerDeserializer;
+import com.fasterxml.jackson.module.jakarta.xmlbind.ser.DataHandlerSerializer;
 
 /**
  * Annotation introspector that uses Jakarta Xml Bind annotations
@@ -138,8 +138,8 @@ public JakartaXmlBindAnnotationIntrospector(TypeFactory typeFactory, boolean ign
         /// Data handlers included dynamically, to try to prevent issues on
         // platforms with less than complete support for JAXB API
         try {
-            dataHandlerSerializer = (JsonSerializer<?>) DataHandlerJsonSerializer.class.newInstance();
-            dataHandlerDeserializer = (JsonDeserializer<?>) DataHandlerJsonDeserializer.class.newInstance();
+            dataHandlerSerializer = (JsonSerializer<?>) DataHandlerSerializer.class.newInstance();
+            dataHandlerDeserializer = (JsonDeserializer<?>) DataHandlerDeserializer.class.newInstance();
         } catch (Throwable e) {
             //dataHandlers not supported...
         }

diff --git a/...nd/deser/DataHandlerJsonDeserializer.java → ...mlbind/deser/DataHandlerDeserializer.java b/...nd/deser/DataHandlerJsonDeserializer.java → ...mlbind/deser/DataHandlerDeserializer.java
@@ -13,12 +13,12 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
 
-public class DataHandlerJsonDeserializer
+public class DataHandlerDeserializer
     extends StdScalarDeserializer<DataHandler>
 {
     private static final long serialVersionUID = 1L;
 
-    public DataHandlerJsonDeserializer() { super(DataHandler.class); }
+    public DataHandlerDeserializer() { super(DataHandler.class); }
 
     @Override
     public DataHandler deserialize(JsonParser p, DeserializationContext ctxt)

diff --git a/...mlbind/ser/DataHandlerJsonSerializer.java → ...ta/xmlbind/ser/DataHandlerSerializer.java b/...mlbind/ser/DataHandlerJsonSerializer.java → ...ta/xmlbind/ser/DataHandlerSerializer.java
@@ -18,11 +18,11 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
-public class DataHandlerJsonSerializer extends StdSerializer<DataHandler>
+public class DataHandlerSerializer extends StdSerializer<DataHandler>
 {
     private static final long serialVersionUID = 1L;
 
-    public DataHandlerJsonSerializer() { super(DataHandler.class); }
+    public DataHandlerSerializer() { super(DataHandler.class); }
 
     @Override
     public void serialize(DataHandler value, JsonGenerator jgen, SerializerProvider provider)

diff --git a/.../main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DomElementJsonSerializer.java b/.../main/java/com/fasterxml/jackson/module/jakarta/xmlbind/ser/DomElementJsonSerializer.java