Skip to content

Commit 0f1ec6b

Browse files
committed
Serialize Events according to spec
1 parent d3cc213 commit 0f1ec6b

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

core/sds-aspect-model-serializer/src/main/java/io/openmanufacturing/sds/aspectmodel/serializer/RdfModelCreatorVisitor.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ private Model serializeDescriptions( final Resource elementResource, final IsDes
175175

176176
@SuppressWarnings( "squid:S2250" )
177177
// Amount of elements in list is regarding amount of properties in Aspect Model. Even in bigger aspects this should not lead to performance issues
178-
private Model serializeProperties( final Resource elementResource, final HasProperties element ) {
178+
private Model serializePropertiesOrParameters( final Resource elementResource, final HasProperties element, final org.apache.jena.rdf.model.Property theProperty ) {
179179
final Model model = ModelFactory.createDefaultModel();
180180
final List<RDFNode> propertiesList = new ArrayList<>();
181181
if ( resourceList.contains( elementResource ) ) {
@@ -202,10 +202,18 @@ private Model serializeProperties( final Resource elementResource, final HasProp
202202
return propertyModel;
203203
} ).forEach( model::add );
204204

205-
model.add( elementResource, bamm.properties(), model.createList( propertiesList.iterator() ) );
205+
model.add( elementResource, theProperty, model.createList( propertiesList.iterator() ) );
206206
return model;
207207
}
208208

209+
private Model serializeParameters( final Resource elementResource, final HasProperties element ) {
210+
return serializePropertiesOrParameters( elementResource, element, bamm.parameters() );
211+
}
212+
213+
private Model serializeProperties( final Resource elementResource, final HasProperties element ) {
214+
return serializePropertiesOrParameters( elementResource, element, bamm.properties() );
215+
}
216+
209217
private Resource serializeAnonymousPropertyNodes( final Property property, final Model propertyModel, final Resource propertyResource ) {
210218
final Resource anonymousPropertyNode = createResource();
211219
propertyModel.add( anonymousPropertyNode, bamm.property(), propertyResource );
@@ -675,7 +683,7 @@ public ElementModel visitEvent( final Event event, final Base context ) {
675683
final Resource resource = getElementResource( event );
676684
model.add( resource, RDF.type, bamm.Event() );
677685
model.add( serializeDescriptions( resource, event ) );
678-
model.add( serializeProperties( resource, event ) );
686+
model.add( serializeParameters( resource, event ) );
679687
return new ElementModel( model, Optional.of( resource ) );
680688
}
681689

0 commit comments

Comments
 (0)