style: code style hints from IntelliJ

- Cleanup code
- Source version set to 21
- Updated library versions

Author: h-man2

use-core/pom.xml

@@ -12,8 +12,8 @@
     <artifactId>use-core</artifactId>
 
     <properties>
-        <maven.compiler.source>14</maven.compiler.source>
-        <maven.compiler.target>14</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.jruby</groupId>
             <artifactId>jruby-core</artifactId>
-            <version>9.3.1.0</version>
+            <version>9.4.5.0</version>
         </dependency>
         <dependency>
             <groupId>com.ximpleware</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava-testlib</artifactId>
-            <version>20.0</version>
+            <version>33.2.1-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -304,4 +304,11 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <repository>
+            <id>maven_central</id>
+            <name>Maven Central</name>
+            <url>https://repo.maven.apache.org/maven2/</url>
+        </repository>
+    </repositories>
 </project>

use-core/src/it/java/org/tzi/use/OCLExpressionIT.java

@@ -1,17 +1,14 @@
 package org.tzi.use;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
-
 import org.junit.jupiter.api.Test;
 import org.tzi.use.api.UseApiException;
 import org.tzi.use.api.UseModelApi;
 import org.tzi.use.api.UseSystemApi;
 import org.tzi.use.api.impl.UseSystemApiNative;
