Improve inefficient code

Author: atextor

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

@@ -525,7 +525,7 @@ private void setNamespaces( final Collection<AspectModelFile> files, final Colle
                   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();
+                        .toList().getFirst();
                   namespaceDefinition = modelElementFactory.createBaseAttributes( namespaceResource );
                   fileContainingNamespaceDefinition = elementFile;
                   break;

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

@@ -125,11 +125,17 @@ public Model migrate( final Model sourceModel ) {
    }
 
    public enum BammVersion {
-      BAMM_1_0_0,
-      BAMM_2_0_0;
+      BAMM_1_0_0( "1.0.0" ),
+      BAMM_2_0_0( "2.0.0" );
+
+      private final String versionString;
+
+      BammVersion( final String versionString ) {
+         this.versionString = versionString;
+      }
 
       public String versionString() {
-         return toString().replaceFirst( "BAMM_(\\d+)_(\\d+)_(\\d+)", "$1.$2.$3" );
+         return versionString;
       }
    }
 }

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

@@ -19,7 +19,6 @@
 import org.eclipse.esmf.samm.KnownVersion;
 
 public class SammMetaModelVersionUriRewriter extends AbstractUriRewriter {
-
    public SammMetaModelVersionUriRewriter( final KnownVersion sourceVersion, final KnownVersion targetVersion ) {
       super( sourceVersion, targetVersion );
    }
@@ -31,15 +30,15 @@ public int order() {
 
    @Override
    protected Optional<String> rewriteUri( final String oldUri, final Map<String, String> oldToNewNamespaces ) {
-      final String[] uriParts = oldUri.split( "#" );
-      if ( uriParts.length == 1 ) {
+      final int indexOfHash = oldUri.indexOf( '#' );
+      if ( indexOfHash == -1 ) {
+         return Optional.empty();
+      }
+      final String newNamespace = oldToNewNamespaces.get( oldUri.substring( 0, indexOfHash + 1 ) );
+      if ( newNamespace == null ) {
          return Optional.empty();
       }
-      return oldToNewNamespaces.keySet()
-            .stream()
-            .filter( key -> key.equals( uriParts[0] + "#" ) )
-            .findAny()
-            .map( key -> oldToNewNamespaces.get( key ) + uriParts[1] );
+      return Optional.of( newNamespace + oldUri.substring( indexOfHash + 1 ) );
    }
 
    @Override

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/impl/DefaultScalarValue.java

@@ -31,6 +31,23 @@ public class DefaultScalarValue implements ScalarValue {
 
    private final MetaModelBaseAttributes metaModelBaseAttributes;
 
+   /**
+    * Constructor for non-described/anonymous scalar values
+    *
+    * @param value the value
+    * @param type the type
+    */
+   public DefaultScalarValue( final Object value, final Scalar type ) {
+      this( null, value, type );
+   }
+
+   /**
+    * Standard constructor for scalar values that provides context information such as the value's descriptions
+    *
+    * @param metaModelBaseAttributes the base attributes
+    * @param value the value
+    * @param type the type
+    */
    public DefaultScalarValue( final MetaModelBaseAttributes metaModelBaseAttributes, final Object value, final Scalar type ) {
       this.metaModelBaseAttributes = metaModelBaseAttributes;
       this.value = value;
@@ -49,22 +66,22 @@ public Scalar getType() {
 
    @Override
    public List<String> getSee() {
-      return metaModelBaseAttributes.getSee();
+      return metaModelBaseAttributes == null ? List.of() : metaModelBaseAttributes.getSee();
    }
 
    @Override
    public Set<LangString> getPreferredNames() {
-      return metaModelBaseAttributes.getPreferredNames();
+      return metaModelBaseAttributes == null ? Set.of() : metaModelBaseAttributes.getPreferredNames();
    }
 
    @Override
    public Set<LangString> getDescriptions() {
-      return metaModelBaseAttributes.getDescriptions();
+      return metaModelBaseAttributes == null ? Set.of() : metaModelBaseAttributes.getDescriptions();
    }
 
    @Override
    public AspectModelFile getSourceFile() {
-      return metaModelBaseAttributes.getSourceFile();
+      return metaModelBaseAttributes == null ? null : metaModelBaseAttributes.getSourceFile();
    }
 
    @Override

core/esmf-aspect-model-urn/src/main/java/org/eclipse/esmf/aspectmodel/urn/AspectModelUrn.java

@@ -73,6 +73,7 @@ public class AspectModelUrn implements Comparable<AspectModelUrn> {
    private final String namespaceMainPart;
    private final ElementType elementType;
    private final boolean isSammUrn;
+   private final String namespaceIdentifier;
 
    @JsonValue
    private final URI urn;
@@ -85,6 +86,10 @@ private AspectModelUrn( final URI urn, final String name, final String namespace
       this.elementType = elementType;
       this.version = version;
       this.isSammUrn = isSammUrn;
+      final String urnString = urn.toString();
+      namespaceIdentifier = urnString.contains( "#" )
+            ? urnString.substring( 0, urnString.indexOf( '#' ) )
+            : urnString;
    }
 
    /**
@@ -357,7 +362,7 @@ public String getNamespaceMainPart() {
     * @return the prefix part of the URN
     */
    public String getNamespaceIdentifier() {
-      return urn.toString().split( "#" )[0];
+      return namespaceIdentifier;
    }
 
    /**