Add two fixes to make tests rub

Signed-off-by: Johannes Kristan <[email protected]>

Author: bs-jokri

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

@@ -251,7 +251,7 @@ private Optional<SubmodelElement> mapText( final Property property, final Contex
          if ( property.isOptional() ) {
             LOG.warn( String.format( "Having a recursive Property %s which is optional. Will be excluded from AAS mapping.",
                   property.getAspectModelUrn().map( AspectModelUrn::toString ).orElse( "(unknown)" ) ) );
-            return Optional.of(defaultResultForProperty.get());
+            return defaultResultForProperty;
          } else {
             LOG.error( String.format( "Having a recursive property: %s which is not optional is not valid. Check the model. Property will be excluded from AAS mapping.",
                   property.getAspectModelUrn().map( AspectModelUrn::toString ).orElse( "(unknown)" ) ) );

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

@@ -162,7 +162,7 @@ void testGenerateAasxFromBammAspectWithQuantifiable() throws IOException, Deseri
       final SubmodelElement element = env.getSubmodels().get( 0 ).getSubmodelElements().get( 0 );
       assertEquals( "id_testProperty", element.getIdShort() );
 
-      final DataSpecificationContent dataSpecificationContent = getDataSpecificationIEC61360( "urn:bamm:io.openmanufacturing.test:1.0.0#testProperty", env );
+      final DataSpecificationContent dataSpecificationContent = getDataSpecificationIEC61360( "urn:samm:org.eclipse.esmf.test:1.0.0#testProperty", env );
 
       assertEquals( "percent", ((DataSpecificationIec61360)dataSpecificationContent).getUnit(), "Unit is not percent" );
    }