Clean-up metamodel frontends.

jplag.frontend-testutils/src/test/java/de/jplag/testutils/TokenUtils.java

@@ -1,7 +1,5 @@
 package de.jplag.testutils;
 
-import static java.util.stream.Collectors.toList;
-
 import java.util.List;
 import java.util.stream.StreamSupport;
 
@@ -22,7 +20,7 @@ public final class TokenUtils {
      */
     public static List<Integer> tokenTypesByFile(TokenList tokenList, String name) {
         var tokens = tokensByFile(tokenList, name);
-        return tokens.stream().map(Token::getType).collect(toList());
+        return tokens.stream().map(Token::getType).toList();
     }
 
     /**
@@ -33,7 +31,7 @@ public final class TokenUtils {
      */
     public static List<Token> tokensByFile(TokenList tokenList, String name) {
         var tokens = StreamSupport.stream(tokenList.allTokens().spliterator(), false);
-        return tokens.filter(it -> it.getFile().startsWith(name)).collect(toList());
+        return tokens.filter(it -> it.getFile().startsWith(name)).toList();
     }
 
 }

jplag.frontend-utils/src/main/java/de/jplag/TokenPrinter.java

@@ -1,6 +1,5 @@
 package de.jplag;
 
-import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
 import java.io.File;
@@ -50,7 +49,7 @@ public final class TokenPrinter {
      * @return the string representation.
      */
     public static String printTokens(TokenList tokens, File directory, Collection<String> fileNames) {
-        Collection<File> files = fileNames.stream().map(name -> new File(directory, name)).collect(toList());
+        Collection<File> files = fileNames.stream().map(name -> new File(directory, name)).toList();
         return printTokens(tokens, files, directory);
     }
 

jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/DynamicMetamodelTokenConstants.java

@@ -1,7 +1,5 @@
 package de.jplag.emf.dynamic;
 
-import static java.util.stream.Collectors.toList;
-
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,7 +15,7 @@ import de.jplag.TokenConstants;
 public class DynamicMetamodelTokenConstants implements TokenConstants {
     private static final String UNKNOWN_TOKEN = "<Unknown>";
 
-    public final static int TOKEN_TYPE_START = 2;
+    public static final int TOKEN_TYPE_START = 2;
 
     private static Map<EClass, Integer> eClassToTokenType = new HashMap<>();
     private static Map<Integer, EClass> tokenTypeToEClass = new HashMap<>();
@@ -56,7 +54,7 @@ public class DynamicMetamodelTokenConstants implements TokenConstants {
      * @return a read only view on the collection of token strings.
      */
     public static Collection<String> getTokenStrings() {
-        return eClassToTokenType.keySet().stream().map(EClass::getName).collect(toList());
+        return eClassToTokenType.keySet().stream().map(EClass::getName).toList();
     }
 
 }

jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/parser/DynamicEcoreParser.java

@@ -2,9 +2,9 @@ package de.jplag.emf.dynamic.parser;
 
 import org.eclipse.emf.ecore.EObject;
 
+import de.jplag.emf.Language;
 import de.jplag.emf.MetamodelToken;
 import de.jplag.emf.dynamic.DynamicMetamodelToken;
-import de.jplag.emf.dynamic.Language;
 import de.jplag.emf.parser.EcoreParser;
 import de.jplag.emf.util.AbstractMetamodelVisitor;
 

jplag.frontend.emf-metamodel-dynamic/src/main/java/de/jplag/emf/dynamic/parser/DynamicMetamodelTokenGenerator.java

@@ -10,7 +10,7 @@ import de.jplag.emf.util.AbstractMetamodelVisitor;
  * @author Timur Saglam
  */
 public class DynamicMetamodelTokenGenerator extends AbstractMetamodelVisitor {
-    final private DynamicEcoreParser parser;
+    private final DynamicEcoreParser parser;
 
     /**
      * Creates the visitor.

jplag.frontend.emf-metamodel-dynamic/src/test/java/de/jplag/emf/dynamic/MinimalDynamicMetamodelTest.java

@@ -1,6 +1,5 @@
 package de.jplag.emf.dynamic;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -40,7 +39,7 @@ class MinimalDynamicMetamodelTest {
     @Test
     void testBookstoreMetamodels() {
         TokenList result = frontend.parse(baseDirectory, TEST_SUBJECTS);
-        List<String> treeViewFiles = Arrays.stream(TEST_SUBJECTS).map(it -> it + Language.VIEW_FILE_SUFFIX).collect(toList());
+        List<String> treeViewFiles = Arrays.stream(TEST_SUBJECTS).map(it -> it + Language.VIEW_FILE_SUFFIX).toList();
         logger.debug(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
         logger.info(("Dynamic token set: " + DynamicMetamodelTokenConstants.getTokenStrings()));
         logger.info("parsed tokens: " + result.allTokens().toString());

jplag.frontend.emf-metamodel/src/main/java/de/jplag/emf/util/MetamodelTreeView.java

@@ -20,7 +20,7 @@ public class MetamodelTreeView {
     private int lineIndex;
     private int columnIndex;
     private final StringBuilder viewBuilder;
-    private final static String INDENTATION = "  ";
+    private static final String INDENTATION = "  ";
     public final Logger logger;
 
     /**
@@ -53,12 +53,11 @@ public class MetamodelTreeView {
             token.setLength(tokenText.length());
 
             if (prefix.isEmpty()) {
-                String indentedText = tokenText;
                 for (int i = 0; i < treeDepth; i++) {
-                    indentedText = INDENTATION + indentedText;
+                    viewBuilder.append(INDENTATION);
                     columnIndex += INDENTATION.length();
                 }
-                viewBuilder.append(indentedText);
+                viewBuilder.append(tokenText);
             } else {
                 viewBuilder.append(prefix + tokenText);
                 columnIndex += prefix.length();
@@ -80,7 +79,7 @@ public class MetamodelTreeView {
         File treeViewFile = new File(filePath + suffix);
         try (BufferedWriter writer = new BufferedWriter(new FileWriter(treeViewFile));) {
             if (!treeViewFile.createNewFile()) {
-                logger.warn("Overwriting tree view file: " + treeViewFile);
+                logger.warn("Overwriting tree view file: {}", treeViewFile);
             }
             writer.append(viewBuilder.toString());
         } catch (IOException exception) {

jplag.frontend.emf-metamodel/src/test/java/de/jplag/emf/MinimalMetamodelTest.java

@@ -1,6 +1,5 @@
 package de.jplag.emf;
 
-import static java.util.stream.Collectors.toList;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertIterableEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -41,11 +40,11 @@ class MinimalMetamodelTest {
     @Test
     void testBookstoreMetamodels() {
         TokenList result = frontend.parse(baseDirectory, TEST_SUBJECTS);
-        List<String> treeViewFiles = Arrays.stream(TEST_SUBJECTS).map(it -> it + Language.VIEW_FILE_SUFFIX).collect(toList());
+        List<String> treeViewFiles = Arrays.stream(TEST_SUBJECTS).map(it -> it + Language.VIEW_FILE_SUFFIX).toList();
 
-        logger.debug(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
+        logger.info(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
         Field[] fields = MetamodelTokenConstants.class.getFields();
-        var constants = Arrays.stream(fields).map(Field::getName).filter(it -> !it.equals("NUM_DIFF_TOKENS")).collect(toList());
+        var constants = Arrays.stream(fields).map(Field::getName).filter(it -> !it.equals("NUM_DIFF_TOKENS")).toList();
         logger.info(("Handcrafted token set: " + constants));
         logger.info("Parsed tokens: " + result.allTokens().toString());
         assertEquals(21, constants.size());

jplag.frontend.emf-model/src/test/java/de/jplag/emf/model/MinimalModelInstanceTest.java

@@ -46,7 +46,7 @@ class MinimalModelInstanceTest {
         TokenList result = frontend.parse(baseDirectory, testSubjects);
         assertNotEquals(0, result.size());
 
-        List<String> treeViewFiles = Arrays.stream(testSubjects).map(it -> it + Language.VIEW_FILE_SUFFIX).collect(toList());
+        List<String> treeViewFiles = Arrays.stream(testSubjects).map(it -> it + Language.VIEW_FILE_SUFFIX).toList();
         logger.debug(TokenPrinter.printTokens(result, baseDirectory, treeViewFiles));
         logger.info("Dynamic token set: " + DynamicMetamodelTokenConstants.getTokenStrings());
         logger.info("Parsed tokens: " + result.allTokens().toString());