Merge pull request #200 from rosette-api/RCB-613-release-java-binding

RCB-613: removing genre field

Author: Keston375

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

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

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

@@ -36,7 +36,6 @@ protected AdmRequestMixin(
             @JsonProperty("profileId") String profileId,
             @JsonProperty("text") AnnotatedText text,
             @JsonProperty("options") Options options,
-            @Deprecated @JsonProperty("genre") String genre,
             @JsonProperty("language") LanguageCode language
     ) {
         //

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

@@ -16,7 +16,6 @@
 
 package com.basistech.rosette.apimodel.jackson;
 
-import com.basistech.rosette.apimodel.Address;
 import com.basistech.rosette.apimodel.AddressSimilarityRequest;
 import com.basistech.rosette.apimodel.AdmRequest;
 import com.basistech.rosette.apimodel.ConfigurationRequest;
@@ -38,7 +37,6 @@
  * Jackson module to configure Json serialization and deserialization for the
  * Rosette API model.
  */
-@SuppressWarnings("deprecation")
 public class ApiModelMixinModule extends AnnotatedDataModelModule {
 
     public ApiModelMixinModule() {
@@ -69,8 +67,7 @@ public void setupModule(Module.SetupContext context) {
         context.setMixInAnnotations(NameDeduplicationRequest.class, NameDeduplicationRequestMixin.class);
         context.setMixInAnnotations(NameDeduplicationRequest.NameDeduplicationRequestBuilder.class,
                 NameDeduplicationRequestMixin.NameDeduplicationRequestBuilderMixin.class);
-        context.setMixInAnnotations(Address.class, AddressMixin.class);
-        context.setMixInAnnotations(Address.AddressBuilder.class, AddressMixin.AddressBuilderMixin.class);
+
         context.setMixInAnnotations(FieldedAddress.class, FieldedAddressMixin.class);
         context.setMixInAnnotations(FieldedAddress.FieldedAddressBuilder.class,
                 FieldedAddressMixin.FieldedAddressBuilderMixin.class);

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

@@ -47,7 +47,6 @@ protected DocumentRequestMixin(
             @JsonProperty("content") Object content,
             @JsonProperty("contentUri") String contentUri,
             @JsonProperty("contentType") String contentType,
-            @Deprecated @JsonProperty("genre") String genre,
             @JsonProperty("options") Options options
     ) {
         //

json/src/test/data/EntitiesResponse.json

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

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

@@ -134,7 +134,6 @@ void packageTest(boolean inputStreams) throws ClassNotFoundException, IOExceptio
                         o1 = DocumentRequest.builder()
                                 .profileId(r.getProfileId())
                                 .language(r.getLanguage())
-                                .genre(r.getGenre())
                                 .content(r.getContent())
                                 .contentUri(r.getContentUri())
                                 .options(r.getOptions())

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

@@ -42,17 +42,17 @@ void testRequestTypes() throws Exception {
         Request request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
         assertEquals(DOC_REQUEST, request.getClass().getName());
 
-        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true}}";
+        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaTypes\": true, \"calculateConfidence\": true}}";
         request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
         assertEquals(DOC_REQUEST, request.getClass().getName());
         assertNull(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());
 
-        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true, \"includePermID\": true}}";
+        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaTypes\": true, \"calculateConfidence\": true, \"includePermID\": true}}";
         request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
         assertEquals(DOC_REQUEST, request.getClass().getName());
         assertTrue(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());
 
-        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaType\": true, \"calculateConfidence\": true, \"includePermID\": false}}";
+        json = "{\"content\": \"what is my type\", \"language\": \"eng\", \"options\": {\"includeDBpediaTypes\": true, \"calculateConfidence\": true, \"includePermID\": false}}";
         request = mapper.readValue(json, new TypeReference<DocumentRequest<EntitiesOptions>>() { });
         assertEquals(DOC_REQUEST, request.getClass().getName());
         assertFalse(((DocumentRequest<EntitiesOptions>) request).getOptions().getIncludePermID());

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

@@ -38,40 +38,20 @@ public final class AdmRequest<O extends Options> extends Request {
      */
     private final O options;
 
-    /**
-     * @return genre
-     */
-    @Deprecated
-    private final String genre;
-
     /**
      * @return language
      */
     private final LanguageCode language;
 
 
-    public AdmRequest(String profileId,
-                      AnnotatedText text,
-                      O options,
-                      LanguageCode language) {
-        super(profileId);
-        this.text = text;
-        this.options = options;
-        this.genre = null;
-        this.language = language;
-    }
-
-
     @Builder     // workaround for inheritance https://github.com/rzwitserloot/lombok/issues/853
     public AdmRequest(String profileId,
                       AnnotatedText text,
                       O options,
-                      @Deprecated String genre,
                       LanguageCode language) {
         super(profileId);
         this.text = text;
         this.options = options;
-        this.genre = genre;
         this.language = language;
     }
 }

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

@@ -20,8 +20,6 @@
 import lombok.Builder;
 import lombok.Value;
 
-import javax.validation.constraints.Min;
-
 /**
  * Categorization options 
  */
@@ -30,15 +28,6 @@
 @JacksonMixin
 public class CategoriesOptions extends Options {
 
-    /**
-     * @deprecated
-     * Users should use {@link singleLabel} to return only one result
-     * or {@link scoreThreshold} to filter results based on raw score
-     * @return number of categories
-     */
-    @Min(1)
-    private final Integer numCategories;
-
     /**
      * Single label mode will return only the highest scoring category, regardless of score
      * If singleLabel is false, every category whose score exceeds the default