Fix tests

Author: Yauhenikapl

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

@@ -685,26 +685,32 @@ public static String optionalExpression(
       codeGenerationConfig.importTracker().importExplicit( Optional.class );
       codeGenerationConfig.importTracker().importExplicit( DatatypeConstants.class );
 
+      // Enhanced pattern to match both Integer and Long valueOf calls
       final Pattern pattern = java.util.regex.Pattern.compile(
-            "Integer\\s*\\.\\s*valueOf\\s*\\(\\s*matcher\\s*\\.\\s*group\\s*\\(\\s*(\\d+)\\s*\\)\\s*\\)"
+            "(Integer|Long)\\s*\\.\\s*valueOf\\s*\\(\\s*matcher\\s*\\.\\s*group\\s*\\(\\s*(\\d+)\\s*\\)\\s*\\)"
       );
       Matcher matcher = pattern.matcher( expression );
       matcher.reset();
       boolean hasMatch = matcher.find();
 
       if ( hasMatch ) {
-         final String groupNum = matcher.group( 1 ).trim(); // Trim any captured whitespace
+         final String numberType = matcher.group( 1 ).trim(); // "Integer" or "Long"
+         final String groupNum = matcher.group( 2 ).trim(); // Group number
          final String target = matcher.group( 0 ); // The entire matched string
          final String modifiedExpression = expression.replace( target, "v" );
 
          return "Optional.ofNullable(matcher.group(" + groupNum + "))"
                + ".filter(v -> !v.isEmpty())"
-               + ".map(v -> Integer.valueOf(v))"
+               + ".map(v -> " + numberType + ".valueOf(v))"
                + ".map(v -> "
                + modifiedExpression
                + ")";
       }
 
-      return expression;
+      // If no specific pattern matched, wrap the entire expression in Optional.of()
+      // This handles cases where the expression doesn't follow the matcher.group pattern
+      return "Optional.ofNullable("
+            + expression
+            + ")";
    }
 }

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

@@ -624,9 +624,9 @@ void testGenerateAspectModelMultipleEntitiesOnMultipleLevelsWithoutJacksonAnnota
    void testGenerateAspectWithStructuredValue() throws IOException {
       final ImmutableMap<String, Object> expectedFieldsForAspectClass = ImmutableMap.<String, Object> builder()
             .put( "date", XMLGregorianCalendar.class )
-            .put( "year", Long.class )
-            .put( "month", Long.class )
-            .put( "day", Long.class )
+            .put( "year", new TypeToken<Optional<Long>>(){}.getType() )
+            .put( "month", new TypeToken<Optional<Long>>(){}.getType() )
+            .put( "day", new TypeToken<Optional<Long>>(){}.getType() )
             .build();
 
       final ImmutableMap<String, Object> expectedConstructorArguments = ImmutableMap.<String, Object> builder()

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

@@ -40,6 +40,7 @@
 
 import com.github.javaparser.ast.CompilationUnit;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.reflect.TypeToken;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -332,9 +333,9 @@ void testGenerateStaticMetaModelWithStructuredValue() throws IOException {
       result.assertFields( "MetaAspectWithNumericStructuredValue",
             fieldAssertions( "MetaAspectWithNumericStructuredValue" )
                   .put( "_datatypeFactory", DatatypeFactory.class )
-                  .put( "YEAR", TypeTokens.staticProperty( aspectClass, Long.class ) )
-                  .put( "MONTH", TypeTokens.staticProperty( aspectClass, Long.class ) )
-                  .put( "DAY", TypeTokens.staticProperty( aspectClass, Long.class ) )
+                  .put( "YEAR", TypeTokens.staticContainerProperty( aspectClass, Long.class, new TypeToken<Optional<Long>>() {} ) )
+                  .put( "MONTH", TypeTokens.staticContainerProperty( aspectClass, Long.class, new TypeToken<Optional<Long>>() {} ) )
+                  .put( "DAY", TypeTokens.staticContainerProperty( aspectClass, Long.class, new TypeToken<Optional<Long>>() {} ) )
                   .put( "DATE", TypeTokens.staticProperty( aspectClass, XMLGregorianCalendar.class ) ).build(), new HashMap<>() );
    }