You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/06/15 21:42:27 UTC
[incubator-streampipes] 01/03: [STREAMPIPES-145] Fix bug in JSON
serializer
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 05fd8c4e6d8edca47e7c85795a7faccbc9580be2
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Mon Jun 15 22:36:17 2020 +0200
[STREAMPIPES-145] Fix bug in JSON serializer
---
.../apache/streampipes/model/grounding/EventGrounding.java | 13 +++++++------
.../streampipes/model/grounding/TransportProtocol.java | 14 --------------
2 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
index 15ef8fe..42d576f 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/EventGrounding.java
@@ -18,21 +18,21 @@
package org.apache.streampipes.model.grounding;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.fogsy.empire.annotations.RdfProperty;
import io.fogsy.empire.annotations.RdfsClass;
import org.apache.streampipes.model.base.UnnamedStreamPipesEntity;
import org.apache.streampipes.model.util.Cloner;
import org.apache.streampipes.vocabulary.StreamPipes;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import javax.persistence.CascadeType;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.OneToMany;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
@RdfsClass(StreamPipes.EVENT_GROUNDING)
@Entity
@@ -80,7 +80,8 @@ public class EventGrounding extends UnnamedStreamPipesEntity {
public void setTransportProtocol(TransportProtocol transportProtocol) {
this.transportProtocols = Collections.singletonList(transportProtocol);
}
-
+
+ @JsonIgnore
public TransportProtocol getTransportProtocol() {
return transportProtocols.get(0);
}
diff --git a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
index 36f2d01..8d89064 100644
--- a/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
+++ b/streampipes-model/src/main/java/org/apache/streampipes/model/grounding/TransportProtocol.java
@@ -81,18 +81,4 @@ public abstract class TransportProtocol extends UnnamedStreamPipesEntity {
this.topicDefinition = topicDefinition;
}
-// // TODO only kept for backwards compatibility, remove later
-// @Deprecated
-// public String getTopicName() {
-// return topicDefinition.getActualTopicName();
-// }
-//
-// @Deprecated
-// public void setTopicName(String topicName) {
-// if (this.topicDefinition == null) {
-// this.topicDefinition = new SimpleTopicDefinition();
-// }
-// this.topicDefinition.setActualTopicName(topicName);
-// }
-
}