RCB-613: removing deprecated code

Author: Yaison

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);

model/src/main/java/com/basistech/rosette/apimodel/Address.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

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

@@ -63,13 +63,6 @@ public class EntitiesOptions extends Options {
      */
     String modelType;
 
-    /**
-     * @deprecated use includeDBpediaTypes instead.
-     * @return the includeDBpediaType flag.
-     */
-    @Deprecated(since = "1.14.0", forRemoval = true)
-    Boolean includeDBpediaType;
-
     /**
      * @since 1.14.0 (19.08)
      * @return the includeDBpediaType flag.

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

@@ -84,13 +84,6 @@ public class Entity {
      */
     Label sentiment;
 
-    /**
-     * @deprecated use dbpediaTypes instead.
-     * @return the DBpediaType
-     */
-    @Deprecated(since = "1.14.0", forRemoval = true)
-    String dbpediaType;
-
     /**
      * @since 1.14.0 (19.08)
      * @return the DBpediaTypes