Fix code style

Author: atextor

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/vocabulary/SAMM.java

@@ -50,6 +50,7 @@ public String getNamespace() {
       return getUri() + "#";
    }
 
+   @SuppressWarnings( "checkstyle:MethodName" )
    public Resource Namespace() {
       return resource( "Namespace" );
    }

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/RdfUtil.java

@@ -88,6 +88,9 @@ public static void cleanPrefixes( final Model model ) {
             case CHARACTERISTIC -> model.setNsPrefix( SammNs.SAMMC.getShortForm(), SammNs.SAMMC.getNamespace() );
             case ENTITY -> model.setNsPrefix( SammNs.SAMME.getShortForm(), SammNs.SAMME.getNamespace() );
             case UNIT -> model.setNsPrefix( SammNs.UNIT.getShortForm(), SammNs.UNIT.getNamespace() );
+            default -> {
+               // nothing to do
+            }
          }
       } );
       // XSD
@@ -104,7 +107,7 @@ public static void cleanPrefixes( final Model model ) {
                         .map( Resource::getURI )
                         .filter( type -> type.startsWith( XSD.NS ) ) )
             .findAny()
-            .ifPresent( __ -> model.setNsPrefix( "xsd", XSD.NS ) );
+            .ifPresent( resource -> model.setNsPrefix( "xsd", XSD.NS ) );
       // Empty (namespace) prefix
       Streams.stream( model.listStatements( null, RDF.type, (RDFNode) null ) )
             .map( Statement::getSubject )

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/ChangeReport.java

