RCB-613: removing genre field

Author: Yaison

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/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/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())

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

@@ -68,47 +68,23 @@ public final class DocumentRequest<O extends Options> extends Request {
      */
     private final String contentType;
 
-    /**
-     * @return request genre
-     */
-    @Deprecated
-    private final String genre;
-
     /**
      * @return request options
      */
     private final O options;
 
-
-    public DocumentRequest(String profileId,
-                           LanguageCode language,
-                           Object content,
-                           String contentUri,
-                           String contentType,
-                           O options) {
-        super(profileId);
-        this.language = language;
-        this.content = content;
-        this.contentUri = contentUri;
-        this.contentType = contentType;
-        this.genre = null;
-        this.options = options;
-    }
-
     @Builder     // workaround for inheritance https://github.com/rzwitserloot/lombok/issues/853
     public DocumentRequest(String profileId,
                            LanguageCode language,
                            Object content,
                            String contentUri,
                            String contentType,
-                           @Deprecated String genre,
                            O options) {
         super(profileId);
         this.language = language;
         this.content = content;
         this.contentUri = contentUri;
         this.contentType = contentType;
-        this.genre = genre;
         this.options = options;
     }