WS-1257 merge 1.8 master (#117)

Li Xu · seth-mg · commit 37fe57f4d820 · 2017-12-17T17:30:17.000-05:00
* Preparing release. Version set to 1.8.0-SNAPSHOT * [maven-release-plugin] prepare release rosette-api-java-binding-1.8.0 * [maven-release-plugin] prepare for next development iteration * [maven-release-plugin] rollback the release of rosette-api-java-binding-1.8.0 * [maven-release-plugin] prepare release rosette-api-java-binding-1.8.0 * [maven-release-plugin] prepare for next development iteration * Tej 1058 linking confidence rosapi 1.8 (#110) * TEJ-1058: added linkingConfidence to EntityMention * TEJ-1058: test data * 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. * [maven-release-plugin] prepare release rosette-api-java-binding-1.8.2 * [maven-release-plugin] prepare for next development iteration * WS-1260 offsets for 1.8 (#115) * WS-1260: offsets for 1.8 * WS-1260: add mixin * WS-1260: checkstyle * [maven-release-plugin] prepare release rosette-api-java-binding-1.8.3 * [maven-release-plugin] prepare for next development iteration * WS-1257: bump version * WS-1257: checkstyle fixes * WS-1257: bump common-api and adm
diff --git a/api/pom.xml b/api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
          <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.104-SNAPSHOT</version>
+        <version>1.8.105-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api</artifactId>
     <name>rosette-api</name>
diff --git a/api/src/test/mock-data/response/eng-doc-entities.json b/api/src/test/mock-data/response/eng-doc-entities.json
@@ -19,7 +19,8 @@
       "indocChainId": 2, 
       "mention": "Afghanistan", 
       "normalized": "Afghanistan", 
-      "type": "LOCATION"
+      "type": "LOCATION",
+      "salience": 1.0
     }, 
     {
       "count": 1, 
diff --git a/api/src/test/mock-data/response/eng-doc-entities_linked.json b/api/src/test/mock-data/response/eng-doc-entities_linked.json
@@ -4,19 +4,22 @@
       "confidence": 0.6191439548350202, 
       "entityId": "Q30", 
       "indocChainId": 0, 
-      "mention": "U.S."
+      "mention": "U.S.",
+      "linkingConfidence": 0.5
     }, 
     {
       "confidence": 0.1883195998298547, 
       "entityId": "Q796", 
       "indocChainId": 1, 
-      "mention": "Iraq"
-    }, 
+      "mention": "Iraq",
+      "linkingConfidence": 0.5
+    },
     {
       "confidence": 0.16953509200793812, 
       "entityId": "Q889", 
       "indocChainId": 2, 
-      "mention": "Afghanistan"
+      "mention": "Afghanistan",
+      "linkingConfidence": 0.5
     }
   ]
