Merge branch 'master' into ws-2161-event-endpoint-for-Rosette-Server

Author: Katsuya-Tomioka

annotations/pom.xml

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

api/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.basistech.rosette</groupId>
          <artifactId>rosette-api-java-binding</artifactId>
-        <version>1.18.1-SNAPSHOT</version>
+        <version>1.18.101-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.18.1-SNAPSHOT</version>
+        <version>1.18.101-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.18.1-SNAPSHOT</version>
+        <version>1.18.101-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.18.1-SNAPSHOT</version>
+        <version>1.18.101-SNAPSHOT</version>
     </parent>
     <artifactId>rosette-api-json</artifactId>
     <name>rosette-api-json</name>

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

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

model/pom.xml

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

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

@@ -35,6 +35,7 @@ public class EntitiesOptions extends Options {
             .calculateSalience(false)
             .linkEntities(true)
             .modelType("statistical")
+            .enableStructuredRegion(false)
             .build();
 
     /**
@@ -83,4 +84,9 @@ public class EntitiesOptions extends Options {
      * @return case sensitivity of model to use. Can be one of caseSensitive, caseInsensitive or automatic.
      */
     private final String caseSensitivity;
+
+    /**
+     * @return the enableStructuredRegion flag.
+     */
+    private final Boolean enableStructuredRegion;
 }

pom.xml

@@ -18,7 +18,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-java-binding</artifactId>
-    <version>1.18.1-SNAPSHOT</version>
+    <version>1.18.101-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.18.1-SNAPSHOT</version>
+        <version>1.18.101-SNAPSHOT</version>
     </parent>
     <groupId>com.basistech.rosette</groupId>
     <artifactId>rosette-api-release</artifactId>