Fix further code smells

Author: andreas-schilling

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

@@ -576,11 +576,11 @@ private Optional<SubmodelElement> handleEitherField( final String field, final C
          final var fieldProperty = createProperty( eitherProperty.getMetaModelVersion(), field, fieldCharacteristic );
          context.setProperty( fieldProperty );
          if ( context.getRawPropertyValue().isPresent() ) {
-            result = Optional.ofNullable( decideOnMapping( fieldCharacteristic.getDataType().get(), context.getProperty(), context ) );
+            result = fieldCharacteristic.getDataType().map( dataType -> decideOnMapping( dataType, context.getProperty(), context ) );
          }
          context.getPropertyResult();
       } else {
-         result = Optional.ofNullable( decideOnMapping( fieldCharacteristic.getDataType().get(), context.getProperty(), context ) );
+         result = fieldCharacteristic.getDataType().map( dataType -> decideOnMapping( dataType, context.getProperty(), context ) );
       }
 
       return result;

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

@@ -27,9 +27,9 @@
 import org.eclipse.digitaltwin.aas4j.v3.model.ModellingKind;
 import org.eclipse.digitaltwin.aas4j.v3.model.Submodel;
 import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
+import org.eclipse.esmf.metamodel.Property;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.eclipse.esmf.metamodel.Property;
 
 
 /**
@@ -38,12 +38,12 @@
 public class Context {
 
    Environment environment;
-   Submodel submodel;
+   final Submodel submodel;
    Property property;
    SubmodelElement propertyResult;
-   List<Property> propertyPath = new ArrayList<>();
+   final List<Property> propertyPath = new ArrayList<>();
    JsonNode aspectData;
-   Map<Property, Integer> indices = new HashMap<>();
+   final Map<Property, Integer> indices = new HashMap<>();
 
    public Context( final Environment environment, final Submodel ofInterest ) {
       this.environment = environment;

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

@@ -365,9 +365,7 @@ private Environment getAssetAdministrationShellFromAspectWithData( final TestAsp
       final JsonNode aspectData = loadPayload( testAspect );
       final ByteArrayOutputStream out = generator.generateXmlOutput( Map.of( aspect, aspectData ) );
       final var data = out.toByteArray();
-      final var result = loadAASX( data, testAspect );
-      //new AasXmlValidator().validateXml( data );
-      return result;
+      return loadAASX( data, testAspect );
    }
 
    private ByteArrayOutputStream getByteArrayOutputStreamFromAspect( final TestAspect testAspect )