Merge pull request #1 from rosette-api/master

Rebase

Author: orenro

annotations/pom.xml

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

json/src/main/java/com/basistech/rosette/apimodel/jackson/AddressSimilarityRequestMixin.java

@@ -16,6 +16,8 @@
 
 package com.basistech.rosette.apimodel.jackson;
 
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -32,8 +34,9 @@ public class AddressSimilarityRequestMixin {
     protected AddressSimilarityRequestMixin(
             @JsonProperty("profileId") String profileId,
             @JsonProperty("address1") IAddress address1,
-            @JsonProperty("address2") IAddress address2
-    ) {
+            @JsonProperty("address2") IAddress address2,
+            @JsonProperty("parameters") Map<String, String> parameters
+            ) {
         //
     }
 

json/src/main/java/com/basistech/rosette/apimodel/jackson/NameSimilarityRequestMixin.java

@@ -16,7 +16,10 @@
 
 package com.basistech.rosette.apimodel.jackson;
 
+import java.util.Map;
+
 import com.basistech.rosette.apimodel.Name;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -33,8 +36,9 @@ public abstract class NameSimilarityRequestMixin {
     protected NameSimilarityRequestMixin(
             @JsonProperty("profileId") String profileId,
             @JsonProperty("name1") Name name1,
-            @JsonProperty("name2") Name name2
-    ) {
+            @JsonProperty("name2") Name name2,
+            @JsonProperty("parameters") Map<String, String> parameters
+            ) {
         //
     }
 

model/pom.xml

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

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

@@ -17,6 +17,8 @@
 package com.basistech.rosette.apimodel;
 
 
+import java.util.Map;
+
 import javax.validation.constraints.NotNull;
 import lombok.Builder;
 import lombok.Value;
@@ -41,10 +43,17 @@ public final class AddressSimilarityRequest extends Request {
     @NotNull
     private IAddress address2;
 
+    /**
+     * @return parameters to use in the request
+     */
+    private Map<String, String> parameters;
+
     @Builder
-    public AddressSimilarityRequest(String profileId, IAddress address1, IAddress address2) {
+    public AddressSimilarityRequest(String profileId, IAddress address1, IAddress address2,
+                                    Map<String, String> parameters) {
         super(profileId);
         this.address1 = address1;
         this.address2 = address2;
+        this.parameters = parameters;
     }
 }

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

@@ -73,4 +73,9 @@ public class EntitiesOptions extends Options {
      * @return the includePermID flag.
      */
     private final Boolean includePermID;
+
+    /**
+     * @return the RTS workspace id.
+     */
+    private final String rtsDecoder;
 }