Refactoring and add logic for anonymous elements

Author: Yauhenikapl

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

@@ -646,7 +646,7 @@ public ElementModel visitProperty( final Property property, final ModelElement c
       model.add( serializeDescriptions( resource, property ) );
 
       property.getExampleValue().ifPresent( exampleValue -> {
-         final ElementModel exampleValueElementModel = ( exampleValue ).accept( this, property );
+         final ElementModel exampleValueElementModel = exampleValue.accept( this, property );
          model.add( exampleValueElementModel.model() );
          exampleValueElementModel.focusElement().ifPresent( exampleValueNode ->
                model.add( resource, SammNs.SAMM.exampleValue(), exampleValueNode ) );

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/metamodel/builder/SammBuilder.java

@@ -15,7 +15,7 @@
 
 import static org.eclipse.esmf.metamodel.DataTypes.dataTypeByUri;
 import static org.eclipse.esmf.metamodel.DataTypes.xsd;
-import static org.eclipse.esmf.metamodel.Elements.*;
+import static org.eclipse.esmf.metamodel.Elements.samm_e;
 
 import java.math.BigInteger;
 import java.net.URI;
@@ -1391,20 +1391,33 @@ public static ScalarValue value( final double doubleValue ) {
    public static ScalarValue value( final Object value, final Scalar type ) {
       MetaModelBaseAttributes metaModelBaseAttributes;
 
-      if ( value instanceof ScalarValue scalarValue ) {
-         metaModelBaseAttributes = MetaModelBaseAttributes.builder()
-               .withUrn( scalarValue.urn() )
-               .withPreferredNames( scalarValue.getPreferredNames() )
-               .withDescriptions( scalarValue.getDescriptions() )
-               .withSee( scalarValue.getSee() )
-               .isAnonymous( scalarValue.isAnonymous() )
-               .withSourceFile( scalarValue.getSourceFile() )
-               .build();
+      if ( value instanceof ModelElement modelElement ) {
+         boolean hasUrn = modelElement.urn() != null;
+
+         MetaModelBaseAttributes.Builder builder = MetaModelBaseAttributes.builder()
+               .isAnonymous( !hasUrn );
+
+         if ( hasUrn ) {
+            builder.withUrn( modelElement.urn() );
+         } else if ( !builder.build().isAnonymous() ) {
+            throw new IllegalStateException( "Non-anonymous ModelElement must have a URN: " + modelElement );
+         }
+
+         if ( modelElement instanceof ScalarValue scalarValue ) {
+            builder
+                  .withPreferredNames( scalarValue.getPreferredNames() )
+                  .withDescriptions( scalarValue.getDescriptions() )
+                  .withSee( scalarValue.getSee() )
+                  .withSourceFile( scalarValue.getSourceFile() );
+         }
+
+         metaModelBaseAttributes = builder.build();
       } else {
          metaModelBaseAttributes = MetaModelBaseAttributes.builder()
-               .isAnonymous( false )
+               .isAnonymous( true )
                .build();
       }
+
       return new DefaultScalarValue( metaModelBaseAttributes, value, dataTypeByUri( type.getUrn() ) );
    }