#1319 - Generic support for PubAnnotation

- Changed field names in JSON to match PubAnnotation conventions
dkpro · Mar 4, 2019 · 8d9eeaa · 8d9eeaa
1 parent c9be549
commit 8d9eeaa
Show file tree

Hide file tree

Showing 3 changed files with 2,670 additions and 2,662 deletions.
diff --git a/...otation-asl/src/main/java/org/dkpro/core/io/pubannotation/internal/model/PAAttribute.java b/...otation-asl/src/main/java/org/dkpro/core/io/pubannotation/internal/model/PAAttribute.java
@@ -17,14 +17,21 @@
  */
 package org.dkpro.core.io.pubannotation.internal.model;
 
-// "attributes": [
-//   {"id": "T1", "key": "lala", "value": "lolo"},
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+// "attributions":[
+// {"subj":string:denotation-id, "pred":string:attribute-name,"obj":string:attribute-value}
 // ]
 public class PAAttribute
 {
+    @JsonProperty("subj")
     private String subject;
-    private String key;
-    private String value;
+
+    @JsonProperty("pred")
+    private String predicate;
+
+    @JsonProperty("obj")
+    private String object;
 
     public PAAttribute()
     {
@@ -34,8 +41,8 @@ public PAAttribute()
     public PAAttribute(String aSubject, String aKey, String aValue)
     {
         subject = aSubject;
-        key = aKey;
-        value = aValue;
+        predicate = aKey;
+        object = aValue;
     }
 
     public String getSubject()
@@ -48,23 +55,23 @@ public void setSubject(String aSubject)
         subject = aSubject;
     }
 
-    public String getKey()
+    public String getPredicate()
     {
-        return key;
+        return predicate;
     }
 
-    public void setKey(String aKey)
+    public void setPredicate(String aKey)
     {
-        key = aKey;
+        predicate = aKey;
     }
 
-    public String getValue()
+    public String getObject()
     {
-        return value;
+        return object;
     }
 
-    public void setValue(String aValue)
+    public void setObject(String aValue)
     {
-        value = aValue;
+        object = aValue;
     }
 }
diff --git a/...notation-asl/src/main/java/org/dkpro/core/io/pubannotation/internal/model/PADocument.java b/...notation-asl/src/main/java/org/dkpro/core/io/pubannotation/internal/model/PADocument.java
@@ -30,7 +30,7 @@
  * @see <a href="http://www.pubannotation.org/docs/annotation-format/">PubAnnotation documentation</a>
  */
 @JsonPropertyOrder({ "target", "sourcedb", "sourceid", "text", "project", "denotations",
-        "relations", "modifications", "namespaces" })
+        "relations", "attributions", "modifications", "namespaces" })
 public class PADocument
 {
     @JsonInclude(Include.NON_NULL)
@@ -55,6 +55,7 @@ public class PADocument
     @JsonInclude(Include.NON_EMPTY)
     private List<PARelation> relations = new ArrayList<>();
 
+    @JsonProperty("attributions")
     @JsonInclude(Include.NON_EMPTY)
     private List<PAAttribute> attributes = new ArrayList<>();