-}
+}
diff --git a/common/pom.xml b/common/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.104-SNAPSHOT</version>
+        <version>1.8.105-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-common</artifactId>
     <name>rosette-api-common</name>
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.104-SNAPSHOT</version>
+        <version>1.8.105-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-examples</artifactId>
diff --git a/json/pom.xml b/json/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.104-SNAPSHOT</version>
+        <version>1.8.105-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-json</artifactId>
     <name>rosette-api-json</name>
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/ApiModelMixinModule.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/ApiModelMixinModule.java
@@ -103,6 +103,7 @@ public void setupModule(Module.SetupContext context) {
         context.setMixInAnnotations(EntityMention.class, EntityMentionMixin.class);
         context.setMixInAnnotations(EntitySentiment.class, EntitySentimentMixin.class);
         context.setMixInAnnotations(ErrorResponse.class, ErrorResponseMixin.class);
+        context.setMixInAnnotations(EntityMention.class, EntityMentionMixin.class);
         context.setMixInAnnotations(InfoResponse.class, InfoResponseMixin.class);
         context.setMixInAnnotations(LanguageDetectionResult.class, LanguageDetectionResultMixin.class);
         context.setMixInAnnotations(LanguageOptions.class, LanguageOptionsMixin.class);
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/EntityMentionMixin.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/EntityMentionMixin.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2014 Basis Technology Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -25,14 +25,16 @@
 public class EntityMentionMixin extends BaseMixin {
     @JsonCreator
     public EntityMentionMixin(
+            @JsonProperty("indocChainId") Integer indocChainId,
             @JsonProperty("type") String type,
             @JsonProperty("mention") String mention,
             @JsonProperty("normalized") String normalized,
             @JsonProperty("count") Integer count,
             @JsonProperty("mentionOffsets") List<MentionOffsets> mentionOffsets,
             @JsonProperty("entityId") String entityId,
             @JsonProperty("confidence") Double confidence,
-            @JsonProperty("salience") Double salience
+            @JsonProperty("salience") Double salience,
+            @JsonProperty("linkingConfidence") Double linkingConfidence
     ) {
         //
     }
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/EntitySentimentMixin.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/EntitySentimentMixin.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2016 Basis Technology Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@ public EntitySentimentMixin(
             @JsonProperty("entityId") String entityId,
             @JsonProperty("confidence") Double confidence,
             @JsonProperty("salience") Double salience,
+            @JsonProperty("linkingConfidence") Double linkingConfidence,
             @JsonProperty("sentiment") Label sentiment) {
         //
     }
diff --git a/json/src/main/java/com/basistech/rosette/apimodel/jackson/MentionOffsetsMixin.java b/json/src/main/java/com/basistech/rosette/apimodel/jackson/MentionOffsetsMixin.java
@@ -30,4 +30,4 @@ public MentionOffsetsMixin(
             @JsonProperty("endOffset") Integer endOffset) {
         //
     }
-}
+}
diff --git a/json/src/test/data/EntitiesResponse.json b/json/src/test/data/EntitiesResponse.json
@@ -6,6 +6,9 @@
       "mention": "Samsung", 
       "normalized": "Samsung", 
       "type": "ORGANIZATION",
+      "salience": 1.0,
+      "confidence": 1.0,
+      "linkingConfidence": 1.0,
       "mentionOffsets": [
         {"startOffset": 15, "endOffset": 22},
         {"startOffset": 88, "endOffset": 95}
diff --git a/json/src/test/data/SentimentResponse.json b/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}
+    }
+  ]
+}
diff --git a/model/pom.xml b/model/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.8.104-SNAPSHOT</version>
+        <version>1.8.105-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-model</artifactId>
     <name>rosette-api-model</name>
@@ -38,12 +38,6 @@
             <groupId>com.basistech</groupId>
             <artifactId>adm-model</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.16.16</version>
-            <scope>provided</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/EntityMention.java b/model/src/main/java/com/basistech/rosette/apimodel/EntityMention.java
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/EntitySentiment.java b/model/src/main/java/com/basistech/rosette/apimodel/EntitySentiment.java
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/MentionOffsets.java b/model/src/main/java/com/basistech/rosette/apimodel/MentionOffsets.java
diff --git a/pom.xml b/pom.xml
diff --git a/release/pom.xml b/release/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`-* Copyright 2017 Basis Technology Corp.`
	`2`	`+* Copyright 2016 Basis Technology Corp.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -37,6 +37,7 @@ public EntitySentimentMixin(`
`37`	`37`	`@JsonProperty("entityId") String entityId,`
`38`	`38`	`@JsonProperty("confidence") Double confidence,`
`39`	`39`	`@JsonProperty("salience") Double salience,`
	`40`	`+ @JsonProperty("linkingConfidence") Double linkingConfidence,`
`40`	`41`	`@JsonProperty("sentiment") Label sentiment) {`
`41`	`42`	`//`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ public MentionOffsetsMixin(`
`30`	`30`	`@JsonProperty("endOffset") Integer endOffset) {`
`31`	`31`	`//`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`