Update functionality

Author: Yauhenikapl

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

@@ -41,24 +41,20 @@ public class MetaModelBaseAttributes implements HasDescription {
    private final boolean isAnonymous;
    private final AspectModelFile sourceFile;
 
-   private final ScalarValue exampleValue;
-
    private MetaModelBaseAttributes(
          final AspectModelUrn urn,
          final Set<LangString> preferredNames,
          final Set<LangString> descriptions,
          final List<String> see,
          final boolean isAnonymous,
-         final AspectModelFile sourceFile,
-         final ScalarValue exampleValue
+         final AspectModelFile sourceFile
    ) {
       this.urn = urn;
       this.preferredNames = preferredNames;
       this.descriptions = descriptions;
       this.see = see;
       this.isAnonymous = isAnonymous;
       this.sourceFile = sourceFile;
-      this.exampleValue = exampleValue;
    }
 
    public AspectModelUrn urn() {
@@ -93,10 +89,6 @@ public AspectModelFile getSourceFile() {
       return sourceFile;
    }
 
-   public ScalarValue getExampleValue() {
-      return exampleValue;
-   }
-
    public static Builder builder() {
       return new Builder();
    }
@@ -116,7 +108,7 @@ public boolean equals( final Object o ) {
 
    @Override
    public int hashCode() {
-      return Objects.hash( urn, preferredNames, descriptions, see, isAnonymous, exampleValue );
+      return Objects.hash( urn, preferredNames, descriptions, see, isAnonymous );
    }
 
    /**
@@ -127,8 +119,7 @@ public int hashCode() {
     */
    public static MetaModelBaseAttributes fromModelElement( final ModelElement modelElement ) {
       return new MetaModelBaseAttributes( modelElement.urn(), modelElement.getPreferredNames(),
-            modelElement.getDescriptions(), modelElement.getSee(), modelElement.isAnonymous(), modelElement.getSourceFile(),
-            new DefaultScalarValue( "", new DefaultScalar( "http://www.w3.org/2001/XMLSchema#string" ) ) );
+            modelElement.getDescriptions(), modelElement.getSee(), modelElement.isAnonymous(), modelElement.getSourceFile() );
    }
 
    public static class Builder {
@@ -139,8 +130,6 @@ public static class Builder {
       private boolean isAnonymous = true;
       private AspectModelFile sourceFile;
 
-      private ScalarValue exampleValue;
-
       public Builder withUrn( final String urn ) {
          return withUrn( AspectModelUrn.fromUrn( urn ) );
       }
@@ -204,13 +193,8 @@ public Builder isAnonymous( final boolean isAnonymous ) {
          return this;
       }
 
-      public Builder withExampleValue( final ScalarValue exampleValue ) {
-         this.exampleValue = exampleValue;
-         return this;
-      }
-
       public MetaModelBaseAttributes build() {
-         return new MetaModelBaseAttributes( urn, preferredNames, descriptions, see, isAnonymous, sourceFile, exampleValue );
+         return new MetaModelBaseAttributes( urn, preferredNames, descriptions, see, isAnonymous, sourceFile );
       }
    }
 }

core/esmf-aspect-model-java-generator/src/main/java/org/eclipse/esmf/aspectmodel/java/metamodel/StaticMetaModelVisitor.java

@@ -544,6 +544,12 @@ private <T> String getOptionalStaticDeclarationValue( final Type type, final Opt
       return "Optional.of(" + valueInitializer.apply( xsdType, valueExpression ) + ")";
    }
 
+   public String exampleValue(final Property property, final StaticCodeGenerationContext context) {
+      return property.getExampleValue()
+            .map(exampleValue -> "Optional.of(" + this.visitScalarValue(exampleValue, context) + ")")
+            .orElse("Optional.empty()");
+   }
+
    /*
     * This method is a crutch because velocity is not able to call the parameterized actual method
     */
@@ -575,14 +581,6 @@ public String getMetaModelBaseAttributes( final ModelElement element, final Stat
       element.getSee().stream().sorted()
             .forEach( see -> builder.append( ".withSee(" ).append( AspectModelJavaUtil.createLiteral( see ) ).append( ")" ) );
 
-      if ( element instanceof final Property property ) {
-         property.getExampleValue().ifPresent( exampleValue ->
-               builder.append( ".withExampleValue(" )
-                     .append( this.visitScalarValue( property.getExampleValue().get(), context ) )
-                     .append( ")" )
-         );
-      }
-
       builder.append( ".build()" );
       return builder.toString();
    }

core/esmf-aspect-model-java-generator/src/main/resources/java-static-class-property-lib.vm

@@ -131,7 +131,7 @@
     ## $arg1, $arg2, ... ) {
     $modelVisitor.metaModelBaseAttributes( $property, $context ),
     #propertyCharacteristic( $property.getCharacteristic().get(), $propertyType ),
-Optional.empty(),
+    $modelVisitor.exampleValue( $property, $context ),
     $property.isOptional(),
     $property.isNotInPayload(),
 Optional.of("$property.getPayloadName()"),

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

@@ -514,11 +514,19 @@ void testCharacteristicInstantiationForPropertyWithExampleValue() throws IOExcep
             "withPreferredName(Locale.forLanguageTag(\"en\"), \"Test Property\")",
             "withDescription(Locale.forLanguageTag(\"en\"), \"This is a test property.\")",
             "withSee(\"http://example.com/\")",
-            "withSee(\"http://example.com/me\")",
-            "withExampleValue(new DefaultScalarValue(\"Example Value\", new DefaultScalar(\"http://www.w3.org/2001/XMLSchema#string\")))"
+            "withSee(\"http://example.com/me\")"
       ) );
 
       result.assertMetaModelBaseAttributesForProperties( "MetaAspectWithCollection", expectedBaseAttributes );
+
+      final String expectedTestPropertyCharacteristicConstructorCall =
+            "new DefaultCollection(MetaModelBaseAttributes.builder().withUrn(AspectModelUrn.fromUrn(NAMESPACE + \"TestCollection\"))"
+                  + ".withPreferredName(Locale.forLanguageTag(\"en\"), \"Test Collection\").withDescription(Locale.forLanguageTag(\"en\")"
+                  + ", \"This is a test collection.\").withSee(\"http://example.com/\").build(), Optional.of(new DefaultScalar"
+                  + "(\"http://www.w3.org/2001/XMLSchema#string\")), Optional.empty())";
+
+      result.assertConstructorArgumentForProperties( "MetaAspectWithCollection",
+            ImmutableMap.<String, String> builder().put( "TEST_PROPERTY", expectedTestPropertyCharacteristicConstructorCall ).build(), 1 );
    }
 
    @Test