Merge branch '2.18'

FasterXML · May 16, 2024 · e659f41 · e659f41
2 parents a4dc492 + e230f61
commit e659f41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java b/src/main/java/tools/jackson/databind/deser/BasicDeserializerFactory.java
@@ -281,7 +281,7 @@ protected Map<AnnotatedWithParams,BeanPropertyDefinition[]> _findCreatorsFromPro
 
                 if (defs == null) {
                     if (result.isEmpty()) { // since emptyMap is immutable need to create a 'real' one
-                        result = new LinkedHashMap<AnnotatedWithParams,BeanPropertyDefinition[]>();
+                        result = new LinkedHashMap<>();
                     }
                     defs = new BeanPropertyDefinition[owner.getParameterCount()];
                     result.put(owner, defs);

diff --git a/src/main/java/tools/jackson/databind/deser/bean/CreatorCollector.java b/src/main/java/tools/jackson/databind/deser/bean/CreatorCollector.java
@@ -171,7 +171,7 @@ public void addPropertyCreator(AnnotatedWithParams creator,
         if (verifyNonDup(creator, C_PROPS, explicit)) {
             // Better ensure we have no duplicate names either...
             if (properties.length > 1) {
-                HashMap<String, Integer> names = new HashMap<String, Integer>();
+                HashMap<String, Integer> names = new HashMap<>();
                 for (int i = 0, len = properties.length; i < len; ++i) {
                     String name = properties[i].getName();
                     // Need to consider Injectables, which may not have