Some code restructuring for better readability

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

Author: bs-jokri

core/sds-aspect-model-aas-generator/src/main/java/io/openmanufacturing/sds/aspectmodel/aas/AspectModelAASVisitor.java

@@ -172,23 +172,19 @@ private interface SubmodelElementBuilder {
 
    @Override
    public Environment visitBase( final ModelElement base, final Context context ) {
-
       return context.getEnvironment();
    }
 
    @Override
    public Environment visitAspect( final Aspect aspect, Context context ) {
-
       if ( context == null ) {
          final Submodel submodel = new DefaultSubmodel.Builder().build();
          Environment environment = new DefaultEnvironment.Builder().submodels( Collections.singletonList( submodel ) ).build();
-
          context = new Context(environment, submodel );
          context.setEnvironment(environment);
       }
 
       final Submodel submodel = context.getSubmodel();
-
       submodel.setIdShort( aspect.getName() );
       submodel.setSemanticId( buildReferenceToConceptDescription( aspect ) );
       submodel.setDescription( map( aspect.getDescriptions() ) );
@@ -338,6 +334,10 @@ private LangString map( final Locale locale, final String value ) {
       return createLangString( value, locale.getLanguage() );
    }
 
+   private LangString createLangString(String text, String locale){
+      return new DefaultLangString.Builder().language( locale ).text( text ).build();
+   }
+
    private Reference buildReferenceToEnumValue( final Enumeration enumeration, final Object value ) {
       final Key key =
             new DefaultKey.Builder()
@@ -433,9 +433,6 @@ private DataSpecificationIEC61360 extractDataSpecificationContent( final Propert
             .build();
    }
 
-   private LangString createLangString(String text, String locale){
-      return new DefaultLangString.Builder().language( locale ).text( text ).build();
-   }
 
    private DataSpecificationIEC61360 extractDataSpecificationContent( final Aspect aspect ) {
       final List<LangString> definitions = map( aspect.getDescriptions() );
@@ -447,13 +444,6 @@ private DataSpecificationIEC61360 extractDataSpecificationContent( final Aspect
             .build();
    }
 
-   private void createSubmodelElement( final SubmodelElementBuilder op, final Context context ) {
-      final Property property = context.getProperty();
-      final SubmodelElement submodelElement = op.build( property );
-      context.setPropertyResult( submodelElement );
-      createConceptDescription( property, context );
-   }
-
    private DataTypeIEC61360 mapIEC61360DataType( final Optional<Characteristic> characteristic ) {
       return mapIEC61360DataType( characteristic.flatMap( Characteristic::getDataType ).map( Type::getUrn ).orElse( RDF.langString.getURI() ) );
    }
@@ -472,6 +462,13 @@ private DataTypeDefXsd mapAASXSDataType( final String urn ) {
       return AAS_XSD_TYPE_MAP.getOrDefault( resource, DataTypeDefXsd.STRING );
    }
 
+   private void createSubmodelElement( final SubmodelElementBuilder op, final Context context ) {
+      final Property property = context.getProperty();
+      final SubmodelElement submodelElement = op.build( property );
+      context.setPropertyResult( submodelElement );
+      createConceptDescription( property, context );
+   }
+
    @Override
    public Environment visitCharacteristic(
          final Characteristic characteristic, final Context context ) {