(commons-beanutils) branch master updated: Use Map.computeIfAbsent()

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
     new 2e0e6bdc Use Map.computeIfAbsent()
2e0e6bdc is described below

commit 2e0e6bdcf59eb5d01cdb386ab31a9d1e09361afa
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Sep 2 16:56:00 2024 -0400

    Use Map.computeIfAbsent()
    
    - Use longer lines
    - Remove whitespace
---
 src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java   |  6 +-----
 .../java/org/apache/commons/beanutils2/PropertyUtilsBean.java  |  1 -
 src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java | 10 +++-------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java 
b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index 52044c35..6ccbfe07 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -179,11 +179,8 @@ public class LazyDynaMap extends LazyDynaBean implements 
MutableDynaClass {
         if (isRestricted()) {
             throw new IllegalStateException("DynaClass is currently 
restricted. No new properties can be added.");
         }
-        final Object value = values.get(name);
         // Check if the property already exists
-        if (value == null) {
-            values.put(name, type == null ? null : createProperty(name, type));
-        }
+        values.computeIfAbsent(name, k -> type == null ? null : 
createProperty(name, type));
     }
 
     /**
@@ -402,7 +399,6 @@ public class LazyDynaMap extends LazyDynaBean implements 
MutableDynaClass {
             throw new IllegalArgumentException
                     ("Invalid property name '" + name + "' (DynaClass is 
restricted)");
         }
-
         values.put(name, value);
     }
 
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java 
b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index a33fa04d..cf8a8fe4 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -640,7 +640,6 @@ public class PropertyUtilsBean {
         if (beanClass == null) {
             return null;
         }
-
         // Look up any cached descriptors for this bean class
         return mappedDescriptorsCache.get(beanClass);
     }
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java 
b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index c3a308aa..c48ce8e4 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -285,13 +285,9 @@ public class WrapDynaClass implements DynaClass {
         // Construct corresponding DynaProperty information
         properties = new DynaProperty[regulars.length + mappeds.size()];
         for (int i = 0; i < regulars.length; i++) {
-            descriptorsMap.put(regulars[i].getName(),
-                    regulars[i]);
-            properties[i] =
-                    new DynaProperty(regulars[i].getName(),
-                            regulars[i].getPropertyType());
-            propertiesMap.put(properties[i].getName(),
-                    properties[i]);
+            descriptorsMap.put(regulars[i].getName(), regulars[i]);
+            properties[i] = new DynaProperty(regulars[i].getName(), 
regulars[i].getPropertyType());
+            propertiesMap.put(properties[i].getName(), properties[i]);
         }
 
         int j = regulars.length;