Adding Class Name Condition replicating Jackson-databind.

Shounaks · Shounaks · commit 205fef78d6fa · 2024-02-22T08:14:07.000+05:30
diff --git a/jr-annotation-support/src/main/java/com/fasterxml/jackson/jr/annotationsupport/AnnotationBasedIntrospector.java b/jr-annotation-support/src/main/java/com/fasterxml/jackson/jr/annotationsupport/AnnotationBasedIntrospector.java
@@ -85,6 +85,7 @@ protected POJODefinition introspectDefinition()
         Constructor<?> defaultCtor = null;
         Constructor<?> stringCtor = null;
         Constructor<?> longCtor = null;
+        Constructor<?> intCtor = null;
 
         // A few things only matter during deserialization: constructors,
         // secondary ignoral information:
@@ -99,18 +100,16 @@ protected POJODefinition introspectDefinition()
                         stringCtor = ctor;
                     } else if (argType == Long.class || argType == Long.TYPE) {
                         longCtor = ctor;
-                    } else {
-                        continue;
+                    } else if(argType == Integer.class || argType == Integer.TYPE) {
+                        intCtor = ctor;
                     }
-                } else {
-                    continue;
                 }
             }
         }
 
         POJODefinition def = new POJODefinition(_type,
                 _pruneProperties(_forSerialization),
-                defaultCtor, stringCtor, longCtor);
+                defaultCtor, stringCtor, longCtor, intCtor);
         if (_ignorableNames != null) {
             def = def.withIgnorals(_ignorableNames);
         }
@@ -492,12 +491,7 @@ protected <ANN extends Annotation> ANN _find(AnnotatedElement elem, Class<ANN> a
      */
 
     protected APropBuilder _propBuilder(String name) {
-        APropBuilder b = _props.get(name);
-        if (b == null) {
-            b = new APropBuilder(name);
-            _props.put(name, b);
-        }
-        return b;
+        return _props.computeIfAbsent(name,APropBuilder::new);
     }
 
     protected void _addIgnoral(String name) {
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanPropertyIntrospector.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanPropertyIntrospector.java
@@ -47,12 +47,13 @@ public POJODefinition pojoDefinitionForSerialization(JSONWriter w, Class<?> pojo
 
     private POJODefinition _construct(Class<?> beanType, int features)
     {
-        Map<String,PropBuilder> propsByName = new TreeMap<String,PropBuilder>();
+        Map<String,PropBuilder> propsByName = new TreeMap<>();
         _introspect(beanType, propsByName, features);
 
         Constructor<?> defaultCtor = null;
         Constructor<?> stringCtor = null;
         Constructor<?> longCtor = null;
+        Constructor<?> intCtor = null;
 
         for (Constructor<?> ctor : beanType.getDeclaredConstructors()) {
             Class<?>[] argTypes = ctor.getParameterTypes();
@@ -64,11 +65,9 @@ private POJODefinition _construct(Class<?> beanType, int features)
                     stringCtor = ctor;
                 } else if (argType == Long.class || argType == Long.TYPE) {
                     longCtor = ctor;
-                } else {
-                    continue;
+                } else if (argType == Integer.class || argType == Integer.TYPE) {
+                    intCtor = ctor;
                 }
-            } else {
-                continue;
             }
         }
         final int len = propsByName.size();
@@ -82,7 +81,7 @@ private POJODefinition _construct(Class<?> beanType, int features)
                 props[i++] = builder.build();
             }
         }
