Skip to content

Commit a963180

Browse files
andreas-schillingandreas-schilling
committed
Fix formatting
1 parent 214dc57 commit a963180

File tree

8 files changed

+154
-150
lines changed

8 files changed

+154
-150
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,16 @@ protected ByteArrayOutputStream generateXmlOutput( final Map<Aspect, JsonNode> a
7777

7878
final Map<Aspect, Environment> aspectEnvironments =
7979
aspectsWithData.entrySet().stream()
80-
.map( aspectWithData -> {
81-
final Submodel submodel = new DefaultSubmodel.Builder().build();
82-
final Environment environment = new DefaultEnvironment.Builder().submodels( Collections.singletonList( submodel ) ).build();
83-
final Context context = new Context( environment, submodel );
84-
context.setEnvironment( environment );
85-
context.setAspectData( aspectWithData.getValue() );
86-
87-
return Map.entry( aspectWithData.getKey(), visitor.visitAspect( aspectWithData.getKey(), context ) );
88-
} )
89-
.collect( Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue ) );
80+
.map( aspectWithData -> {
81+
final Submodel submodel = new DefaultSubmodel.Builder().build();
82+
final Environment environment = new DefaultEnvironment.Builder().submodels( Collections.singletonList( submodel ) ).build();
83+
final Context context = new Context( environment, submodel );
84+
context.setEnvironment( environment );
85+
context.setAspectData( aspectWithData.getValue() );
86+
87+
return Map.entry( aspectWithData.getKey(), visitor.visitAspect( aspectWithData.getKey(), context ) );
88+
} )
89+
.collect( Collectors.toMap( Map.Entry::getKey, Map.Entry::getValue ) );
9090
final Environment mergedEnvironment = mergeEnvironments( aspectEnvironments );
9191
try ( final ByteArrayOutputStream out = new ByteArrayOutputStream() ) {
9292
final XmlSerializer serializer = new XmlSerializer();

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

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -110,25 +110,25 @@ public class AspectModelAASVisitor implements AspectVisitor<Environment, Context
110110
*/
111111
private static final Map<Resource, DataTypeIEC61360> TYPE_MAP =
112112
ImmutableMap.<Resource, DataTypeIEC61360> builder()
113-
.put( XSD.xboolean, DataTypeIEC61360.BOOLEAN )
114-
.put( XSD.decimal, DataTypeIEC61360.INTEGER_MEASURE )
115-
.put( XSD.integer, DataTypeIEC61360.INTEGER_MEASURE )
116-
.put( XSD.xfloat, DataTypeIEC61360.REAL_MEASURE )
117-
.put( XSD.xdouble, DataTypeIEC61360.REAL_MEASURE )
118-
.put( XSD.xbyte, DataTypeIEC61360.INTEGER_COUNT )
119-
.put( XSD.xshort, DataTypeIEC61360.INTEGER_COUNT )
120-
.put( XSD.xint, DataTypeIEC61360.INTEGER_COUNT )
121-
.put( XSD.xlong, DataTypeIEC61360.INTEGER_COUNT )
122-
.put( XSD.unsignedByte, DataTypeIEC61360.INTEGER_COUNT )
123-
.put( XSD.unsignedShort, DataTypeIEC61360.INTEGER_COUNT )
124-
.put( XSD.unsignedInt, DataTypeIEC61360.INTEGER_COUNT )
125-
.put( XSD.unsignedLong, DataTypeIEC61360.INTEGER_COUNT )
126-
.put( XSD.positiveInteger, DataTypeIEC61360.INTEGER_COUNT )
127-
.put( XSD.nonPositiveInteger, DataTypeIEC61360.INTEGER_COUNT )
128-
.put( XSD.negativeInteger, DataTypeIEC61360.INTEGER_COUNT )
129-
.put( XSD.nonNegativeInteger, DataTypeIEC61360.INTEGER_COUNT )
130-
.put( RDF.langString, DataTypeIEC61360.STRING )
131-
.build();
113+
.put( XSD.xboolean, DataTypeIEC61360.BOOLEAN )
114+
.put( XSD.decimal, DataTypeIEC61360.INTEGER_MEASURE )
115+
.put( XSD.integer, DataTypeIEC61360.INTEGER_MEASURE )
116+
.put( XSD.xfloat, DataTypeIEC61360.REAL_MEASURE )
117+
.put( XSD.xdouble, DataTypeIEC61360.REAL_MEASURE )
118+
.put( XSD.xbyte, DataTypeIEC61360.INTEGER_COUNT )
119+
.put( XSD.xshort, DataTypeIEC61360.INTEGER_COUNT )
120+
.put( XSD.xint, DataTypeIEC61360.INTEGER_COUNT )
121+
.put( XSD.xlong, DataTypeIEC61360.INTEGER_COUNT )
122+
.put( XSD.unsignedByte, DataTypeIEC61360.INTEGER_COUNT )
123+
.put( XSD.unsignedShort, DataTypeIEC61360.INTEGER_COUNT )
124+
.put( XSD.unsignedInt, DataTypeIEC61360.INTEGER_COUNT )
125+
.put( XSD.unsignedLong, DataTypeIEC61360.INTEGER_COUNT )
126+
.put( XSD.positiveInteger, DataTypeIEC61360.INTEGER_COUNT )
127+
.put( XSD.nonPositiveInteger, DataTypeIEC61360.INTEGER_COUNT )
128+
.put( XSD.negativeInteger, DataTypeIEC61360.INTEGER_COUNT )
129+
.put( XSD.nonNegativeInteger, DataTypeIEC61360.INTEGER_COUNT )
130+
.put( RDF.langString, DataTypeIEC61360.STRING )
131+
.build();
132132

133133
private interface SubmodelElementBuilder {
134134
SubmodelElement build( Property property );
@@ -150,9 +150,9 @@ public AspectModelAASVisitor withPropertyMapper( final PropertyMapper propertyMa
150150

151151
protected <T extends SubmodelElement> PropertyMapper<T> findPropertyMapper( final Property property ) {
152152
return (PropertyMapper<T>) getCustomPropertyMappers().stream()
153-
.filter( mapper -> mapper.canHandle( property ) )
154-
.findAny()
155-
.orElse( DEFAULT_MAPPER );
153+
.filter( mapper -> mapper.canHandle( property ) )
154+
.findAny()
155+
.orElse( DEFAULT_MAPPER );
156156
}
157157

158158
protected List<PropertyMapper<?>> getCustomPropertyMappers() {
@@ -212,9 +212,9 @@ private List<SubmodelElement> visitProperties(
212212

213213
private SubmodelElement map( final Property property, final Context context ) {
214214
final Supplier<SubmodelElement> defaultResultForProperty = () -> context.getSubmodel().getSubmodelElements().stream()
215-
.filter( i -> i.getIdShort().equals( property.getName() ) )
216-
.findFirst()
217-
.orElse( new DefaultProperty.Builder().build() );
215+
.filter( i -> i.getIdShort().equals( property.getName() ) )
216+
.findFirst()
217+
.orElse( new DefaultProperty.Builder().build() );
218218
if ( recursiveProperty.contains( property ) ) {
219219
// The guard checks for recursion in properties. If a recursion happens, the respective
220220
// property will be excluded from generation.
@@ -284,12 +284,12 @@ private Operation map( final io.openmanufacturing.sds.metamodel.Operation operat
284284
.idShort( operation.getName() )
285285
.inputVariables(
286286
operation.getInput().stream()
287-
.map( i -> mapOperationVariable( i, context ) )
288-
.collect( Collectors.toList() ) )
287+
.map( i -> mapOperationVariable( i, context ) )
288+
.collect( Collectors.toList() ) )
289289
.outputVariables(
290290
operation.getOutput().stream()
291-
.map( i -> mapOperationVariable( i, context ) )
292-
.collect( Collectors.toList() ) )
291+
.map( i -> mapOperationVariable( i, context ) )
292+
.collect( Collectors.toList() ) )
293293
.build();
294294
}
295295

@@ -363,9 +363,9 @@ private EmbeddedDataSpecification extractEmbeddedDataSpecification( final Aspect
363363

364364
private DataSpecificationIEC61360 extractDataSpecificationContent( final Property property ) {
365365
final List<LangString> definitions = property.getCharacteristic().stream().flatMap( characteristic ->
366-
characteristic.getDescriptions().stream() )
367-
.map( langStringMapper::map )
368-
.collect( Collectors.toList() );
366+
characteristic.getDescriptions().stream() )
367+
.map( langStringMapper::map )
368+
.collect( Collectors.toList() );
369369

370370
return new DefaultDataSpecificationIEC61360.Builder()
371371
.definition( definitions )
@@ -473,23 +473,23 @@ private <T extends Collection> Environment visitCollectionProperty(
473473
private <T extends Collection> List<SubmodelElement> getValues( final T collection, final Property property, final Context context,
474474
final ArrayNode arrayNode ) {
475475
return collection.getDataType()
476-
.map( dataType -> {
477-
if ( Scalar.class.isAssignableFrom( dataType.getClass() ) ) {
478-
return List.of( (SubmodelElement) new DefaultBlob.Builder().value( StreamSupport.stream( arrayNode.spliterator(), false )
479-
.map( JsonNode::asText )
480-
.collect( Collectors.joining( "," ) )
481-
.getBytes( StandardCharsets.UTF_8 ) ).build() );
482-
} else {
483-
final var values = StreamSupport.stream( arrayNode.spliterator(), false )
484-
.map( n -> {
485-
context.iterate( property );
486-
return decideOnMapping( property, context );
487-
} )
488-
.toList();
489-
context.finishIteration( property );
490-
return values;
491-
}
492-
} ).orElseGet( () -> List.of() );
476+
.map( dataType -> {
477+
if ( Scalar.class.isAssignableFrom( dataType.getClass() ) ) {
478+
return List.of( (SubmodelElement) new DefaultBlob.Builder().value( StreamSupport.stream( arrayNode.spliterator(), false )
479+
.map( JsonNode::asText )
480+
.collect( Collectors.joining( "," ) )
481+
.getBytes( StandardCharsets.UTF_8 ) ).build() );
482+
} else {
483+
final var values = StreamSupport.stream( arrayNode.spliterator(), false )
484+
.map( n -> {
485+
context.iterate( property );
486+
return decideOnMapping( property, context );
487+
} )
488+
.toList();
489+
context.finishIteration( property );
490+
return values;
491+
}
492+
} ).orElseGet( () -> List.of() );
493493
}
494494

495495
// Either will be mapped by adding both the left and the right side to the SubmodelTemplate.
@@ -603,13 +603,13 @@ public Environment visitEnumeration(
603603
dataSpecificationContent.setDataType( mapIEC61360DataType( enumeration ) );
604604
final List<ValueReferencePair> valueReferencePairs =
605605
enumeration.getValues().stream()
606-
.map(
607-
x ->
608-
new DefaultValueReferencePair.Builder()
609-
.value( x.toString() )
610-
.valueId( buildReferenceToEnumValue( enumeration, x ) )
611-
.build() )
612-
.collect( Collectors.toList() );
606+
.map(
607+
x ->
608+
new DefaultValueReferencePair.Builder()
609+
.value( x.toString() )
610+
.valueId( buildReferenceToEnumValue( enumeration, x ) )
611+
.build() )
612+
.collect( Collectors.toList() );
613613

614614
final ValueList valueList =
615615
new DefaultValueList.Builder().valueReferencePairs( valueReferencePairs ).build();

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,14 @@ public Context finishIteration( final Property collectionProperty ) {
7878

7979
public boolean hasEnvironmentConceptDescription( final String id ) {
8080
return getEnvironment().getConceptDescriptions().stream()
81-
.anyMatch( x -> x.getId().equals( id ) );
81+
.anyMatch( x -> x.getId().equals( id ) );
8282
}
8383

8484
public ConceptDescription getConceptDescription( final String id ) {
8585
final Optional<ConceptDescription> optional =
8686
getEnvironment().getConceptDescriptions().stream()
87-
.filter( x -> x.getId().equals( id ) )
88-
.findFirst();
87+
.filter( x -> x.getId().equals( id ) )
88+
.findFirst();
8989
if ( optional.isEmpty() ) {
9090
throw new IllegalArgumentException(
9191
String.format( "No ConceptDescription with name %s available.", id ) );
@@ -159,10 +159,10 @@ public String getPropertyShortId() {
159159
return property.getName();
160160
}
161161
return property.getName() + propertyPath.stream()
162-
.map( indices::get )
163-
.filter( Objects::nonNull )
164-
.map( Objects::toString )
165-
.collect( Collectors.joining( "_" ) );
162+
.map( indices::get )
163+
.filter( Objects::nonNull )
164+
.map( Objects::toString )
165+
.collect( Collectors.joining( "_" ) );
166166
}
167167

168168
/**
@@ -173,7 +173,7 @@ public String getPropertyShortId() {
173173
*/
174174
public String getPropertyValue( final String defaultValue ) {
175175
return getRawPropertyValue().map( valueNode -> valueNode.asText( defaultValue ) )
176-
.orElse( defaultValue );
176+
.orElse( defaultValue );
177177
}
178178

179179
/**
@@ -185,13 +185,13 @@ public Optional<JsonNode> getRawPropertyValue() {
185185
if ( aspectData == null ) {
186186
return Optional.empty();
187187
}
188-
AtomicReference<String> pathExpression = new AtomicReference<>(
188+
final AtomicReference<String> pathExpression = new AtomicReference<>(
189189
"/" + String.join( "/", propertyPath.stream().map( Property::getPayloadName ).toList() ) );
190190
indices.entrySet()
191-
.forEach( index -> {
192-
pathExpression.getAndUpdate(
193-
path -> path.replace( index.getKey().getPayloadName(), index.getKey().getPayloadName() + "/" + index.getValue() ) );
194-
} );
191+
.forEach( index -> {
192+
pathExpression.getAndUpdate(
193+
path -> path.replace( index.getKey().getPayloadName(), index.getKey().getPayloadName() + "/" + index.getValue() ) );
194+
} );
195195
final JsonNode valueNode = aspectData.at( pathExpression.get() );
196196
return valueNode.isMissingNode() ? Optional.empty() : Optional.of( valueNode );
197197
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
public class DefaultPropertyMapper implements PropertyMapper<Property> {
2424
@Override
25-
public Property mapToAasProperty( Type type, io.openmanufacturing.sds.metamodel.Property property, Context context ) {
25+
public Property mapToAasProperty( final Type type, final io.openmanufacturing.sds.metamodel.Property property, final Context context ) {
2626
return new DefaultProperty.Builder()
2727
.idShort( context.getPropertyShortId() )
2828
.kind( context.getModelingKind() )

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
public class LangStringMapper {
2727
public List<LangString> map( final Set<io.openmanufacturing.sds.metamodel.datatypes.LangString> localizedStrings ) {
2828
return localizedStrings.stream()
29-
.map( ( entry ) -> map( entry.getLanguageTag(), entry.getValue() ) )
30-
.collect( Collectors.toList() );
29+
.map( ( entry ) -> map( entry.getLanguageTag(), entry.getValue() ) )
30+
.collect( Collectors.toList() );
3131
}
3232

3333
public LangString map( final io.openmanufacturing.sds.metamodel.datatypes.LangString langString ) {

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,36 @@
3232
public class LangStringPropertyMapper implements PropertyMapper<MultiLanguageProperty> {
3333

3434
@Override
35-
public boolean canHandle( io.openmanufacturing.sds.metamodel.Property property ) {
35+
public boolean canHandle( final io.openmanufacturing.sds.metamodel.Property property ) {
3636
return property.getDataType()
37-
.map( Type::getUrn )
38-
.filter( RDF.langString.getURI()::equals )
39-
.isPresent();
37+
.map( Type::getUrn )
38+
.filter( RDF.langString.getURI()::equals )
39+
.isPresent();
4040
}
4141

4242
@Override
43-
public MultiLanguageProperty mapToAasProperty( Type type, io.openmanufacturing.sds.metamodel.Property property, Context context ) {
43+
public MultiLanguageProperty mapToAasProperty( final Type type, final io.openmanufacturing.sds.metamodel.Property property, final Context context ) {
4444
return new DefaultMultiLanguageProperty.Builder().idShort( context.getPropertyShortId() )
45-
.kind( context.getModelingKind() )
46-
.description( LANG_STRING_MAPPER.map( property.getDescriptions() ) )
47-
.displayName( LANG_STRING_MAPPER.map( property.getPreferredNames() ) )
48-
.semanticId( buildReferenceToConceptDescription( property ) )
49-
.value( extractLangStrings( property, context ) )
50-
.build();
45+
.kind( context.getModelingKind() )
46+
.description( LANG_STRING_MAPPER.map( property.getDescriptions() ) )
47+
.displayName( LANG_STRING_MAPPER.map( property.getPreferredNames() ) )
48+
.semanticId( buildReferenceToConceptDescription( property ) )
49+
.value( extractLangStrings( property, context ) )
50+
.build();
5151
}
5252

53-
private List<LangString> extractLangStrings( Property property, Context context ) {
53+
private List<LangString> extractLangStrings( final Property property, final Context context ) {
5454
return context.getRawPropertyValue()
55-
.filter( JsonNode::isObject )
56-
.map( node -> {
57-
final Map<String, String> entries = new HashMap<>();
58-
node.fields().forEachRemaining( field -> entries.put( field.getKey(), field.getValue().asText() ) );
59-
return entries;
60-
} )
61-
.map( rawEntries -> rawEntries.entrySet()
62-
.stream()
63-
.map( entry -> LANG_STRING_MAPPER.createLangString( entry.getValue(), entry.getKey() ) )
64-
.toList() )
65-
.orElseGet( () -> List.of() );
55+
.filter( JsonNode::isObject )
56+
.map( node -> {
57+
final Map<String, String> entries = new HashMap<>();
58+
node.fields().forEachRemaining( field -> entries.put( field.getKey(), field.getValue().asText() ) );
59+
return entries;
60+
} )
61+
.map( rawEntries -> rawEntries.entrySet()
62+
.stream()
63+
.map( entry -> LANG_STRING_MAPPER.createLangString( entry.getValue(), entry.getKey() ) )
64+
.toList() )
65+
.orElseGet( () -> List.of() );
6666
}
6767
}

0 commit comments

Comments
 (0)