Refactoring and fix styles

Author: Yauhenikapl

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/MetaModelBaseAttributes.java

@@ -25,10 +25,7 @@
 import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
 import org.eclipse.esmf.metamodel.HasDescription;
 import org.eclipse.esmf.metamodel.ModelElement;
-import org.eclipse.esmf.metamodel.ScalarValue;
 import org.eclipse.esmf.metamodel.datatype.LangString;
-import org.eclipse.esmf.metamodel.impl.DefaultScalar;
-import org.eclipse.esmf.metamodel.impl.DefaultScalarValue;
 
 /**
  * Wrapper class for the attributes all Aspect Meta Model elements have.

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

@@ -527,7 +527,7 @@ private <T> String getOptionalStaticDeclarationValue( final Type type, final Opt
       }
 
       if ( optionalValue.get() instanceof ScalarValue ) {
-         return "Optional.of(" + ((ScalarValue) optionalValue.get()).accept( this, context ) + ")";
+         return "Optional.of(" + ( (ScalarValue) optionalValue.get() ).accept( this, context ) + ")";
       }
 
       context.getCodeGenerationConfig().importTracker().importExplicit( AspectModelJavaUtil.getDataTypeClass( type ) );
@@ -544,9 +544,9 @@ private <T> String getOptionalStaticDeclarationValue( final Type type, final Opt
       return "Optional.of(" + valueInitializer.apply( xsdType, valueExpression ) + ")";
    }
 
-   public String exampleValue(final Property property, final StaticCodeGenerationContext context) {
+   public String exampleValue( final Property property, final StaticCodeGenerationContext context ) {
       return property.getExampleValue()
-            .map(exampleValue -> "Optional.of(" + this.visitScalarValue(exampleValue, context) + ")")
+            .map( exampleValue -> "Optional.of(" + this.visitScalarValue( exampleValue, context ) + ")" )
             .orElse("Optional.empty()");
    }