Merge branch 'master' into FormatCodeTests

Author: svanteschubert

generator/schema2template/src/main/java/schema2template/grammar/MSVExpressionVisitorChildren.java

@@ -53,7 +53,7 @@
  */
 public class MSVExpressionVisitorChildren implements ExpressionVisitor {
 
-  private static final List<Expression> empty = Collections.EMPTY_LIST;
+  private static final List<Expression> empty = Collections.emptyList();
 
   public List<Expression> onAnyString() {
     return empty;

generator/schema2template/src/main/java/schema2template/grammar/OdfFamilyPropertiesPatternMatcher.java

@@ -214,11 +214,10 @@ private void evaluatePattern(ElementExp exp) {
   @Override
   public String toString() {
     Map<String, List<String>> results = getFamilyProperties();
-    Set<String> families = results.keySet();
     StringBuilder sb = new StringBuilder();
-    for (String family : families) {
-      sb.append("@style:family = '").append(family).append("' =");
-      List<String> propNames = results.get(family);
+    for (Map.Entry<String, List<String>> entry : results.entrySet()) {
+      sb.append("@style:family = '").append(entry.getKey()).append("' =");
+      List<String> propNames = entry.getValue();
       for (String propName : propNames) {
         sb.append(" style:").append(propName);
       }

generator/schema2template/src/main/java/schema2template/grammar/OdfModel.java

@@ -123,9 +123,7 @@ public boolean isStylable(SourceCodeBaseClass base) {
   public List<String> getStyleFamilies(PuzzleComponent element) {
     List<String> retval = new ArrayList<String>();
     if (mNameToFamiliesMap.containsKey(element.getQName())) {
-      for (String family : mNameToFamiliesMap.get(element.getQName())) {
-        retval.add(family);
-      }
+      retval.addAll(mNameToFamiliesMap.get(element.getQName()));
     }
     return retval;
   }
@@ -139,9 +137,7 @@ public SortedSet<String> getStyleFamilies() {
     Iterator<List<String>> iter = mNameToFamiliesMap.values().iterator();
     List<String> families = new ArrayList<String>();
     while (iter.hasNext()) {
-      for (String family : iter.next()) {
-        families.add(family);
-      }
+      families.addAll(iter.next());
     }
     return new TreeSet<String>(families);
   }

generator/schema2template/src/main/java/schema2template/grammar/PathPrinter.java

@@ -28,6 +28,7 @@
 import com.sun.msv.grammar.ReferenceExp;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.SortedSet;
 import java.util.logging.Logger;
 
@@ -85,12 +86,7 @@ public List<String> printChildPaths(PuzzlePiece parent, PuzzlePiece child) {
 
     MSVExpressionInformation info = new MSVExpressionInformation(parent.getExpression(), null);
 
-    List<List<Expression>> paths = null;
-    if (child != null) {
-      paths = info.getPathsContaining(child.getExpression());
-    } else {
-      paths = info.getPathsContaining(parent.getExpression());
-    }
+    List<List<Expression>> paths = info.getPathsContaining(Objects.requireNonNullElse(child, parent).getExpression());
     if (paths == null) {
       return null;
     }

generator/schema2template/src/main/java/schema2template/grammar/PuzzlePiece.java

@@ -565,11 +565,7 @@ private static Map<Expression, List<PuzzlePiece>> buildReverseMap(PuzzlePieceSet
     Iterator<PuzzlePiece> iter = defs.iterator();
     while (iter.hasNext()) {
       PuzzlePiece def = iter.next();
-      List<PuzzlePiece> list = retval.get(def.getExpression());
-      if (list == null) {
-        list = new ArrayList<PuzzlePiece>();
-        retval.put(def.getExpression(), list);
-      }
+      List<PuzzlePiece> list = retval.computeIfAbsent(def.getExpression(), k -> new ArrayList<PuzzlePiece>());
       list.add(def);
     }
     return retval;
@@ -581,12 +577,8 @@ private static Map<String, List<Expression>> buildNameExpressionsMap(PuzzlePiece
     Iterator<PuzzlePiece> iter = defs.iterator();
     while (iter.hasNext()) {
       PuzzlePiece def = iter.next();
-      List<Expression> list = retval.get(def.getQName());
-      if (list == null) {
-        list = new ArrayList<Expression>();
-        retval.put(def.getQName(), list);
-      }
-      list.add(def.getExpression());
+        List<Expression> list = retval.computeIfAbsent(def.getQName(), k -> new ArrayList<Expression>());
+        list.add(def.getExpression());
     }
     return retval;
   }
@@ -701,17 +693,17 @@ private static void addChildExpression(
       puzzlePiece.mCanHaveText = elementInfo.canHaveText();
 
       Map<String, List<Expression>> atnameToDefs = buildNameExpressionsMap(puzzlePiece.mAttributes);
-      for (String name : atnameToDefs.keySet()) {
-        if (elementInfo.isMandatory(atnameToDefs.get(name))) {
-          puzzlePiece.mMandatoryChildAttributeNames.add(name);
+      for (Map.Entry<String, List<Expression>> entry : atnameToDefs.entrySet()) {
+        if (elementInfo.isMandatory(entry.getValue())) {
+          puzzlePiece.mMandatoryChildAttributeNames.add(entry.getKey());
         }
       }
 
       Map<String, List<Expression>> elnameToDefs =
           buildNameExpressionsMap(puzzlePiece.mChildElements);
-      for (String name : elnameToDefs.keySet()) {
-        if (elementInfo.isMandatory(elnameToDefs.get(name))) {
-          puzzlePiece.mMandatoryChildElementNames.add(name);
+      for (Map.Entry<String, List<Expression>> entry : elnameToDefs.entrySet()) {
+        if (elementInfo.isMandatory(entry.getValue())) {
+          puzzlePiece.mMandatoryChildElementNames.add(entry.getKey());
         }
       }
 

generator/schema2template/src/main/java/schema2template/grammar/TinkerPopGraph.java

@@ -113,7 +113,7 @@ private static Graph buildGraph(
     addGraphProperties(g, v, parentV, exp, parentExp);
     if (!(exp instanceof NameClassAndExpression) || parentExp == null) {
       List<Expression> children = (List<Expression>) exp.visit(CHILD_VISITOR);
-      Integer newChildNo = 0;
+      int newChildNo = 0;
       for (Expression newChildExp : children) {
         Vertex newChildV = createVertex(g, newChildExp);
         // only for sequences the order of children is important
@@ -123,7 +123,7 @@ private static Graph buildGraph(
               "has",
               newChildV,
               "order",
-              newChildNo.toString(),
+            Integer.toString(newChildNo),
               "color",
               "#00ee00"); // sequence edges using color green2 see
           // http://www.farb-tabelle.de/de/rgb2hex.htm?q=green2

generator/schema2template/src/main/java/schema2template/grammar/XMLModel.java

@@ -135,11 +135,7 @@ private static Map<String, SortedSet<PuzzlePiece>> createMapQNameToPuzzlePiece(
       Set<PuzzlePiece> definitions) {
     Map<String, SortedSet<PuzzlePiece>> retval = new HashMap<String, SortedSet<PuzzlePiece>>();
     for (PuzzlePiece def : definitions) {
-      SortedSet<PuzzlePiece> multiples = retval.get(def.getQName());
-      if (multiples == null) {
-        multiples = new TreeSet<PuzzlePiece>();
-        retval.put(def.getQName(), multiples);
-      }
+      SortedSet<PuzzlePiece> multiples = retval.computeIfAbsent(def.getQName(), k -> new TreeSet<PuzzlePiece>());
       multiples.add(def);
     }
     return retval;
@@ -175,12 +171,8 @@ static Map<String, SortedSet<PuzzlePiece>> createDefinitionMap(
       Collection<PuzzlePiece> definitions) {
     Map<String, SortedSet<PuzzlePiece>> retval = new HashMap<>();
     for (PuzzlePiece def : definitions) {
-      SortedSet<PuzzlePiece> multiples = retval.get(def.getQName());
-      if (multiples == null) {
-        multiples = new TreeSet<>();
-        retval.put(def.getQName(), multiples);
-      }
-      multiples.add(def);
+        SortedSet<PuzzlePiece> multiples = retval.computeIfAbsent(def.getQName(), k -> new TreeSet<>());
+        multiples.add(def);
     }
     return retval;
   }

generator/schema2template/src/main/java/schema2template/template/GrammarAdditionsFileHandler.java

@@ -156,11 +156,7 @@ private void readAttributeSettings(Attributes attrs) throws SAXException {
 
     String elementName = attrs.getValue("element");
     String defaultValue = attrs.getValue("defaultValue");
-    Map<String, String> defaultValueByParentElement = mAttributeDefaults.get(attrName);
-    if (defaultValueByParentElement == null) {
-      defaultValueByParentElement = new HashMap<String, String>();
-      mAttributeDefaults.put(attrName, defaultValueByParentElement);
-    }
+    Map<String, String> defaultValueByParentElement = mAttributeDefaults.computeIfAbsent(attrName, k -> new HashMap<String, String>());
     if (elementName == null) {
       elementName = ALL_ELEMENTS;
     }

generator/schema2template/src/main/java/schema2template/template/SourceCodeModel.java

@@ -70,14 +70,11 @@ public SourceCodeModel(
     // Intermediate Step -> get all childOfBaseElement Definitions for each baseName
     Map<String, SortedSet<PuzzlePiece>> baseNameElementsMap =
         new HashMap<String, SortedSet<PuzzlePiece>>(baseNames.size());
-    for (String elementName : elementNameBaseNameMap.keySet()) {
-      String baseName = elementNameBaseNameMap.get(elementName);
-      SortedSet<PuzzlePiece> elements = baseNameElementsMap.get(baseName);
-      if (elements == null) {
-        elements = new TreeSet<PuzzlePiece>();
-        baseNameElementsMap.put(baseName, elements);
-      }
-      PuzzleComponent childElement = schemaModel.getElement(elementName);
+    for (Map.Entry<String, String> entry : elementNameBaseNameMap.entrySet()) {
+      String elementName = entry.getKey();
+      String baseName = entry.getValue();
+        SortedSet<PuzzlePiece> elements = baseNameElementsMap.computeIfAbsent(baseName, k -> new TreeSet<PuzzlePiece>());
+        PuzzleComponent childElement = schemaModel.getElement(elementName);
       if (childElement != null) {
         if (childElement instanceof Collection) {
           elements.addAll((Collection) childElement);
@@ -101,10 +98,10 @@ public SourceCodeModel(
 
     // Generate a map from element tag name to base classes
     mElementBaseMap = new HashMap<String, SourceCodeBaseClass>(elementNameBaseNameMap.size());
-    for (String elementName : elementNameBaseNameMap.keySet()) {
-      String baseName = elementNameBaseNameMap.get(elementName);
+    for (Map.Entry<String, String> entry : elementNameBaseNameMap.entrySet()) {
+      String baseName = entry.getValue();
       SourceCodeBaseClass baseclass = mBaseNameToBaseClass.get(baseName);
-      mElementBaseMap.put(elementName, baseclass);
+      mElementBaseMap.put(entry.getKey(), baseclass);
     }
   }
   /**
@@ -251,7 +248,7 @@ public String getSuperClassName(String childName) {
     String superClassName = null;
     if (mElementSuperClassNameMap != null && childName != null) {
       superClassName = mElementSuperClassNameMap.get(childName);
-      if (superClassName != null & superClassName.contains(".")) {
+      if (superClassName != null && superClassName.contains(".")) {
         superClassName =
             superClassName.substring(superClassName.lastIndexOf(".") + 1, superClassName.length());
       }
@@ -268,7 +265,7 @@ public String getSuperClassPackageName(String childName) {
     String superClassName = null;
     if (mElementSuperClassNameMap != null && childName != null) {
       superClassName = mElementSuperClassNameMap.get(childName);
-      if (superClassName != null & superClassName.contains(".")) {
+      if (superClassName != null && superClassName.contains(".")) {
         superClassName = superClassName.substring(0, superClassName.lastIndexOf("."));
       }
     }

generator/schema2template/src/test/java/schema2template/grammar/DirectoryCompare.java

@@ -72,7 +72,7 @@ public static boolean compareDirectories(String newFileDir, String RefFileDir) {
   private static boolean compareDirectories(Path dir1, Path dir2) throws IOException {
     boolean dir1Exists = Files.exists(dir1) && Files.isDirectory(dir1);
     boolean dir2Exists = Files.exists(dir2) && Files.isDirectory(dir2);
-    Boolean areEqual = Boolean.TRUE;
+    boolean areEqual = true;
 
     if (dir1Exists && dir2Exists) {
       HashMap<Path, Path> dir1Paths = new HashMap<>();
@@ -93,7 +93,7 @@ private static boolean compareDirectories(Path dir1, Path dir2) throws IOExcepti
             Level.SEVERE,
             "\nThe file size differ:\n{0} files exist in \n{1}\n{2} files exist in\n{3}\n\n",
             new Object[] {dir1Paths.size(), dir1, dir2Paths.size(), dir2});
-        areEqual = Boolean.FALSE;
+        areEqual = false;
       }
 
       // For each file in dir1, check if also dir2 contains this file and if
@@ -102,7 +102,7 @@ private static boolean compareDirectories(Path dir1, Path dir2) throws IOExcepti
         Path relativePath = pathEntry.getKey();
         Path absolutePath = pathEntry.getValue();
         if (!dir2Paths.containsKey(relativePath)) {
-          areEqual = Boolean.FALSE;
+          areEqual = false;
           LOG.log(
               Level.SEVERE,
               "\nThe file\n{0}\ndoes not exist in\n{1}\n\n",
@@ -112,15 +112,15 @@ private static boolean compareDirectories(Path dir1, Path dir2) throws IOExcepti
             // error msg within textFilesEquals with line difference
             // LOG.log(Level.SEVERE, "There is a difference between:\n{0}\n and \n{1}\n\n", new
             // Object[]{absolutePath.toString(), relativePath.toAbsolutePath().toString()});
-            areEqual = Boolean.FALSE;
+            areEqual = false;
           }
           // remove it to be able to show the superset of dir2Paths in the end
           dir2Paths.remove(relativePath);
         }
       }
       // if there is a superset of dir2Paths
       if (!dir2Paths.isEmpty()) {
-        areEqual = Boolean.FALSE;
+        areEqual = false;
         for (Entry<Path, Path> pathEntry2 : dir2Paths.entrySet()) {
           Path relativePath2 = pathEntry2.getKey();
           LOG.log(
@@ -131,7 +131,7 @@ private static boolean compareDirectories(Path dir1, Path dir2) throws IOExcepti
       }
       return areEqual;
     } else {
-      areEqual = Boolean.FALSE;
+      areEqual = false;
       if (!dir1Exists) {
         LOG.log(
             Level.SEVERE,
@@ -205,21 +205,21 @@ private static void listPaths(Path path, List<Path> result, String... extensions
   }
 
   private static boolean textFilesEquals(Path p1, Path p2) throws IOException {
-    boolean areEqual = Boolean.TRUE;
+    boolean areEqual = true;
     if (Files.isDirectory(p1) || Files.isDirectory(p2)) {
       if (!Files.isDirectory(p1)) {
         LOG.log(
             Level.SEVERE,
             "\nOne file is a directory:\n{0}\nwhile the other is a file:\n{1}\n\n",
             new Object[] {p2.toString(), p1.toString()});
-        areEqual = Boolean.FALSE;
+        areEqual = false;
       }
       if (!Files.isDirectory(p2)) {
         LOG.log(
             Level.SEVERE,
             "\nOne file is a directory:\n{0}\nwhile the other is a file:\n{1}\n\n",
             new Object[] {p1.toString(), p2.toString()});
-        areEqual = Boolean.FALSE;
+        areEqual = false;
       }
     } else {
       try (BufferedReader reader1 = Files.newBufferedReader(p1)) {
@@ -229,10 +229,10 @@ private static boolean textFilesEquals(Path p1, Path p2) throws IOException {
           int lineNum = 1;
           while (line1 != null || line2 != null) {
             if (line1 == null || line2 == null) {
-              areEqual = Boolean.FALSE;
+              areEqual = false;
               break;
             } else if (!line1.equals(line2)) {
-              areEqual = Boolean.FALSE;
+              areEqual = false;
               break;
             }
             line1 = reader1.readLine();