@@ -20,7 +20,7 @@
  * A structured representation of a number of {@link Change}s
  */
 public interface ChangeReport {
-   ChangeReport NoChanges = new ChangeReport() {
+   ChangeReport NO_CHANGES = new ChangeReport() {
    };
 
    record SimpleEntry( String text ) implements ChangeReport {

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/change/EditAspectModel.java

@@ -43,7 +43,7 @@ protected record ModelChanges( Model add, Model remove, String description ) {
     * @param aspectModelFile the AspectModelFile to change
     * @return the set of changes
     */
-   abstract protected ModelChanges calculateChangesForFile( AspectModelFile aspectModelFile );
+   protected abstract ModelChanges calculateChangesForFile( AspectModelFile aspectModelFile );
 
    @Override
    public ChangeReport fire( final ChangeContext changeContext ) {

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/change/MoveElementToExistingFile.java

@@ -59,7 +59,7 @@ public ChangeReport fire( final ChangeContext changeContext ) {
       // Find source file with element definition
       final AspectModelFile sourceFile = sourceFile( changeContext, elementUrn );
       if ( sourceFile == targetFile ) {
-         return ChangeReport.NoChanges;
+         return ChangeReport.NO_CHANGES;
       }
       final Resource elementResource = sourceFile.sourceModel().createResource( elementUrn.toString() );
       final Model definition = RdfUtil.getModelElementDefinition( elementResource );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/change/StructuralChange.java

@@ -25,7 +25,8 @@
 
 public abstract class StructuralChange extends AbstractChange {
    protected AspectModelFile sourceFile( final ChangeContext changeContext, final AspectModelUrn elementUrn ) {
-      return changeContext.aspectModelFiles().filter( aspectModelFile -> {
+      return changeContext.aspectModelFiles()
+            .filter( aspectModelFile -> {
                final Resource elementResource = aspectModelFile.sourceModel().createResource( elementUrn.toString() );
                return Streams.stream( aspectModelFile.sourceModel().listStatements( elementResource, RDF.type, (RDFNode) null ) )
                      .count() == 1;

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/AspectModelLoader.java

@@ -491,7 +491,7 @@ private void setNamespaces( final Collection<AspectModelFile> files, final Colle
                final AspectModelFile elementFile = element.getSourceFile();
                if ( elementFile.sourceModel().contains( null, RDF.type, SammNs.SAMM.Namespace() ) ) {
                   final Model model = elementFile.sourceModel();
-                  final ModelElementFactory modelElementFactory = new ModelElementFactory( model, Map.of(), __ -> null );
+                  final ModelElementFactory modelElementFactory = new ModelElementFactory( model, Map.of(), r -> null );
                   final Resource namespaceResource = model.listStatements( null, RDF.type, SammNs.SAMM.Namespace() )
                         .mapWith( Statement::getSubject )
                         .toList().iterator().next();

core/esmf-aspect-meta-model-java/src/test/java/org/eclipse/esmf/aspectmodel/edit/RdfUtilTest.java

@@ -35,7 +35,7 @@
 public class RdfUtilTest {
    @ParameterizedTest
    @EnumSource( value = TestAspect.class )
-   void testEveryElementDefinitionContainsATypeAssertion( final TestAspect aspect ) {
+   void testEveryElementDefinitionContainsTypeAssertion( final TestAspect aspect ) {
       final AspectModel aspectModel = TestResources.load( aspect );
       aspectModel.elements().stream()
             .filter( element -> !element.isAnonymous() )

core/esmf-aspect-model-java-generator/src/test/java/org/eclipse/esmf/aspectmodel/java/AspectModelJavaUtilTest.java

@@ -22,12 +22,12 @@
 import org.eclipse.esmf.metamodel.Value;
 import org.eclipse.esmf.test.shared.arbitraries.PropertyBasedTest;
 
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 import net.jqwik.api.ForAll;
 import net.jqwik.api.Property;
 import net.jqwik.api.Tuple;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class AspectModelJavaUtilTest extends PropertyBasedTest {
    private boolean isValidJavaIdentifier( final String value ) {

tools/samm-cli/src/main/java/org/eclipse/esmf/SammCli.java

@@ -212,8 +212,8 @@ private static String[] adjustCommandLineArguments( final String[] argv ) {
             List.of( "help", AasCommand.COMMAND_NAME, AasToCommand.COMMAND_NAME ) );
       final int helpAspectEditIndex = Collections.indexOfSubList( argvList,
             List.of( "help", AspectCommand.COMMAND_NAME, AspectEditCommand.COMMAND_NAME ) );
-      final int helpAspectXIndex = Collections.indexOfSubList( argvList, List.of( "help", AspectCommand.COMMAND_NAME ) );
-      final int helpAasXIndex = Collections.indexOfSubList( argvList, List.of( "help", AasCommand.COMMAND_NAME ) );
+      final int helpAspectSomeIndex = Collections.indexOfSubList( argvList, List.of( "help", AspectCommand.COMMAND_NAME ) );
+      final int helpAasSomeIndex = Collections.indexOfSubList( argvList, List.of( "help", AasCommand.COMMAND_NAME ) );
       if ( helpAspectToIndex != -1 || helpAasToIndex != -1 || helpAspectEditIndex != -1 ) {
          final int index = IntStream.of( helpAspectToIndex, helpAasToIndex, helpAspectEditIndex ).max().getAsInt();
          final List<String> customArgv = new ArrayList<>( argvList.subList( 0, index ) );
@@ -223,9 +223,9 @@ private static String[] adjustCommandLineArguments( final String[] argv ) {
          customArgv.add( "help" );
          customArgv.addAll( argvList.subList( index + 3, argvList.size() ) );
          adjustedArgv = customArgv.toArray( new String[] {} );
-      } else if ( helpAspectXIndex != -1 || helpAasXIndex != -1 ) {
+      } else if ( helpAspectSomeIndex != -1 || helpAasSomeIndex != -1 ) {
          // "help aspect prettyprint" -> "aspect help prettyprint"
-         final int index = Integer.max( helpAspectXIndex, helpAasXIndex );
+         final int index = Integer.max( helpAspectSomeIndex, helpAasSomeIndex );
          final List<String> customArgv = new ArrayList<>( argvList.subList( 0, index ) );
          customArgv.add( argvList.get( index + 1 ) );
          customArgv.add( "help" );