Skip to content

Commit ed99d5e

Browse files
committed
Fix styles
1 parent a5df14d commit ed99d5e

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,12 @@ public RangeConstraint apply( final Resource rangeConstraint ) {
4242

4343
final Optional<ScalarValue> minValue = optionalAttributeValue( rangeConstraint, SammNs.SAMMC.minValue() )
4444
.map( Statement::getLiteral )
45-
.map( literal -> new DefaultScalarValue( buildBaseAttributes( rangeConstraint ), literal.getValue(), new DefaultScalar( literal.getDatatypeURI() ) ) );
45+
.map( literal -> new DefaultScalarValue( buildBaseAttributes( rangeConstraint ), literal.getValue(),
46+
new DefaultScalar( literal.getDatatypeURI() ) ) );
4647
final Optional<ScalarValue> maxValue = optionalAttributeValue( rangeConstraint, SammNs.SAMMC.maxValue() )
4748
.map( Statement::getLiteral )
48-
.map( literal -> new DefaultScalarValue( buildBaseAttributes( rangeConstraint ), literal.getValue(), new DefaultScalar( literal.getDatatypeURI() ) ) );
49+
.map( literal -> new DefaultScalarValue( buildBaseAttributes( rangeConstraint ), literal.getValue(),
50+
new DefaultScalar( literal.getDatatypeURI() ) ) );
4951
final BoundDefinition lowerBoundDefinition = getBoundDefinitionForRangeValue( minValue,
5052
SammNs.SAMMC.lowerBoundDefinition(), rangeConstraint, BoundDefinition.AT_LEAST );
5153
final BoundDefinition upperBoundDefinition = getBoundDefinitionForRangeValue( maxValue,

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.util.stream.IntStream;
3838
import java.util.stream.LongStream;
3939
import java.util.stream.Stream;
40+
4041
import javax.xml.datatype.DatatypeConfigurationException;
4142
import javax.xml.datatype.DatatypeFactory;
4243

@@ -131,7 +132,7 @@
131132
import org.junit.jupiter.params.provider.EnumSource;
132133
import org.junit.jupiter.params.provider.MethodSource;
133134

134-
public class AspectModelJsonPayloadGeneratorTest {
135+
class AspectModelJsonPayloadGeneratorTest {
135136
private static final String PACKAGE = "org.eclipse.esmf.test.generatedtestclasses";
136137
private static DatatypeFactory datatypeFactory;
137138

@@ -789,10 +790,14 @@ Trait createTraitWithRangeConstraint( final Type dataType, final BoundDefinition
789790
.withUrn( TestModel.TEST_NAMESPACE + "TestConstraint" ).build();
790791
final Optional<ScalarValue> minValue = BoundDefinition.OPEN.equals( boundKind )
791792
? Optional.empty()
792-
: Optional.of( new DefaultScalarValue( MetaModelBaseAttributes.builder().build(), randomRange.getLeft(), new DefaultScalar( dataType.getUrn() ) ) );
793+
:
794+
Optional.of( new DefaultScalarValue( MetaModelBaseAttributes.builder().build(), randomRange.getLeft(),
795+
new DefaultScalar( dataType.getUrn() ) ) );
793796
final Optional<ScalarValue> maxValue = BoundDefinition.OPEN.equals( boundKind )
794797
? Optional.empty()
795-
: Optional.of( new DefaultScalarValue( MetaModelBaseAttributes.builder().build(), randomRange.getRight(), new DefaultScalar( dataType.getUrn() ) ) );
798+
:
799+
Optional.of( new DefaultScalarValue( MetaModelBaseAttributes.builder().build(), randomRange.getRight(),
800+
new DefaultScalar( dataType.getUrn() ) ) );
796801
final RangeConstraint rangeConstraint = new DefaultRangeConstraint( constraintAttibutes, minValue, maxValue, boundKind,
797802
getMatchingUpperBound( boundKind ) );
798803
final MetaModelBaseAttributes traitAttributes = MetaModelBaseAttributes.builder().withUrn( TestModel.TEST_NAMESPACE + "TestTrait" )

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ public String visitBase( final ModelElement modelElement, final StaticCodeGenera
111111
public String visitScalarValue( final ScalarValue value, final StaticCodeGenerationContext context ) {
112112
context.getCodeGenerationConfig().importTracker().importExplicit( DefaultScalarValue.class );
113113
final ValueExpressionVisitor.Context valueContext = new ValueExpressionVisitor.Context( context.getCodeGenerationConfig(), false );
114-
final String metaModelAttributes = ( !value.getSee().isEmpty() && !value.getPreferredNames().isEmpty() ) ? "getMetaModelBaseAttributes( value, context )" : null;
114+
final String metaModelAttributes = ( !value.getSee().isEmpty() && !value.getPreferredNames().isEmpty() ) ?
115+
"getMetaModelBaseAttributes( value, context )" :
116+
null;
115117
return "new DefaultScalarValue("
116118
+ metaModelAttributes + ","
117119
// Object value
@@ -529,7 +531,7 @@ private <T> String getOptionalStaticDeclarationValue( final Type type, final Opt
529531
}
530532

531533
if ( optionalValue.get() instanceof ScalarValue scalarValue ) {
532-
return "Optional.of(" + ( scalarValue ).accept( this, context ) + ")";
534+
return "Optional.of(" + (scalarValue).accept( this, context ) + ")";
533535
}
534536

535537
context.getCodeGenerationConfig().importTracker().importExplicit( AspectModelJavaUtil.getDataTypeClass( type ) );

0 commit comments

Comments
 (0)