Refactoring

Author: Yauhenikapl

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

@@ -66,41 +66,41 @@ public Property apply(final Resource property) {
             property.getModel().contains(property, RDF.type, SammNs.SAMM.AbstractProperty());
 
       final MetaModelBaseAttributes metaModelBaseAttributes = property.isAnon()
-            ? buildBaseAttributes(extendsResource.orElse(property))
-            : buildBaseAttributes(property);
-      final DefaultPropertyWrapper defaultPropertyWrapper = new DefaultPropertyWrapper(metaModelBaseAttributes);
+            ? buildBaseAttributes( extendsResource.orElse( property ) )
+            : buildBaseAttributes( property );
+      final DefaultPropertyWrapper defaultPropertyWrapper = new DefaultPropertyWrapper( metaModelBaseAttributes );
 
-      if (resourcePropertyMap.containsKey(property)) {
-         return resourcePropertyMap.get(property);
+      if ( resourcePropertyMap.containsKey( property )) {
+         return resourcePropertyMap.get( property );
       }
-      resourcePropertyMap.put(property, defaultPropertyWrapper);
+      resourcePropertyMap.put( property, defaultPropertyWrapper );
 
       final DefaultProperty defProperty;
-      if (isAbstract) {
-         defProperty = new DefaultProperty(metaModelBaseAttributes, Optional.of(fallbackCharacteristic),
-               Optional.empty(), isOptional, isNotInPayload, payloadName, isAbstract, extends_);
+      if ( isAbstract ) {
+         defProperty = new DefaultProperty( metaModelBaseAttributes, Optional.of( fallbackCharacteristic ),
+               Optional.empty(), isOptional, isNotInPayload, payloadName, isAbstract, extends_ );
       } else {
-         final Resource characteristicResource = attributeValue(property, SammNs.SAMM.characteristic()).getResource();
-         final Characteristic characteristic = modelElementFactory.create(Characteristic.class, characteristicResource);
+         final Resource characteristicResource = attributeValue( property, SammNs.SAMM.characteristic() ).getResource();
+         final Characteristic characteristic = modelElementFactory.create( Characteristic.class, characteristicResource );
 
-         final Optional<Object> exampleValue = optionalAttributeValue(property, SammNs.SAMM.exampleValue())
-               .flatMap(statement -> {
+         final Optional<Object> exampleValue = optionalAttributeValue( property, SammNs.SAMM.exampleValue() )
+               .flatMap( statement -> {
                   RDFNode node = statement.getObject();
                   return characteristic.getDataType()
-                        .map(type -> {
-                           if (!type.is(Scalar.class)) {
-                              throw new AspectLoadingException("Type of example value on Property " + property + " has incorrect type");
+                        .map( type -> {
+                           if ( !type.is( Scalar.class ) ) {
+                              throw new AspectLoadingException( "Type of example value on Property " + property + " has incorrect type" );
                            }
-                           return type.as(Scalar.class);
+                           return type.as( Scalar.class );
                         })
-                        .map(type -> buildValue(node, Optional.of(property), type)); // <-- используем buildValue
+                        .map( type -> buildValue( node, Optional.of( property ), type ) );
                });
 
-         defProperty = new DefaultProperty(metaModelBaseAttributes, Optional.of(characteristic),
-               exampleValue, isOptional, isNotInPayload, payloadName, isAbstract, extends_);
+         defProperty = new DefaultProperty( metaModelBaseAttributes, Optional.of( characteristic ),
+               exampleValue, isOptional, isNotInPayload, payloadName, isAbstract, extends_ );
       }
 
-      defaultPropertyWrapper.setProperty(defProperty);
+      defaultPropertyWrapper.setProperty( defProperty );
       return defaultPropertyWrapper;
    }
 

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/serializer/RdfModelCreatorVisitor.java

@@ -647,8 +647,8 @@ public ElementModel visitProperty( final Property property, final ModelElement c
       model.add( serializeDescriptions( resource, property ) );
 
       property.getExampleValue().ifPresent( exampleValue -> {
-         if ( exampleValue instanceof Value ) {
-            final ElementModel exampleValueElementModel = ((Value) exampleValue).accept( this, property );
+         if ( exampleValue instanceof Value value ) {
+            final ElementModel exampleValueElementModel = ( value ).accept( this, property );
             model.add( exampleValueElementModel.model() );
             exampleValueElementModel.focusElement().ifPresent( exampleValueNode ->
                   model.add( resource, SammNs.SAMM.exampleValue(), exampleValueNode ) );

core/esmf-aspect-meta-model-java/src/test/resources/samm_2_0_0/invalid_aspect_urn_prefix.ttl

@@ -9,7 +9,7 @@
 #
 # SPDX-License-Identifier: MPL-2.0
 
-@prefix samm: <urn:foo:org.eclipse.esmf.samm:meta-model:2.1.0#> .
+@prefix samm: <urn:foo:org.eclipse.esmf.samm:meta-model:2.0.0#> .
 
 <urn:samm:org.eclipse.esmf.samm:aspect-model:TestAspect:1.1.0> a samm:Aspect ;
    samm:preferredName "Test Aspect"@en ;

core/esmf-aspect-model-document-generators/src/main/java/org/eclipse/esmf/aspectmodel/generator/json/AspectModelJsonPayloadGenerator.java

@@ -452,7 +452,7 @@ private Type getDataType( final Characteristic characteristic ) {
       private Object generateExampleValue( final Characteristic characteristic ) {
          final Type dataType = getDataType( characteristic );
 
-         if ( !(dataType.is( Scalar.class )) ) {
+         if ( !( dataType.is( Scalar.class ) ) ) {
             throw new IllegalArgumentException( "Example values can only be generated for scalar types." );
          }
 
@@ -630,7 +630,7 @@ private Number generateForNumericTypeInRange( final java.lang.reflect.Type value
 
       // narrowing conversion from BigDecimal to double
       private double safelyNarrowDown( final Number bound ) {
-         if ( !(BigDecimal.class.equals( bound.getClass() )) ) {
+         if ( !( BigDecimal.class.equals( bound.getClass() ) ) ) {
             return bound.doubleValue();
          }
 
@@ -639,7 +639,7 @@ private double safelyNarrowDown( final Number bound ) {
          // Example: xsd:unsignedLong has a max. value of 18446744073709551615; when converting it to double
          // it will get represented as 1.8446744073709552E16, thereby exceeding the upper bound.
          // Therefore we need to take care of always rounding down when narrowing to double.
-         final BigDecimal narrowed = ((BigDecimal) bound).round( new MathContext( 15, RoundingMode.DOWN ) );
+         final BigDecimal narrowed = ( (BigDecimal) bound ).round( new MathContext( 15, RoundingMode.DOWN ) );
          return narrowed.doubleValue();
       }
 

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

@@ -526,8 +526,8 @@ private <T> String getOptionalStaticDeclarationValue( final Type type, final Opt
          return "Optional.empty()";
       }
 
-      if ( optionalValue.get() instanceof ScalarValue ) {
-         return "Optional.of(" + ((ScalarValue) optionalValue.get()).accept( this, context ) + ")";
+      if ( optionalValue.get() instanceof ScalarValue scalarValue ) {
+         return "Optional.of(" + ( scalarValue ).accept( this, context ) + ")";
       }
 
       context.getCodeGenerationConfig().importTracker().importExplicit( AspectModelJavaUtil.getDataTypeClass( type ) );