use computeIfAbsent and Arrays.asList instead of creating a new Array

dsldevkit · Nov 26, 2024 · 972444e · 972444e
1 parent db67361
commit 972444e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...loq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractScopeNameProvider.java b/...loq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/AbstractScopeNameProvider.java
@@ -46,15 +46,13 @@ public abstract class AbstractScopeNameProvider implements IScopeNameProvider {
    */
   @Override
   public Iterable<INameFunction> getNameFunctions(final EClass type) {
-    Iterable<INameFunction> result = nameFunctionCache.get(type);
-    if (result == null) {
-      result = internalGetNameFunctions(type);
+    return nameFunctionCache.computeIfAbsent(type, eClass -> {
+      Iterable<INameFunction> result = internalGetNameFunctions(eClass);
       if (result == null) {
-        result = getDefaultNames(type);
+        result = getDefaultNames(eClass);
       }
-      nameFunctionCache.put(type, result);
-    }
-    return result;
+      return result;
+    });
   }
 
   /**

diff --git a/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/NameFunctions.java b/com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/scoping/NameFunctions.java
@@ -11,9 +11,10 @@
 package com.avaloq.tools.ddk.xtext.scoping;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.xtext.naming.QualifiedName;
@@ -109,7 +110,7 @@ public QualifiedName apply(final EObject from) {
    * @return The name functions
    */
   public static Iterable<INameFunction> fromFeatures(final EStructuralFeature... nameFeatures) {
-    return Iterables.transform(Lists.newArrayList(nameFeatures), new Function<EStructuralFeature, INameFunction>() {
+    return Iterables.transform(Arrays.asList(nameFeatures), new Function<EStructuralFeature, INameFunction>() {
       @Override
       public INameFunction apply(final EStructuralFeature from) {
         return fromFeature(from);