Merge branch '2.18'

FasterXML · May 15, 2024 · de698f7 · de698f7
2 parents a5f7fd5 + b9d1e90
commit de698f7
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java b/src/main/java/tools/jackson/databind/introspect/POJOPropertiesCollector.java
@@ -599,32 +599,32 @@ protected void _addCreators(Map<String, POJOPropertyBuilder> props)
         if (_useAnnotations) {
             for (AnnotatedConstructor ctor : _classDef.getConstructors()) {
                 if (_creatorProperties == null) {
-                    _creatorProperties = new LinkedList<POJOPropertyBuilder>();
+                    _creatorProperties = new LinkedList<>();
                 }
                 for (int i = 0, len = ctor.getParameterCount(); i < len; ++i) {
                     _addCreatorParam(props, ctor.getParameter(i));
                 }
             }
             for (AnnotatedMethod factory : _classDef.getFactoryMethods()) {
                 if (_creatorProperties == null) {
-                    _creatorProperties = new LinkedList<POJOPropertyBuilder>();
+                    _creatorProperties = new LinkedList<>();
                 }
                 for (int i = 0, len = factory.getParameterCount(); i < len; ++i) {
                     _addCreatorParam(props, factory.getParameter(i));
                 }
             }
         }
         if (isRecordType()) {
-            List<String> recordComponentNames = new ArrayList<String>();
+            List<String> recordComponentNames = new ArrayList<>();
             AnnotatedConstructor canonicalCtor = JDK14Util.findRecordConstructor(
                     _classDef, _annotationIntrospector, _config, recordComponentNames);
 
             if (canonicalCtor != null) {
                 if (_creatorProperties == null) {
-                    _creatorProperties = new LinkedList<POJOPropertyBuilder>();
+                    _creatorProperties = new LinkedList<>();
                 }
 
-                Set<AnnotatedParameter> registeredParams = new HashSet<AnnotatedParameter>();
+                Set<AnnotatedParameter> registeredParams = new HashSet<>();
                 for (POJOPropertyBuilder creatorProperty : _creatorProperties) {
                     Iterator<AnnotatedParameter> iter = creatorProperty.getConstructorParameters();
                     while (iter.hasNext()) {
@@ -751,7 +751,7 @@ protected void _addGetterMethod(Map<String, POJOPropertyBuilder> props,
         // @JsonAnyGetter?
         if (Boolean.TRUE.equals(_annotationIntrospector.hasAnyGetter(_config, m))) {
             if (_anyGetters == null) {
-                _anyGetters = new LinkedList<AnnotatedMember>();
+                _anyGetters = new LinkedList<>();
             }
             _anyGetters.add(m);
             return;
@@ -993,7 +993,7 @@ protected void _collectIgnorals(String name)
     {
         if (!_forSerialization && (name != null)) {
             if (_ignoredPropertyNames == null) {
-                _ignoredPropertyNames = new HashSet<String>();
+                _ignoredPropertyNames = new HashSet<>();
             }
             _ignoredPropertyNames.add(name);
         }
@@ -1022,7 +1022,7 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
             }
             it.remove(); // need to replace with one or more renamed
             if (renamed == null) {
-                renamed = new LinkedList<POJOPropertyBuilder>();
+                renamed = new LinkedList<>();
             }
             // simple renaming? Just do it
             if (l.size() == 1) {
@@ -1037,7 +1037,7 @@ protected void _renameProperties(Map<String, POJOPropertyBuilder> props)
             String newName = prop.findNewName();
             if (newName != null) {
                 if (renamed == null) {
-                    renamed = new LinkedList<POJOPropertyBuilder>();
+                    renamed = new LinkedList<>();
                 }
                 prop = prop.withSimpleName(newName);
                 renamed.add(prop);
@@ -1175,7 +1175,7 @@ protected void _renameWithWrappers(Map<String, POJOPropertyBuilder> props)
             }
             if (!wrapperName.equals(prop.getFullName())) {
                 if (renamed == null) {
-                    renamed = new LinkedList<POJOPropertyBuilder>();
+                    renamed = new LinkedList<>();
                 }
                 prop = prop.withName(wrapperName);
                 renamed.add(prop);