Merge pull request #150 from Katsuya-Tomioka/WS-1693

WS-1693: add includePermID in EntitiesOptions

Author: seth-mg

json/src/test/java/com/basistech/rosette/apimodel/PolymorphicRequestTest.java

@@ -41,6 +41,17 @@ public void testRequestTypes() throws Exception {
         json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true}}";
         request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
         assertTrue(request instanceof DocumentRequest);
+        assertNull(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());
+
+        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true, \"includePermID\": true}}";
+        request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
+        assertTrue(request instanceof DocumentRequest);
+        assertTrue(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());
+
+        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true, \"includePermID\": false}}";
+        request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
+        assertTrue(request instanceof DocumentRequest);
+        assertFalse(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());
 
         json = "{\"name1\": {\"text\": \"Joe\"}, \"name2\": {\"text\": \"Geo\"}}";
         request = mapper.readValue(json, NameSimilarityRequest.class);

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

@@ -61,4 +61,9 @@ public class EntitiesOptions extends Options {
      * @retrun the includeDBpediaType flag.
      */
     private final Boolean includeDBpediaType;
+
+    /**
+     * @return the includePermID flag.
+     */
+    private final Boolean includePermID;
 }