-import org.tzi.use.uml.mm.MModel;
 import org.tzi.use.uml.ocl.value.Value;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class OCLExpressionIT {
 
     @Test

use-core/src/main/java/org/tzi/use/analysis/coverage/AbstractCoverageVisitor.java

@@ -54,15 +54,13 @@ protected abstract void addOperationCoverage(MClassifier sourceClassifier,
 
 	@Override
 	public void visitAllInstances(ExpAllInstances exp) {
-		if (exp.getSourceType() instanceof MDataType) {
-			addDataTypeCoverage((MDataType) exp.getSourceType());
-		} else if (exp.getSourceType() instanceof MClass) {
-			addClassCoverage((MClass) exp.getSourceType());
-		} else if (exp.getSourceType() instanceof MAssociation) {
-			addAssociationCoverage((MAssociation) exp.getSourceType());
-		} else {
-			// handle case
-		}
+        switch (exp.getSourceType()) {
+            case MDataType mDataType -> addDataTypeCoverage(mDataType);
+            case MClass mClass -> addClassCoverage(mClass);
+            case MAssociation mAssociation -> addAssociationCoverage(mAssociation);
+            case null, default ->
+                    throw new RuntimeException("Unhandled subtype %s in visitor".formatted(exp.getClass().getName()));
+        }
 	}
 
 	@Override
@@ -188,7 +186,7 @@ public void visitObjAsSet(ExpObjAsSet exp) {
 		exp.getObjectExpression().processWithVisitor(this);
 	}
 
-	private Stack<MOperation> operationStack = new Stack<MOperation>();
+	private final Stack<MOperation> operationStack = new Stack<MOperation>();
 
 	@Override
 	public void visitObjOp(ExpObjOp exp) {

use-core/src/main/java/org/tzi/use/config/Options.java

@@ -48,9 +48,6 @@ public class Options {
     public static final String COPYRIGHT = "Copyright (C) 1999-2024 University of Bremen & " +
 			"University of Applied Sciences Hamburg";
 
-    // the trained support apes
-    public static final String SUPPORT_MAIL = "grp-usedevel@informatik.uni-bremen.de";
-
     /**
      * Name of the file for user properties.
      */

use-core/src/main/java/org/tzi/use/gen/tool/GGenerator.java

@@ -24,15 +24,6 @@
 
 package org.tzi.use.gen.tool;
 
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Collection;
-import java.util.List;
-
 import org.tzi.use.config.Options;
 import org.tzi.use.gen.assl.dynamics.GEvalProcedure;
 import org.tzi.use.gen.assl.dynamics.GEvaluationException;
@@ -48,6 +39,10 @@
 import org.tzi.use.uml.sys.soil.MStatement;
 import org.tzi.use.util.Log;
 
+import java.io.*;
+import java.util.Collection;
+import java.util.List;
+
 
 /**
  * Provides operations called by the <code>GGeneratorShell</code>.
@@ -81,14 +76,14 @@ protected void internalError(GEvaluationException e, long randomNr) {
             e.printStackTrace(pw);
             pw.close();
             System.err.println("THE GENERATOR HAS AN INTERNAL ERROR." + nl +
-                               "PLEASE SEND THE FILE `generator_error.txt'"+nl+
-                               "TO " + Options.SUPPORT_MAIL + ".");
+                               "PLEASE SUBMIT THE FILE `generator_error.txt'"+nl+
+                               "AS AN ISSUE ON GITHUB.");
             System.err.println("The random number generator was " 
                                + "initialized with " + randomNr + ".");
         } catch (IOException ioException) {
             System.err.println("THE GENERATOR HAS AN INTERNAL ERROR." + nl +
-                               "PLEASE SEND THE FOLLOWING INFORMATION "+nl+
-                               "TO " + Options.SUPPORT_MAIL + ".");
+                               "PLEASE SUBMIT THE FOLLOWING INFORMATION "+nl+
+                               "AS AN ISSUE ON GITHUB.");
             System.err.println("Program version: " + Options.RELEASE_VERSION);
             System.err.println("Stack trace: ");
             e.printStackTrace();

use-core/src/main/java/org/tzi/use/uml/mm/MAggregationKind.java

@@ -37,11 +37,11 @@ private MAggregationKind() {}
     /**
      * Returns a string representation of the enumeration values.
      */
-    public static final String name(int k) { 
+    public static String name(int k) {
         return fNames[k];
     }
 
-    public static final boolean isValid(int k) {
+    public static boolean isValid(int k) {
     	return k >= 0 && k <= 2;
     }
 }

use-core/src/main/java/org/tzi/use/uml/mm/MAssociationClassImpl.java

@@ -19,14 +19,6 @@
 
 package org.tzi.use.uml.mm;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.eclipse.jdt.annotation.NonNull;
 import org.tzi.use.uml.mm.statemachines.MProtocolStateMachine;
 import org.tzi.use.uml.ocl.expr.Expression;
@@ -35,6 +27,8 @@
 import org.tzi.use.uml.ocl.type.TypeFactory;
 import org.tzi.use.uml.sys.MOperationCall;
 
+import java.util.*;
+
 
 /**
  * An associationclass is a class and a association at once.
@@ -48,8 +42,8 @@
 
 public class MAssociationClassImpl extends MClassifierImpl implements MAssociationClass {
 
-    private MAssociationImpl fAssociationImpl;
-    private MClassImpl fClassImpl;
+    private final MAssociationImpl fAssociationImpl;
+    private final MClassImpl fClassImpl;
 
     /**
      * Creates a new associationclass.
@@ -520,7 +514,7 @@ public List<MNavigableElement> navigableEndsFrom( MClass cls ) {
     	List<MNavigableElement> nav;
 
     	if (cls.equals(this)) {
-    		nav = new ArrayList<MNavigableElement>(navigableEnds().values());
+    		nav = new ArrayList<>(navigableEnds().values());
     	} else {
     		nav = fAssociationImpl.navigableEndsFrom( cls );
     		nav.add( this );
@@ -530,7 +524,7 @@ public List<MNavigableElement> navigableEndsFrom( MClass cls ) {
     }
 
     public Collection<MNavigableElement> navigableElements() {
-        List<MNavigableElement> ne = new ArrayList<MNavigableElement>( navigableEnds().values() );
+        List<MNavigableElement> ne = new ArrayList<>(navigableEnds().values());
         ne.add( this );
         return ne;
     }

use-core/src/main/java/org/tzi/use/uml/mm/MAssociationEnd.java

@@ -19,19 +19,15 @@
 
 package org.tzi.use.uml.mm;
 
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
 import org.tzi.use.uml.ocl.expr.Expression;
 import org.tzi.use.uml.ocl.expr.VarDecl;
 import org.tzi.use.uml.ocl.expr.VarDeclList;
 import org.tzi.use.uml.ocl.type.Type;
 import org.tzi.use.uml.ocl.type.TypeFactory;
 import org.tzi.use.util.collections.CollectionUtil;
 
+import java.util.*;
+
 /** 
  * An AssociationEnd stores information about the role a class plays
  * in an association.
@@ -41,10 +37,10 @@
 public final class MAssociationEnd extends MModelElementImpl implements MNavigableElement {
 
     private MAssociation fAssociation; // Owner of this association end
-    private MClass fClass;  // associated class
-    private MMultiplicity fMultiplicity; // multiplicity spec
+    private final MClass fClass;  // associated class
+    private final MMultiplicity fMultiplicity; // multiplicity spec
     private int fKind; // none, aggregation, or composition
-    private boolean fIsOrdered; // use as Set or OrderedSet
+    private final boolean fIsOrdered; // use as Set or OrderedSet
     private boolean fIsNavigable = true; 
     private boolean fIsExplicitNavigable = false;
 
@@ -113,11 +109,8 @@ public MAssociationEnd(MClass cls,
         fMultiplicity = mult;
         setAggregationKind(kind);
         fIsOrdered = isOrdered;
-        
-        if (qualifiers == null)
-        	this.qualifier = Collections.emptyList();
-        else
-        	this.qualifier = qualifiers;
+
+        this.qualifier = Objects.requireNonNullElse(qualifiers, Collections.emptyList());
     }
 
     /** 
@@ -248,7 +241,7 @@ public boolean equals(Object obj) {
     public Type getType( Type sourceObjectType, MNavigableElement src, boolean qualifiedAccess ) {
     	Type t;
 
-    	if (this.getRedefiningEnds().size() > 0) {
+    	if (!this.getRedefiningEnds().isEmpty()) {
     		t = getRedefinedType((MClass)sourceObjectType);
     	} else {
     		t = cls();
@@ -480,7 +473,7 @@ public List<VarDecl> getQualifiers() {
 
 	@Override
 	public boolean hasQualifiers() {
-		return getQualifiers().size() > 0;
+		return !getQualifiers().isEmpty();
 	}
 
 	/* (non-Javadoc)