Merge pull request #199 from rosette-api/revert-198-TEJ-1855-remove-genre

Revert "TEJ-1855: Remove all genre references."

Author: seth-mg

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

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

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

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

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

@@ -134,6 +134,7 @@ 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,6 +38,11 @@ public final class AdmRequest<O extends Options> extends Request {
      */
     private final O options;
 
+    /**
+     * @return genre
+     */
+    private final String genre;
+
     /**
      * @return language
      */
@@ -47,10 +52,12 @@ public final class AdmRequest<O extends Options> extends Request {
     public AdmRequest(String profileId,
                        AnnotatedText text,
                        O options,
+                       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

@@ -44,6 +44,9 @@
  * In this object the 'content' item is an {@link Object}; it contains a {@link String}
  * for plain text, or an {@link java.io.InputStream} for binary data. {@link DocumentRequest.DocumentRequestBuilder}
  * provides several alternative methods for setting this information.
+ *
+ * This class includes a 'genre' field. If no genre is specified, then the system
+ * applies generic processing. Valid values for genre are specified in the API documentation.
  */
 @Value
 public final class DocumentRequest<O extends Options> extends Request {
@@ -68,6 +71,11 @@ public final class DocumentRequest<O extends Options> extends Request {
      */
     private final String contentType;
 
+    /**
+     * @return request genre
+     */
+    private final String genre;
+
     /**
      * @return request options
      */
@@ -79,12 +87,14 @@ public DocumentRequest(String profileId,
                            Object content,
                            String contentUri,
                            String contentType,
+                           String genre,
                            O options) {
         super(profileId);
         this.language = language;
         this.content = content;
         this.contentUri = contentUri;
         this.contentType = contentType;
+        this.genre = genre;
         this.options = options;
     }