Optimize using List#of and List#copyOf

apache · Dec 3, 2024 · 24e6f9b · 24e6f9b
1 parent a5447c0
commit 24e6f9b
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 28 deletions.
diff --git a/...prise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AbstractObjectProvider.java b/...prise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AbstractObjectProvider.java
@@ -45,7 +45,7 @@ abstract class AbstractObjectProvider<T extends AbstractObjectProvider.Refreshab
     AbstractObjectProvider(List<String> annotation , AnnotationModelHelper helper)
     {
         myHelper = helper;
-        myAnnotationName = Collections.unmodifiableList(new ArrayList<>(annotation));
+        myAnnotationName = List.copyOf(annotation);
     }
 
     /* (non-Javadoc)

diff --git a/...ise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AnnotationObjectProvider.java b/...ise/web.beans/src/org/netbeans/modules/web/beans/impl/model/AnnotationObjectProvider.java
@@ -71,7 +71,7 @@ public class AnnotationObjectProvider implements ObjectProvider<BindingQualifier
 
     AnnotationObjectProvider( AnnotationModelHelper helper , List<String> annotation) {
         myHelper = helper;
-        myAnnotationNames = Collections.unmodifiableList(new ArrayList<>(annotation));
+        myAnnotationNames = List.copyOf(annotation);
     }
 
     /* (non-Javadoc)

diff --git a/...rise/web.beans/src/org/netbeans/modules/web/beans/impl/model/DecoratorObjectProvider.java b/...rise/web.beans/src/org/netbeans/modules/web/beans/impl/model/DecoratorObjectProvider.java
@@ -18,7 +18,7 @@
  */
 package org.netbeans.modules.web.beans.impl.model;
 
