Merge pull request #1016 from rubenporras/builderWithExpectedSize

use builderWithExpectedSize when possible

Author: rubenporras

com.avaloq.tools.ddk.check.core.test/src/com/avaloq/tools/ddk/check/core/test/IssueCodeToLabelMapGenerationTest.xtend

@@ -46,7 +46,7 @@ class IssueCodeToLabelMapGenerationTest extends AbstractCheckGenerationTestCase
     ''';
 
     // check for the construction of an empty map
-    val expectedCatalog = #['ImmutableMap.<String,String>builder().build()']
+    val expectedCatalog = #['ImmutableMap.<String,String>builderWithExpectedSize(0).build()']
 
     // ACT AND ASSERT
     testMapGeneration(source, expectedCatalog)
@@ -121,7 +121,7 @@ class IssueCodeToLabelMapGenerationTest extends AbstractCheckGenerationTestCase
     val catalogClass = compiledClassesList.findFirst[s | s.fileName.equals(catalogClassName)].code;
 
     for (code: expectedCatalog) {
-      assertTrue('''«catalogClassName» was generated correctly''', catalogClass.replaceAll("\\s+","").contains(code))    	
+      assertTrue('''«catalogClassName» was generated correctly''', catalogClass.replaceAll("\\s+","").contains(code))
     }
   }
 

com.avaloq.tools.ddk.check.core/src/com/avaloq/tools/ddk/check/jvmmodel/CheckJvmModelInferrer.xtend

@@ -121,7 +121,7 @@ class CheckJvmModelInferrer extends AbstractModelInferrer {
           }
         }
         initializer = [append('''
-          «ImmutableMap.simpleName».<«String.simpleName», «String.simpleName»>builder()
+          «ImmutableMap.simpleName».<«String.simpleName», «String.simpleName»>builderWithExpectedSize(«sortedUniqueQualifiedIssueCodeNamesAndLabels.entrySet.size»)
             «FOR qualifiedIssueCodeNameAndLabel : sortedUniqueQualifiedIssueCodeNamesAndLabels.entrySet»
             .put(«qualifiedIssueCodeNameAndLabel.key», "«qualifiedIssueCodeNameAndLabel.value»")
             «ENDFOR»

com.avaloq.tools.ddk.check.runtime.core.test/src/com/avaloq/tools/ddk/check/runtime/label/CheckRuleLabelProviderTest.java

@@ -39,6 +39,7 @@
 /**
  * Unit test for {@link DefaultCheckRuleLabelProvider}.
  */
+@SuppressWarnings("nls")
 public class CheckRuleLabelProviderTest {
 
   // Test data
@@ -114,7 +115,7 @@ private void mockValidatorsWithChecks() {
     when(mockCheckValidatorRegistry.getValidators()).thenReturn(mockValidators);
 
     for (int validator = 0; NUM_VALIDATORS > validator; ++validator) {
-      final Builder<String, String> builder = ImmutableMap.<String, String> builder();
+      final Builder<String, String> builder = ImmutableMap.builder();
       for (int check = 0; NUM_CHECKS_PER_VALIDATOR > check; ++check) {
         builder.put(ISSUE_CODES[validator][check], LABELS[validator][check]);
       }

com.avaloq.tools.ddk.xtext.builder/src/com/avaloq/tools/ddk/xtext/builder/MonitoredClusteringBuilderState.java

@@ -1281,7 +1281,7 @@ private void pollForCancellation(final IProgressMonitor monitor) {
    * @return the map of URIs indexed by their managers
    */
   private ImmutableListMultimap<Manager, URI> getUrisByManager(final Set<URI> uRIs) {
-    ImmutableListMultimap.Builder<Manager, URI> builder = ImmutableListMultimap.builder();
+    ImmutableListMultimap.Builder<Manager, URI> builder = ImmutableListMultimap.builderWithExpectedKeys(uRIs.size());
     for (URI uri : uRIs) {
       Manager mgr = getResourceDescriptionManager(uri);
       if (mgr != null) {

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/DetachableEObjectDescription.java

@@ -133,7 +133,7 @@ public static IEObjectDescription create(final QualifiedName qualifiedName, fina
    * @return object description
    */
   public static IEObjectDescription create(final QualifiedName qualifiedName, final EObject element) {
-    return new DetachableEObjectDescription(qualifiedName, element, ImmutableMap.<String, String> of());
+    return new DetachableEObjectDescription(qualifiedName, element, Map.of());
   }
 
   @Override

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/FixedCopiedResourceDescription.java

@@ -64,8 +64,9 @@ public FixedCopiedResourceDescription(final IResourceDescription original) {
       }
       InternalEObject result = (InternalEObject) EcoreUtil.create(from.getEClass());
       result.eSetProxyURI(from.getEObjectURI());
-      ImmutableMap.Builder<String, String> userData = ImmutableMap.builder();
-      for (final String key : from.getUserDataKeys()) {
+      String[] userDataKeys = from.getUserDataKeys();
+      ImmutableMap.Builder<String, String> userData = ImmutableMap.builderWithExpectedSize(userDataKeys.length);
+      for (final String key : userDataKeys) {
         userData.put(key, from.getUserData(key));
       }
       return EObjectDescription.create(from.getName(), result, userData.build());