4835 improve error handling guava

cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/ODBuilder.java

@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import de.monticore.cddiff.syn2semdiff.datastructures.AssocDirection;
 import de.monticore.od4report.OD4ReportMill;
 import de.monticore.odbasis.ODBasisMill;
@@ -38,7 +39,8 @@ public ASTODAttribute buildAttr(String type, String name, String value) {
     catch (Exception exception) {
       Log.error("Attributes couldn't be created");
     }
-    assert Objects.requireNonNull(attribute).isPresent();
+    Verify.verifyNotNull(attribute, "Attribute is null");
+    Verify.verify(attribute.isPresent(), "Attribute value must be present");
     return attribute.get();
   }
 
@@ -58,7 +60,8 @@ public ASTODAttribute buildAttr(String type, String name) {
     catch (Exception exception) {
       Log.error("Attributes couldn't be created");
     }
-    assert Objects.requireNonNull(attribute).isPresent();
+    Verify.verifyNotNull(attribute, "Attribute is null");
+    Verify.verify(attribute.isPresent(), "Attribute value must be present");
     return attribute.get();
   }
 

cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Package.java

@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import de.monticore.cdassociation._ast.ASTCDAssociation;
 import de.monticore.cdbasis._ast.ASTCDAttribute;
 import de.monticore.cdbasis._ast.ASTCDClass;
@@ -13,7 +14,6 @@
 import edu.mit.csail.sdg.alloy4.Pair;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
 public class Package {
 
@@ -36,8 +36,8 @@ public Package(ASTCDClass leftObject, String idSrc, ASTCDClass rightObject, Stri
     this.rightObject = ODBuilder.buildObj(idTgt, rightObject.getSymbol().getInternalQualifiedName(),
         odGenHelper.getSuperTypes(rightObject), getAttributesOD(rightObject, helper));
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -49,8 +49,8 @@ public Package(ASTODObject leftObject, ASTODObject rightObject, ASTCDAssociation
     this.leftObject = leftObject;
     this.rightObject = rightObject;
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -66,8 +66,8 @@ public Package(ASTCDClass leftObject, String idSrc, ASTODObject rightObject,
         odGenHelper.getSuperTypes(leftObject), getAttributesOD(leftObject, helper));
     this.rightObject = rightObject;
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;
@@ -82,8 +82,8 @@ public Package(ASTODObject leftObject, ASTCDClass rightObject, String idTgt,
     this.rightObject = ODBuilder.buildObj(idTgt, rightObject.getSymbol().getInternalQualifiedName(),
         odGenHelper.getSuperTypes(rightObject), getAttributesOD(rightObject, helper));
     this.association = ODBuilder.buildLink(this.leftObject, CDDiffUtil.inferRole(association
-        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Objects
-            .requireNonNull(Syn2SemDiffHelper.getDirection(association)));
+        .getLeft()), CDDiffUtil.inferRole(association.getRight()), this.rightObject, Verify
+            .verifyNotNull(Syn2SemDiffHelper.getDirection(association)));
     this.astcdAssociation = association;
     this.side = side;
     this.isProcessedLeft = isProcessedLeft;

cddiff/src/main/java/de/monticore/cddiff/syn2semdiff/odgen/Syn2SemDiffHelper.java

@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.cddiff.syn2semdiff.odgen;
 
+import com.google.common.base.Verify;
 import com.google.common.collect.ArrayListMultimap;
 import de.monticore.cd.facade.MCQualifiedNameFacade;
 import de.monticore.cd4code.CD4CodeMill;
@@ -435,16 +436,16 @@ public static void mergeAssocs(AssocStruct association, AssocStruct superAssoc)
     association.getAssociation().setCDAssocDir(direction);
     association.setDirection(getDirection(association.getAssociation()));
     if (association.getSide().equals(ClassSide.Left)) {
-      association.getAssociation().getLeft().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityLeft)));
-      association.getAssociation().getRight().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityRight)));
+      association.getAssociation().getLeft().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityLeft)));
+      association.getAssociation().getRight().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityRight)));
     }
     else {
-      association.getAssociation().getLeft().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityRight)));
-      association.getAssociation().getRight().setCDCardinality(createCardinality(Objects
-          .requireNonNull(cardinalityLeft)));
+      association.getAssociation().getLeft().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityRight)));
+      association.getAssociation().getRight().setCDCardinality(createCardinality(Verify
+          .verifyNotNull(cardinalityLeft)));
     }
   }
 

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AmbiguousMatchTest.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -44,7 +44,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.ASSERT_ASSOCIATIVITY).withParam(
             MergeParameter.FAIL_AMBIGUOUS).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationAmbiguousRole.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY)
         .withParam(MergeParameter.FAIL_FAST);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCardinalities.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -53,7 +53,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD").withParam(
             MergeParameter.FAIL_FAST);
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionAssociation.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationCompositionDesignissue.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -43,7 +43,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY)
         .withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationDerived.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -44,7 +44,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNavigations.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationNoMatch.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -57,7 +57,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierConflict.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -49,7 +49,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationQualifierOK.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesAttributeConflict.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -47,7 +47,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesConflict.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.FAIL_FAST).withParam(MergeParameter.OUTPUT_NAME,
             "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesSimple.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -45,7 +45,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
     CDMergeConfig.Builder builder = getConfigBuilder().withParam(MergeParameter.CHECK_ONLY,
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociationRolesWithAssocName.java

@@ -3,7 +3,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdbasis._ast.ASTCDCompilationUnit;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
@@ -46,7 +46,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.OUTPUT_NAME, "mergedCD");
 
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();

cdmerge/src/test/java/de/monticore/cdmerge/integrationtest/AssociativityTest.java

@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import com.google.common.base.Preconditions;
+import com.google.common.base.Verify;
 import de.monticore.cdmerge.BaseTest;
 import de.monticore.cdmerge.MergeTool;
 import de.monticore.cdmerge.config.CDMergeConfig;
@@ -48,7 +48,7 @@ private CDMergeConfig getConfig(List<String> inputModels) throws IOException {
         MergeParameter.ON).withParam(MergeParameter.ASSERT_ASSOCIATIVITY).withParam(
             MergeParameter.OUTPUT_NAME, "mergedCD");
     for (String m : inputModels) {
-      Preconditions.checkNotNull(loadModel(Paths.get(m)));
+      Verify.verifyNotNull(loadModel(Paths.get(m)));
       builder.addInputFile(m);
     }
     return builder.build();