-import java.util.Arrays;
+import java.util.List;
 import javax.lang.model.element.TypeElement;
 
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationModelHelper;
@@ -32,7 +32,7 @@
 class DecoratorObjectProvider extends AbstractObjectProvider<DecoratorObject> {
 
     DecoratorObjectProvider( AnnotationModelHelper helper ) {
-        super( Arrays.asList(AnnotationUtil.DECORATOR_JAKARTA, AnnotationUtil.DECORATOR), helper);
+        super(List.of(AnnotationUtil.DECORATOR_JAKARTA, AnnotationUtil.DECORATOR), helper);
     }
 
     /* (non-Javadoc)

diff --git a/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorBindingChecker.java b/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorBindingChecker.java
@@ -42,9 +42,9 @@
  */
 class InterceptorBindingChecker extends RuntimeAnnotationChecker {
 
-    private static final List<String> ANNOTATIONS = Collections.unmodifiableList(List.of(
+    private static final List<String> ANNOTATIONS = List.of(
             INTERCEPTOR_BINDING_FQN, INTERCEPTOR_BINDING_FQN_JAKARTA
-    ));
+    );
 
     InterceptorBindingChecker(AnnotationModelHelper helper){
         init( null,  helper );

diff --git a/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorObjectProvider.java b/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/InterceptorObjectProvider.java
@@ -18,7 +18,7 @@
  */
 package org.netbeans.modules.web.beans.impl.model;
 
-import java.util.Arrays;
+import java.util.List;
 import javax.lang.model.element.TypeElement;
 
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationModelHelper;
@@ -33,7 +33,7 @@ class InterceptorObjectProvider extends AbstractObjectProvider<InterceptorObject
 
     InterceptorObjectProvider( AnnotationModelHelper helper )
     {
-        super(Arrays.asList(AnnotationUtil.INTERCEPTOR, AnnotationUtil.INTERCEPTOR_JAKARTA), helper);
+        super(List.of(AnnotationUtil.INTERCEPTOR, AnnotationUtil.INTERCEPTOR_JAKARTA), helper);
     }
 
     /* (non-Javadoc)

diff --git a/...eb.beans/src/org/netbeans/modules/web/beans/impl/model/NamedStereotypeObjectProvider.java b/...eb.beans/src/org/netbeans/modules/web/beans/impl/model/NamedStereotypeObjectProvider.java
@@ -18,7 +18,6 @@
  */
 package org.netbeans.modules.web.beans.impl.model;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.LinkedList;
@@ -43,7 +42,7 @@
 class NamedStereotypeObjectProvider extends AbstractObjectProvider<NamedStereotype> {
 
     NamedStereotypeObjectProvider(AnnotationModelHelper helper) {
-        super(Arrays.asList(STEREOTYPE_FQN, STEREOTYPE_FQN_JAKARTA), helper);
+        super(List.of(STEREOTYPE_FQN, STEREOTYPE_FQN_JAKARTA), helper);
     }
 
     /* (non-Javadoc)

diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/NormalScopeChecker.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/NormalScopeChecker.java
@@ -18,7 +18,6 @@
  */
 package org.netbeans.modules.web.beans.impl.model;
 
-import java.util.Collections;
 import java.util.List;
 
 import static org.netbeans.modules.web.beans.analysis.analyzer.AnnotationUtil.NORMAL_SCOPE_FQN;
@@ -31,9 +30,9 @@
  */
 class NormalScopeChecker extends ScopeChecker {
 
-    private static final List<String> ANNOTATIONS = Collections.unmodifiableList(List.of(
+    private static final List<String> ANNOTATIONS = List.of(
             NORMAL_SCOPE_FQN, NORMAL_SCOPE_FQN_JAKARTA
-    ));
+    );
 
     static NormalScopeChecker get(){
         return  new NormalScopeChecker();

diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/QualifierChecker.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/QualifierChecker.java
@@ -19,7 +19,6 @@
 package org.netbeans.modules.web.beans.impl.model;
 
 import java.lang.annotation.ElementType;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -41,9 +40,9 @@
  */
 class QualifierChecker extends RuntimeAnnotationChecker implements Checker {
 
-    private static final List<String> ANNOTATIONS = Collections.unmodifiableList(List.of(
+    private static final List<String> ANNOTATIONS = List.of(
             QUALIFIER_FQN, QUALIFIER_FQN_JAKARTA
-    ));
+    );
 
     QualifierChecker(){
         this( false );

diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/ScopeChecker.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/ScopeChecker.java
@@ -19,7 +19,6 @@
 package org.netbeans.modules.web.beans.impl.model;
 
 import java.lang.annotation.ElementType;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -40,9 +39,9 @@
  */
 class ScopeChecker extends RuntimeAnnotationChecker {
 
-    private static final List<String> ANNOTATIONS = Collections.unmodifiableList(List.of(
+    private static final List<String> ANNOTATIONS = List.of(
             SCOPE_FQN, SCOPE_FQN_JAKARTA
-    ));
+    );
 
     static ScopeChecker get(){
         return new ScopeChecker();

diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypeChecker.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypeChecker.java
@@ -19,7 +19,6 @@
 package org.netbeans.modules.web.beans.impl.model;
 
 import java.lang.annotation.ElementType;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -42,9 +41,9 @@
  */
 public class StereotypeChecker extends RuntimeAnnotationChecker {
 
-    private static final List<String> ANNOTATIONS = Collections.unmodifiableList(List.of(
+    private static final List<String> ANNOTATIONS = List.of(
             STEREOTYPE_FQN, STEREOTYPE_FQN_JAKARTA
-    ));
+    );
 
     public StereotypeChecker(AnnotationHelper helper ){
         init(null, helper);

diff --git a/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypedObjectProvider.java b/...se/web.beans/src/org/netbeans/modules/web/beans/impl/model/StereotypedObjectProvider.java
@@ -18,7 +18,7 @@
  */
 package org.netbeans.modules.web.beans.impl.model;
 
-import java.util.Arrays;
+import java.util.List;
 import javax.lang.model.element.TypeElement;
 
 import org.netbeans.modules.j2ee.metadata.model.api.support.annotation.AnnotationModelHelper;
@@ -36,7 +36,7 @@ class StereotypedObjectProvider extends AbstractObjectProvider<StereotypedObject
     StereotypedObjectProvider( String stereotypeAnnotation ,
             AnnotationModelHelper helper )
     {
-        super(Arrays.asList(stereotypeAnnotation), helper);
+        super(List.of(stereotypeAnnotation), helper);
     }
 
     /* (non-Javadoc)

diff --git a/.../web.beans/src/org/netbeans/modules/web/beans/impl/model/WebBeansModelImplementation.java b/.../web.beans/src/org/netbeans/modules/web/beans/impl/model/WebBeansModelImplementation.java
@@ -39,9 +39,6 @@
 import org.netbeans.modules.web.beans.api.model.ModelUnit;
 import org.netbeans.modules.web.beans.api.model.WebBeansModel;
 
-import static java.util.Arrays.asList;
-
-
 /**
  * @author ads
  *
@@ -124,7 +121,7 @@ protected WebBeansModel getModel() {
 
     PersistentObjectManager<BindingQualifier> getManager( String... annotationFQN ){
         PersistentObjectManager<BindingQualifier> result = myManagers.computeIfAbsent(
-                asList(annotationFQN),
+                List.of(annotationFQN),
                 fqn -> getHelper().createPersistentObjectManager(
                         new AnnotationObjectProvider(getHelper(), fqn))
         );