Tej 1058 sentiment (#112)

* [maven-release-plugin] prepare release rosette-api-java-binding-1.8.1

* [maven-release-plugin] prepare for next development iteration

* TEJ-1058: added linking confidence in EntitySentiment.

Author: Katsuya-Tomioka

api/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
          <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api</artifactId>
     <name>rosette-api</name>

common/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-common</artifactId>
     <name>rosette-api-common</name>

examples/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-examples</artifactId>

json/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-json</artifactId>
     <name>rosette-api-json</name>

json/src/main/java/com/basistech/rosette/apimodel/jackson/EntitySentimentMixin.java

@@ -32,6 +32,8 @@ public EntitySentimentMixin(
             @JsonProperty("count") Integer count,
             @JsonProperty("entityId") String entityId,
             @JsonProperty("confidence") Double confidence,
+            @JsonProperty("salience") Double salience,
+            @JsonProperty("linkingConfidence") Double linkingConfidence,
             @JsonProperty("sentiment") Label sentiment) {
         //
     }

json/src/test/data/SentimentResponse.json

@@ -0,0 +1,14 @@
+{
+  "entities": [
+    {
+      "count": 17,
+      "mention": "Samsung", 
+      "normalized": "Samsung", 
+      "type": "ORGANIZATION",
+      "salience": 1.0,
+      "confidence": 1.0,
+      "linkingConfidence": 1.0,
+      "sentiment": {"label": "neutral", "confidence": 1.0}
+    }
+  ]
+}

model/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-model</artifactId>
     <name>rosette-api-model</name>

model/src/main/java/com/basistech/rosette/apimodel/EntitySentiment.java

@@ -31,6 +31,7 @@ public final class EntitySentiment {
     private final Double confidence;
     private final Double salience;
     private final Label sentiment;
+    private final Double linkingConfidence;
 
     /**
      * constructor for {@code EntitySentiment}
@@ -49,7 +50,7 @@ public EntitySentiment(String type,
                            String entityId,
                            Double confidence,
                            Label sentiment) {
-        this(type, mention, normalized, count, entityId, confidence, null, sentiment);
+        this(type, mention, normalized, count, entityId, confidence, null, null, sentiment);
     }
 
     /**
@@ -61,6 +62,7 @@ public EntitySentiment(String type,
      * @param entityId if the entity was linked, the ID from the knowledge base.
      * @param confidence entity confidence.
      * @param salience entity salience.
+     * @param linkingConfidence linking confidence.
      * @param sentiment the sentiment information.
      */
     public EntitySentiment(String type,
@@ -70,6 +72,7 @@ public EntitySentiment(String type,
                            String entityId,
                            Double confidence,
                            Double salience,
+                           Double linkingConfidence,
                            Label sentiment) {
         this.type = type;
         this.mention = mention;
@@ -78,6 +81,7 @@ public EntitySentiment(String type,
         this.entityId = entityId;
         this.confidence = confidence;
         this.salience = salience;
+        this.linkingConfidence = linkingConfidence;
         this.sentiment = sentiment;
     }
 
@@ -139,6 +143,14 @@ public Double getSalience() {
         return salience;
     }
 
+    /**
+     * get the linking confidence
+     * @return the linking confidence
+     */
+    public Double getLinkingConfidence() {
+        return linkingConfidence;
+    }
+
     /**
      * @return the sentiment information.
      */
@@ -162,11 +174,12 @@ public boolean equals(Object o) {
                 && Objects.equals(entityId, that.entityId)
                 && Objects.equals(confidence, that.confidence)
                 && Objects.equals(salience, that.salience)
+                && Objects.equals(linkingConfidence, that.linkingConfidence)
                 && Objects.equals(sentiment, that.sentiment);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(type, mention, normalized, count, entityId, confidence, salience, sentiment);
+        return Objects.hash(type, mention, normalized, count, entityId, confidence, salience, linkingConfidence, sentiment);
     }
 }

pom.xml

@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-java-binding</artifactId>
-    <version>1.8.1-SNAPSHOT</version>
+    <version>1.8.2-SNAPSHOT</version>
     <parent>
         <artifactId>open-source-parent</artifactId>
         <groupId>com.basistech</groupId>

release/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.1-SNAPSHOT</version>
+        <version>1.8.2-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-release</artifactId>