Fix #115

Author: cowtowncoder

jaxb/src/main/java/com/fasterxml/jackson/module/jaxb/JaxbAnnotationIntrospector.java

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.module.jaxb;
 
-import java.beans.Introspector;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
 import java.util.*;
@@ -19,7 +18,6 @@
 import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.fasterxml.jackson.databind.util.BeanUtil;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 import com.fasterxml.jackson.databind.util.Converter;
 import com.fasterxml.jackson.module.jaxb.deser.DataHandlerJsonDeserializer;
@@ -307,11 +305,11 @@ public ObjectIdInfo findObjectIdInfo(Annotated ann)
             switch (m.getParameterCount()) {
             case 0: // getter
                 idPropName = findJaxbPropertyName(m, m.getRawType(),
-                        okNameForGetter(m));
+                        _okNameForGetter(m));
                 break method_loop;
             case 1: // setter
                 idPropName = findJaxbPropertyName(m, m.getRawType(),
-                        okNameForMutator(m));
+                        _okNameForMutator(m));
                 break method_loop;
             }
         }
@@ -451,9 +449,9 @@ public PropertyName findWrapperName(Annotated ann)
                     AnnotatedMethod am = (AnnotatedMethod) ann;
                     String str;
                     if (am.getParameterCount() == 0) {
-                        str = okNameForGetter(am);
+                        str = _okNameForGetter(am);
                     } else {
-                        str = okNameForMutator(am);
+                        str = _okNameForMutator(am);
                     }
                     if (str != null) {
                         return name.withSimpleName(str);
@@ -648,7 +646,7 @@ public List<NamedType> findSubtypes(Annotated a)
                             }
                         }
                         if (name == null || MARKER_FOR_DEFAULT.equals(name)) {
-                            name = Introspector.decapitalize(refType.getSimpleName());
+                            name = _decapitalize(refType.getSimpleName());
                         }
                         result.add(new NamedType(refType, name));
                     }
@@ -921,7 +919,7 @@ public PropertyName findNameForSerialization(Annotated a)
         if (a instanceof AnnotatedMethod) {
             AnnotatedMethod am = (AnnotatedMethod) a;
             return isVisible(am)
-                ? findJaxbPropertyName(am, am.getRawType(), okNameForGetter(am))
+                ? findJaxbPropertyName(am, am.getRawType(), _okNameForGetter(am))
                 : null;
         }
         if (a instanceof AnnotatedField) {
@@ -1118,7 +1116,7 @@ public PropertyName findNameForDeserialization(Annotated a)
                 return null;
             }
             Class<?> rawType = am.getRawParameterType(0);
-            return findJaxbPropertyName(am, rawType, okNameForMutator(am));
+            return findJaxbPropertyName(am, rawType, _okNameForMutator(am));
         }
         if (a instanceof AnnotatedField) {
             AnnotatedField af = (AnnotatedField) a;
@@ -1333,7 +1331,7 @@ private PropertyName findJaxbPropertyName(Annotated ae, Class<?> aeType, String
                         return _combineNames(name, rootElement.namespace(), defaultName);
                     }
                     // Is there a namespace there to use? Probably not?
-                    return new PropertyName(Introspector.decapitalize(aeType.getSimpleName()));
+                    return new PropertyName(_decapitalize(aeType.getSimpleName()));
                 }
             }
         }
@@ -1577,29 +1575,29 @@ protected Class<?> _getTypeFromXmlElement(Annotated a) {
     /**********************************************************
      */
 
-    protected String okNameForGetter(AnnotatedMethod am) {
+    protected String _okNameForGetter(AnnotatedMethod am) {
         final String name = am.getName();
         if (name.startsWith("is")) { // plus, must return a boolean
             Class<?> rt = am.getRawType();
             if (rt == Boolean.class || rt == Boolean.TYPE) {
-                return stdManglePropertyName(name, 2);
+                return _stdManglePropertyName(name, 2);
             }
         }
         if (name.startsWith("get")) {
-            return stdManglePropertyName(name, 3);
+            return _stdManglePropertyName(name, 3);
         }
         return null;
     }
 
-    protected String okNameForMutator(AnnotatedMethod am) {
+    protected String _okNameForMutator(AnnotatedMethod am) {
         final String name = am.getName();
         if (name.startsWith("set")) {
-            return stdManglePropertyName(name, 3);
+            return _stdManglePropertyName(name, 3);
         }
         return null;
     }
 
-    protected String stdManglePropertyName(final String basename, final int offset)
+    protected String _stdManglePropertyName(final String basename, final int offset)
     {
         final int end = basename.length();
         if (end == offset) { // empty name, nope
@@ -1625,4 +1623,27 @@ protected String stdManglePropertyName(final String basename, final int offset)
         return sb.toString();
     }
 
+    // 02-Nov-2020, tatu: Does not seem to be covered by any unit tests that
+    //    fail if we simply returned "name" as-is.... ?!
+    // @since 2.12: to remove `java.beans.Introspector.decapitalize(...)` dependency
+    protected String _decapitalize(String name) {
+        if (name.length() > 0) {
+            final char firstOrig = name.charAt(0);
+            final char firstLC = Character.toLowerCase(firstOrig);
+
+            // Lower-case first character if not already lower-case and
+            // is not followed by another upper-case character
+            if (firstOrig != firstLC) {
+                if (name.length() == 1) {
+                    return String.valueOf(firstLC);
+                }
+                if (!Character.isUpperCase(name.charAt(1))) {
+                    char chars[] = name.toCharArray();
+                    chars[0] = Character.toLowerCase(chars[0]);
+                    return new String(chars);
+                }
+            }
+        }
+        return name;
+    }
 }

jaxb/src/moditect/module-info.java

@@ -2,9 +2,7 @@
     requires java.logging;
     requires java.xml;
     requires java.xml.bind;
-    //
-    // This is for `BeanIntrospector`... should do away with (only need "Introspector.decapitalize")
-    requires java.desktop;
+
     // Needed for JDK9+, but optionally only
     requires static java.activation;
     // Jakarta Release

release-notes/VERSION-2.x

@@ -17,7 +17,9 @@ Modules:
 #85: Add Blackbird module -- alternative for Afterburner that works better with
    new(er) JVMs
  (contributed by Steven S)
-#100: Prevent "double-prefixing" Mr Bean generated classes
+#100: (mrbean) Prevent "double-prefixing" Mr Bean generated classes
+#115: (jaxb) Remove ` java.beans.Introspector` dependency from JAXB module (to
+   get rid of `java.desktop` module dep)
 - Add Gradle Module Metadata (https://blog.gradle.org/alignment-with-gradle-module-metadata)
 
 2.11.3 (02-Oct-2020)