Update code with checking matcher

Author: Yauhenikapl

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

@@ -28,6 +28,8 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import javax.xml.datatype.DatatypeConstants;
+
 import org.eclipse.esmf.aspectmodel.VersionInfo;
 import org.eclipse.esmf.aspectmodel.java.exception.CodeGenerationException;
 import org.eclipse.esmf.aspectmodel.visitor.AspectStreamTraversalVisitor;
@@ -474,9 +476,7 @@ public static String generateInitializer( final Property property, final String
          final Class<?> result = SammXsdType.getJavaTypeForMetaModelType( typeResource );
          codeGenerationConfig.importTracker().importExplicit( result );
          final String initializer = valueInitializer.apply( typeResource, value );
-         return property.isOptional()
-               ? optionalExpression( initializer, codeGenerationConfig )
-               : initializer;
+         return optionalExpression( initializer, codeGenerationConfig );
       } ).orElseThrow( () -> new CodeGenerationException(
             "The Either Characteristic is not allowed for Properties used as elements in a StructuredValue" ) );
    }
@@ -683,6 +683,21 @@ public static String optionalExpression(
          final JavaCodeGenerationConfig codeGenerationConfig
    ) {
       codeGenerationConfig.importTracker().importExplicit( Optional.class );
-      return "Optional.of(" + expression + ")";
+      codeGenerationConfig.importTracker().importExplicit( DatatypeConstants.class );
+
+      // Check if this is for XMLGregorianCalendar date handling
+      if ( expression.contains( "matcher.group(1)" ) && expression.contains( "XMLGregorianCalendarDate" ) ) {
+         return "Optional.ofNullable(matcher.group(1))" +
+               ".filter(v -> v != null)" +
+               ".map(v -> Integer.valueOf(v))" +
+               ".map(v -> _datatypeFactory.newXMLGregorianCalendarDate(v, " +
+               "DatatypeConstants.FIELD_UNDEFINED, " +
+               "DatatypeConstants.FIELD_UNDEFINED, " +
+               "DatatypeConstants.FIELD_UNDEFINED))";
+      }
+
+      // Default case - use ofNullable with empty check
+      return "Optional.ofNullable(" + expression + ")" +
+            ".filter(v -> v != null)";
    }
 }

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

@@ -14,6 +14,7 @@
 package org.eclipse.esmf.aspectmodel.java;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -22,6 +23,7 @@
 import org.eclipse.esmf.metamodel.HasProperties;
 import org.eclipse.esmf.metamodel.Property;
 import org.eclipse.esmf.metamodel.characteristic.StructuredValue;
+import org.eclipse.esmf.metamodel.impl.DefaultProperty;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -116,6 +118,18 @@ private List<Property> getAllProperties( final List<DeconstructionSet> deconstru
       return deconstructionSets.stream()
             .map( DeconstructionSet::elementProperties )
             .flatMap( List::stream )
+            .map( property -> (Property) new DefaultProperty(
+                  MetaModelBaseAttributes.builder()
+                        .fromModelElement( property )
+                        .build(),
+                  property.getCharacteristic(),
+                  property.getExampleValue(),
+                  true, // making it optional
+                  property.isNotInPayload(),
+                  Optional.of( property.getPayloadName() ),
+                  property.isAbstract(),
+                  property.getExtends()
+            ) )
             .toList();
    }
 

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

@@ -258,7 +258,9 @@ void testGenerateAspectWithOptionalPropertyAndEntityWithSeparateFiles() throws I
       ConstructorDeclaration constructor = unit.findFirst( ConstructorDeclaration.class )
             .orElseThrow( () -> new AssertionError( "Constructor not found in ProductionPeriodEntity" ) );
       String constructorBody = constructor.getBody().toString();
-      assertThat( constructorBody ).contains( "Optional.of(_datatypeFactory.newXMLGregorianCalendarDate(" );
+      assertThat( constructorBody ).contains( "Optional.ofNullable(" );
+      assertThat( constructorBody ).contains( ".filter(v -> v != null)" );
+      assertThat( constructorBody ).contains( "_datatypeFactory.newXMLGregorianCalendarDate(" );
    }
 
    @Test

core/esmf-test-aspect-models/src/main/resources/valid/org.eclipse.esmf.test/1.0.0/AspectWithOptionalPropertiesAndEntityWithSeparateFiles.ttl

@@ -55,7 +55,7 @@
    samm:preferredName "Year with Optional Month"@en ;
    samm:dataType xsd:string ;
    samm-c:deconstructionRule "^([0-9]{4})(?:-(0[1-9]|1[0-2]))?" ;
-   samm-c:elements ( "^" :year "-" [ samm:property :month; samm:optional true ] "$" ) .
+   samm-c:elements ( "^" :year "-" :month "$" ) .
 
 :YearAndOptionalMonthRegex a samm-c:RegularExpressionConstraint ;
    samm:value "^([0-9]{4})(?:-(0[1-9]|1[0-2]))?" .
@@ -64,6 +64,7 @@
    samm:characteristic :YearCharacteristic .
 
 :month a samm:Property ;
+   samm:optional true ;
    samm:characteristic :MonthCharacteristic .
 
 :YearCharacteristic a samm:Characteristic ;