WS-1717: add dbpediaTypes and includeDBpediaTypes; fix dbpediaType (singular) back to string

Author: Katsuya-Tomioka

api/src/test/mock-data/response/eng-url-entities.json

@@ -20,7 +20,8 @@
       "mention": "Washington", 
       "normalized": "Washington", 
       "type": "LOCATION",
-      "dbpediaType": [
+      "dbpediaType": "test1",
+      "dbpediaTypes": [
         "test1"
       ]
     }

api/src/test/mock-data/response/eng-url-entities_linked.json

@@ -17,7 +17,7 @@
       "entityId": "Q1088831", 
       "indocChainId": 2, 
       "mention": "Washington",
-      "dbpediaType": [
+      "dbpediaTypes": [
         "test1",
         "foo",
         "bar"

json/src/test/data/EntitiesResponse.json

@@ -15,7 +15,8 @@
       "salience": 1.0,
       "confidence": 1.0,
       "linkingConfidence": 1.0,
-      "dbpediaType": [
+      "dbpediaType": "test1",
+      "dbpediaTypes": [
         "test1",
         "test2"
       ]

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

@@ -58,10 +58,17 @@ public class EntitiesOptions extends Options {
     private final String modelType;
 
     /**
+     * @deprecated use includeDBpediaTypes instead.
      * @return the includeDBpediaType flag.
      */
     private final Boolean includeDBpediaType;
 
+    /**
+     * @since 1.14.0 (19.08)
+     * @return the includeDBpediaType flag.
+     */
+    private final Boolean includeDBpediaTypes;
+
     /**
      * @return the includePermID flag.
      */

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

@@ -83,9 +83,16 @@ public class Entity {
     private final Label sentiment;
 
     /**
+     * @deprecated use dbpediaTypes instead.
      * @return the DBpediaType
      */
-    private final List<String> dbpediaType;
+    private final String dbpediaType;
+
+    /**
+     * @since 1.14.0 (19.08)
+     * @return the DBpediaTypes
+     */
+    private final List<String> dbpediaTypes;
 
     /**
      * @return the PermID