Merge pull request #151 from rosette-api/ws-1693-permid-in-simple-response

seth-mg · web-flow · commit d4767e74f373 · 2019-08-20T09:56:07.000-05:00
WS-1693:  Add PermID to Simple Response.
diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.13.101-SNAPSHOT</version>
+        <version>1.13.103-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-annotations</artifactId>
     <name>rosette-api-annotations</name>
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.13.101-SNAPSHOT</version>
+        <version>1.13.103-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api</artifactId>
     <name>rosette-api</name>
diff --git a/api/src/test/java/com/basistech/rosette/api/RosetteAPITest.java b/api/src/test/java/com/basistech/rosette/api/RosetteAPITest.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2014 Basis Technology Corp.
+* Copyright 2014-2019 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.
@@ -20,6 +20,7 @@
 import com.basistech.rosette.api.common.AbstractRosetteAPI;
 import com.basistech.rosette.apimodel.CategoriesResponse;
 import com.basistech.rosette.apimodel.DocumentRequest;
+import com.basistech.rosette.apimodel.EntitiesOptions;
 import com.basistech.rosette.apimodel.EntitiesResponse;
 import com.basistech.rosette.apimodel.ErrorResponse;
 import com.basistech.rosette.apimodel.LanguageResponse;
@@ -280,6 +281,20 @@ public void testGetEntityLinked() throws IOException {
         }
     }
 
+
+    @Test
+    public void testGetEntityPermId() throws IOException {
+        if (testFilename.endsWith("-entities_permid.json")) {
+            DocumentRequest<EntitiesOptions> request = readValue(DocumentRequest.class);
+            try {
+                EntitiesResponse response = api.perform(AbstractRosetteAPI.ENTITIES_SERVICE_PATH, request, EntitiesResponse.class);
+                verifyEntity(response);
+            } catch (HttpRosetteAPIException e) {
+                verifyException(e);
+            }
+        }
+    }
+
     @Test
     public void testIgnoredUnknownField() throws IOException {
         if ("unknown-field-entities.json".equals(testFilename)) {
diff --git a/api/src/test/mock-data/request/eng-doc-entities_permid.json b/api/src/test/mock-data/request/eng-doc-entities_permid.json
@@ -0,0 +1,4 @@
+{
+  "content": "Toyota and Microsoft are large cap companies.",
+  "language": "eng"
+}
diff --git a/api/src/test/mock-data/response/eng-doc-entities_permid.json b/api/src/test/mock-data/response/eng-doc-entities_permid.json
@@ -0,0 +1,34 @@
+{
+  "entities": [
+    {
+      "type": "ORGANIZATION",
+      "mention": "Toyota",
+      "normalized": "Toyota",
+      "count": 1,
+      "mentionOffsets": [
+        {
+          "startOffset": 0,
+          "endOffset": 6
+        }
+      ],
+      "entityId": "Q53268",
+      "linkingConfidence": 0.45885878,
+      "permId": "4295876746"
+    },
+    {
+      "type": "ORGANIZATION",
+      "mention": "Microsoft",
+      "normalized": "Microsoft",
+      "count": 1,
+      "mentionOffsets": [
+        {
+          "startOffset": 11,
+          "endOffset": 20
+        }
+      ],
+      "entityId": "Q2283",
+      "linkingConfidence": 0.76733641,
+      "permId": "4295907168"
+    }
+  ]
+}
diff --git a/api/src/test/mock-data/response/eng-doc-entities_permid.status b/api/src/test/mock-data/response/eng-doc-entities_permid.status
@@ -0,0 +1 @@
+200
diff --git a/api/src/test/mock-data/response/eng-url-entities.json b/api/src/test/mock-data/response/eng-url-entities.json
@@ -20,8 +20,9 @@
       "mention": "Washington", 
       "normalized": "Washington", 
       "type": "LOCATION",
-      "dbpediaType": "test1"
-
+      "dbpediaType": [
+        "test1"
+      ]
     }
   ]
 }
diff --git a/api/src/test/mock-data/response/eng-url-entities_linked.json b/api/src/test/mock-data/response/eng-url-entities_linked.json
@@ -17,7 +17,11 @@
       "entityId": "Q1088831", 
       "indocChainId": 2, 
       "mention": "Washington",
-      "dbpediaType": "test1"
+      "dbpediaType": [
+        "test1",
+        "foo",
+        "bar"
+      ]
     }
   ]
-}
+}
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.13.101-SNAPSHOT</version>
+        <version>1.13.103-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.13.101-SNAPSHOT</version>
+        <version>1.13.103-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.13.101-SNAPSHOT</version>
+        <version>1.13.103-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-json</artifactId>
     <name>rosette-api-json</name>
diff --git a/json/src/test/data/EntitiesResponse.json b/json/src/test/data/EntitiesResponse.json
@@ -15,7 +15,10 @@
       "salience": 1.0,
       "confidence": 1.0,
       "linkingConfidence": 1.0,
-      "dbpediaType": "test1"
+      "dbpediaType": [
+        "test1",
+        "test2"
+      ]
     }
   ]
 }
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.13.101-SNAPSHOT</version>
+        <version>1.13.103-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-model</artifactId>
     <name>rosette-api-model</name>
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/EntitiesOptions.java b/model/src/main/java/com/basistech/rosette/apimodel/EntitiesOptions.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2017-2019 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.
@@ -58,7 +58,7 @@ public class EntitiesOptions extends Options {
     private final String modelType;
 
     /**
-     * @retrun the includeDBpediaType flag.
+     * @return the includeDBpediaType flag.
      */
     private final Boolean includeDBpediaType;
 
diff --git a/model/src/main/java/com/basistech/rosette/apimodel/Entity.java b/model/src/main/java/com/basistech/rosette/apimodel/Entity.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2017-2019 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.
@@ -85,6 +85,10 @@ public class Entity {
     /**
      * @return the DBpediaType
      */
-    private final String dbpediaType;
+    private final List<String> dbpediaType;
 
+    /**
+     * @return the PermID
+     */
+    private final String permId;
 }
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-java-binding</artifactId>
-    <version>1.13.101-SNAPSHOT</version>
+    <version>1.13.103-SNAPSHOT</version>
     <parent>
         <artifactId>open-source-parent</artifactId>
         <groupId>com.basistech</groupId>
diff --git a/release/pom.xml b/release/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
         <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.13.101-SNAPSHOT</version>
+        <version>1.13.103-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-release</artifactId>

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "content": "Toyota and Microsoft are large cap companies.",
 +  "language": "eng"
 +}
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@`
`20`	`20`	`"mention": "Washington",`
`21`	`21`	`"normalized": "Washington",`
`22`	`22`	`"type": "LOCATION",`
`23`		`- "dbpediaType": "test1"`
`24`		`-`
	`23`	`+ "dbpediaType": [`
	`24`	`+ "test1"`
	`25`	`+ ]`
`25`	`26`	`}`
`26`	`27`	`]`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,11 @@`
`17`	`17`	`"entityId": "Q1088831",`
`18`	`18`	`"indocChainId": 2,`
`19`	`19`	`"mention": "Washington",`
`20`		`- "dbpediaType": "test1"`
	`20`	`+ "dbpediaType": [`
	`21`	`+ "test1",`
	`22`	`+ "foo",`
	`23`	`+ "bar"`
	`24`	`+ ]`
`21`	`25`	`}`
`22`	`26`	`]`
`23`		`-}`
	`27`	`+}`