-        return new POJODefinition(beanType, props, defaultCtor, stringCtor, longCtor);
+        return new POJODefinition(beanType, props, defaultCtor, stringCtor, longCtor, intCtor);
     }
 
     private static void _introspect(Class<?> currType, Map<String, PropBuilder> props,
@@ -98,8 +97,7 @@ private static void _introspect(Class<?> currType, Map<String, PropBuilder> prop
         // then public fields (since 2.8); may or may not be ultimately included
         // but at this point still possible
         for (Field f : currType.getDeclaredFields()) {
-            if (!Modifier.isPublic(f.getModifiers())
-                    || f.isEnumConstant() || f.isSynthetic()) {
+            if (!Modifier.isPublic(f.getModifiers()) || f.isEnumConstant() || f.isSynthetic()) {
                 continue;
             }
             // Only include static members if (a) inclusion feature enabled and
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanReader.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/BeanReader.java
@@ -34,19 +34,22 @@ public class BeanReader
     protected final Constructor<?> _defaultCtor;
     protected final Constructor<?> _stringCtor;
     protected final Constructor<?> _longCtor;
+    protected final Constructor<?> _intCtor;
 
     /**
      * Constructors used for deserialization use case
      */
     public BeanReader(Class<?> type, Map<String, BeanPropertyReader> props,
-            Constructor<?> defaultCtor, Constructor<?> stringCtor, Constructor<?> longCtor,
+            Constructor<?> defaultCtor, Constructor<?> stringCtor, Constructor<?> longCtor, Constructor<?> intCtor,
             Set<String> ignorableNames, Map<String, String> aliasMapping)
     {
         super(type);
         _propsByName = props;
         _defaultCtor = defaultCtor;
         _stringCtor = stringCtor;
         _longCtor = longCtor;
+        _intCtor = intCtor;
+
         if (ignorableNames == null) {
             ignorableNames = Collections.<String>emptySet();
         }
@@ -59,8 +62,8 @@ public BeanReader(Class<?> type, Map<String, BeanPropertyReader> props,
 
     @Deprecated // since 2.11
     public BeanReader(Class<?> type, Map<String, BeanPropertyReader> props,
-            Constructor<?> defaultCtor, Constructor<?> stringCtor, Constructor<?> longCtor) {
-        this(type, props, defaultCtor, stringCtor, longCtor, null, null);
+            Constructor<?> defaultCtor, Constructor<?> stringCtor, Constructor<?> longCtor,Constructor<?> intCtor) {
+        this(type, props, defaultCtor, stringCtor, longCtor,intCtor, null, null);
     }
 
     public Map<String,BeanPropertyReader> propertiesByName() { return _propsByName; }
@@ -191,10 +194,13 @@ protected Object create(String str) throws Exception {
     }
 
     protected Object create(long l) throws Exception {
-        if (_longCtor == null) {
-            throw new IllegalStateException("Class "+_valueType.getName()+" does not have single-long constructor to use");
+        if (_longCtor != null) {
+            return _longCtor.newInstance(l);
+        } else if(_intCtor != null) {
+            return _intCtor.newInstance((int) l);
+        } else {
+            throw new IllegalStateException("Class "+_valueType.getName()+" does not have single-long or single-int constructor to use");
         }
-        return _longCtor.newInstance(l);
     }
 
     protected void handleUnknown(JSONReader reader, JsonParser parser, String fieldName) throws IOException {
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/POJODefinition.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/POJODefinition.java
@@ -29,15 +29,17 @@ public class POJODefinition
     public final Constructor<?> defaultCtor;
     public final Constructor<?> stringCtor;
     public final Constructor<?> longCtor;
+    public final Constructor<?> intCtor;
 
     public POJODefinition(Class<?> type, Prop[] props,
-            Constructor<?> defaultCtor0, Constructor<?> stringCtor0, Constructor<?> longCtor0)
+            Constructor<?> defaultCtor0, Constructor<?> stringCtor0, Constructor<?> longCtor0,Constructor<?> intCtor0)
     {
         _type = type;
         _properties = props;
         defaultCtor = defaultCtor0;
         stringCtor = stringCtor0;
         longCtor = longCtor0;
+        intCtor = intCtor0;
         _ignorableNames = null;
     }
 
@@ -49,6 +51,7 @@ protected POJODefinition(POJODefinition base,
         defaultCtor = base.defaultCtor;
         stringCtor = base.stringCtor;
         longCtor = base.longCtor;
+        intCtor = base.intCtor;
         _ignorableNames = ignorableN;
     }
 
diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/ValueReaderLocator.java
@@ -443,6 +443,7 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
         Constructor<?> defaultCtor = beanDef.defaultCtor;
         Constructor<?> stringCtor = beanDef.stringCtor;
         Constructor<?> longCtor = beanDef.longCtor;
+        Constructor<?> intCtor = beanDef.intCtor;
 
         final boolean forceAccess = JSON.Feature.FORCE_REFLECTION_ACCESS.isEnabled(_features);
         if (forceAccess) {
@@ -514,7 +515,7 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)
                 }
             }
         }
-        return new BeanReader(raw, propMap, defaultCtor, stringCtor, longCtor,
+        return new BeanReader(raw, propMap, defaultCtor, stringCtor, longCtor,intCtor,
                 beanDef.getIgnorableNames(), aliasMapping);
     }
 
diff --git a/jr-objects/src/test/java/com/fasterxml/jackson/jr/failing/ReadWithCtors25Test.java b/jr-objects/src/test/java/com/fasterxml/jackson/jr/failing/ReadWithCtors25Test.java
@@ -6,12 +6,12 @@
 // for [jackson-jr#25], allowing single-int constructors
 public class ReadWithCtors25Test extends TestBase
 {
-    static class FromInt1 {
+    public static class FromInt1 {
         protected int value;
         public FromInt1(int v) { value = v; }
     }
 
-    static class FromInt2 {
+    public static class FromInt2 {
         protected int value;
         public FromInt2(Integer v) { value = v.intValue(); }
     }

Original file line number	Diff line number	Diff line change
`@@ -47,12 +47,13 @@ public POJODefinition pojoDefinitionForSerialization(JSONWriter w, Class<?> pojo`
`47`	`47`
`48`	`48`	`private POJODefinition _construct(Class<?> beanType, int features)`
`49`	`49`	`{`
`50`		`- Map<String,PropBuilder> propsByName = new TreeMap<String,PropBuilder>();`
	`50`	`+ Map<String,PropBuilder> propsByName = new TreeMap<>();`
`51`	`51`	`_introspect(beanType, propsByName, features);`
`52`	`52`
`53`	`53`	`Constructor<?> defaultCtor = null;`
`54`	`54`	`Constructor<?> stringCtor = null;`
`55`	`55`	`Constructor<?> longCtor = null;`
	`56`	`+ Constructor<?> intCtor = null;`
`56`	`57`
`57`	`58`	`for (Constructor<?> ctor : beanType.getDeclaredConstructors()) {`
`58`	`59`	`Class<?>[] argTypes = ctor.getParameterTypes();`
`@@ -64,11 +65,9 @@ private POJODefinition _construct(Class<?> beanType, int features)`
`64`	`65`	`stringCtor = ctor;`
`65`	`66`	`} else if (argType == Long.class \|\| argType == Long.TYPE) {`
`66`	`67`	`longCtor = ctor;`
`67`		`- } else {`
`68`		`- continue;`
	`68`	`+ } else if (argType == Integer.class \|\| argType == Integer.TYPE) {`
	`69`	`+ intCtor = ctor;`
`69`	`70`	`}`
`70`		`- } else {`
`71`		`- continue;`
`72`	`71`	`}`
`73`	`72`	`}`
`74`	`73`	`final int len = propsByName.size();`
`@@ -82,7 +81,7 @@ private POJODefinition _construct(Class<?> beanType, int features)`
`82`	`81`	`props[i++] = builder.build();`
`83`	`82`	`}`
`84`	`83`	`}`
`85`		`- return new POJODefinition(beanType, props, defaultCtor, stringCtor, longCtor);`
	`84`	`+ return new POJODefinition(beanType, props, defaultCtor, stringCtor, longCtor, intCtor);`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`private static void _introspect(Class<?> currType, Map<String, PropBuilder> props,`
`@@ -98,8 +97,7 @@ private static void _introspect(Class<?> currType, Map<String, PropBuilder> prop`
`98`	`97`	`// then public fields (since 2.8); may or may not be ultimately included`
`99`	`98`	`// but at this point still possible`
`100`	`99`	`for (Field f : currType.getDeclaredFields()) {`
`101`		`- if (!Modifier.isPublic(f.getModifiers())`
`102`		`- \|\| f.isEnumConstant() \|\| f.isSynthetic()) {`
	`100`	`+ if (!Modifier.isPublic(f.getModifiers()) \|\| f.isEnumConstant() \|\| f.isSynthetic()) {`
`103`	`101`	`continue;`
`104`	`102`	`}`
`105`	`103`	`// Only include static members if (a) inclusion feature enabled and`
Original file line number	Diff line number	Diff line change
`@@ -443,6 +443,7 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)`
`443`	`443`	`Constructor<?> defaultCtor = beanDef.defaultCtor;`
`444`	`444`	`Constructor<?> stringCtor = beanDef.stringCtor;`
`445`	`445`	`Constructor<?> longCtor = beanDef.longCtor;`
	`446`	`+ Constructor<?> intCtor = beanDef.intCtor;`
`446`	`447`
`447`	`448`	`final boolean forceAccess = JSON.Feature.FORCE_REFLECTION_ACCESS.isEnabled(_features);`
`448`	`449`	`if (forceAccess) {`
`@@ -514,7 +515,7 @@ protected BeanReader _resolveBeanForDeser(Class<?> raw, POJODefinition beanDef)`
`514`	`515`	`}`
`515`	`516`	`}`
`516`	`517`	`}`
`517`		`- return new BeanReader(raw, propMap, defaultCtor, stringCtor, longCtor,`
	`518`	`+ return new BeanReader(raw, propMap, defaultCtor, stringCtor, longCtor,intCtor,`
`518`	`519`	`beanDef.getIgnorableNames(), aliasMapping);`
`519`	`520`	`}`
`520`	`521`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`	`// for [jackson-jr#25], allowing single-int constructors`
`7`	`7`	`public class ReadWithCtors25Test extends TestBase`
`8`	`8`	`{`
`9`		`- static class FromInt1 {`
	`9`	`+ public static class FromInt1 {`
`10`	`10`	`protected int value;`
`11`	`11`	`public FromInt1(int v) { value = v; }`
`12`	`12`	`}`
`13`	`13`
`14`		`- static class FromInt2 {`
	`14`	`+ public static class FromInt2 {`
`15`	`15`	`protected int value;`
`16`	`16`	`public FromInt2(Integer v) { value = v.intValue(); }`
`17`	`17`	`}`