Merge pull request #1209 from watson-developer-cloud/fix-lt

 fix(language-translator-v3): add content-type to createModelOptions model properties

Author: kevinkowa

language-translator/src/main/java/com/ibm/watson/language_translator/v3/LanguageTranslator.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2019, 2021.
+ * (C) Copyright IBM Corp. 2019, 2022.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -12,7 +12,7 @@
  */
 
 /*
- * IBM OpenAPI SDK Code Generator Version: 3.38.0-07189efd-20210827-205025
+ * IBM OpenAPI SDK Code Generator Version: 3.46.0-a4e29da0-20220224-210428
  */
 
 package com.ibm.watson.language_translator.v3;
@@ -440,13 +440,13 @@ public ServiceCall<TranslationModel> createModel(CreateModelOptions createModelO
     if (createModelOptions.forcedGlossary() != null) {
       okhttp3.RequestBody forcedGlossaryBody =
           RequestUtils.inputStreamBody(
-              createModelOptions.forcedGlossary(), "application/octet-stream");
+              createModelOptions.forcedGlossary(), createModelOptions.forcedGlossaryContentType());
       multipartBuilder.addFormDataPart("forced_glossary", "filename", forcedGlossaryBody);
     }
     if (createModelOptions.parallelCorpus() != null) {
       okhttp3.RequestBody parallelCorpusBody =
           RequestUtils.inputStreamBody(
-              createModelOptions.parallelCorpus(), "application/octet-stream");
+              createModelOptions.parallelCorpus(), createModelOptions.parallelCorpusContentType());
       multipartBuilder.addFormDataPart("parallel_corpus", "filename", parallelCorpusBody);
     }
     builder.body(multipartBuilder.build());

language-translator/src/main/java/com/ibm/watson/language_translator/v3/model/CreateModelOptions.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2018, 2020.
+ * (C) Copyright IBM Corp. 2018, 2022.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -23,20 +23,26 @@ public class CreateModelOptions extends GenericModel {
 
   protected String baseModelId;
   protected InputStream forcedGlossary;
+  protected String forcedGlossaryContentType;
   protected InputStream parallelCorpus;
+  protected String parallelCorpusContentType;
   protected String name;
 
   /** Builder. */
   public static class Builder {
     private String baseModelId;
     private InputStream forcedGlossary;
+    private String forcedGlossaryContentType;
     private InputStream parallelCorpus;
+    private String parallelCorpusContentType;
     private String name;
 
     private Builder(CreateModelOptions createModelOptions) {
       this.baseModelId = createModelOptions.baseModelId;
       this.forcedGlossary = createModelOptions.forcedGlossary;
+      this.forcedGlossaryContentType = createModelOptions.forcedGlossaryContentType;
       this.parallelCorpus = createModelOptions.parallelCorpus;
+      this.parallelCorpusContentType = createModelOptions.parallelCorpusContentType;
       this.name = createModelOptions.name;
     }
 
@@ -83,6 +89,17 @@ public Builder forcedGlossary(InputStream forcedGlossary) {
       return this;
     }
 
+    /**
+     * Set the forcedGlossaryContentType.
+     *
+     * @param forcedGlossaryContentType the forcedGlossaryContentType
+     * @return the CreateModelOptions builder
+     */
+    public Builder forcedGlossaryContentType(String forcedGlossaryContentType) {
+      this.forcedGlossaryContentType = forcedGlossaryContentType;
+      return this;
+    }
+
     /**
      * Set the parallelCorpus.
      *
@@ -94,6 +111,17 @@ public Builder parallelCorpus(InputStream parallelCorpus) {
       return this;
     }
 
+    /**
+     * Set the parallelCorpusContentType.
+     *
+     * @param parallelCorpusContentType the parallelCorpusContentType
+     * @return the CreateModelOptions builder
+     */
+    public Builder parallelCorpusContentType(String parallelCorpusContentType) {
+      this.parallelCorpusContentType = parallelCorpusContentType;
+      return this;
+    }
+
     /**
      * Set the name.
      *
@@ -135,7 +163,9 @@ protected CreateModelOptions(Builder builder) {
         builder.baseModelId, "baseModelId cannot be null");
     baseModelId = builder.baseModelId;
     forcedGlossary = builder.forcedGlossary;
+    forcedGlossaryContentType = builder.forcedGlossaryContentType;
     parallelCorpus = builder.parallelCorpus;
+    parallelCorpusContentType = builder.parallelCorpusContentType;
     name = builder.name;
   }
 
@@ -181,6 +211,18 @@ public InputStream forcedGlossary() {
     return forcedGlossary;
   }
 
+  /**
+   * Gets the forcedGlossaryContentType.
+   *
+   * <p>The content type of forcedGlossary. Values for this parameter can be obtained from the
+   * HttpMediaType class.
+   *
+   * @return the forcedGlossaryContentType
+   */
+  public String forcedGlossaryContentType() {
+    return forcedGlossaryContentType;
+  }
+
   /**
    * Gets the parallelCorpus.
    *
@@ -201,6 +243,18 @@ public InputStream parallelCorpus() {
     return parallelCorpus;
   }
 
+  /**
+   * Gets the parallelCorpusContentType.
+   *
+   * <p>The content type of parallelCorpus. Values for this parameter can be obtained from the
+   * HttpMediaType class.
+   *
+   * @return the parallelCorpusContentType
+   */
+  public String parallelCorpusContentType() {
+    return parallelCorpusContentType;
+  }
+
   /**
    * Gets the name.
    *

language-translator/src/test/java/com/ibm/watson/language_translator/v3/LanguageTranslatorTest.java

@@ -355,7 +355,9 @@ public void testCreateModelWOptions() throws Throwable {
         new CreateModelOptions.Builder()
             .baseModelId("testString")
             .forcedGlossary(TestUtilities.createMockStream("This is a mock file."))
+            .forcedGlossaryContentType("application/x-tmx+xml")
             .parallelCorpus(TestUtilities.createMockStream("This is a mock file."))
+            .parallelCorpusContentType("application/x-tmx+xml")
             .name("testString")
             .build();
 

language-translator/src/test/java/com/ibm/watson/language_translator/v3/model/CreateModelOptionsTest.java

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright IBM Corp. 2020.
+ * (C) Copyright IBM Corp. 2020, 2022.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -35,16 +35,20 @@ public void testCreateModelOptions() throws Throwable {
         new CreateModelOptions.Builder()
             .baseModelId("testString")
             .forcedGlossary(TestUtilities.createMockStream("This is a mock file."))
+            .forcedGlossaryContentType("application/x-tmx+xml")
             .parallelCorpus(TestUtilities.createMockStream("This is a mock file."))
+            .parallelCorpusContentType("application/x-tmx+xml")
             .name("testString")
             .build();
     assertEquals(createModelOptionsModel.baseModelId(), "testString");
     assertEquals(
         IOUtils.toString(createModelOptionsModel.forcedGlossary()),
         IOUtils.toString(TestUtilities.createMockStream("This is a mock file.")));
+    assertEquals(createModelOptionsModel.forcedGlossaryContentType(), "application/x-tmx+xml");
     assertEquals(
         IOUtils.toString(createModelOptionsModel.parallelCorpus()),
         IOUtils.toString(TestUtilities.createMockStream("This is a mock file.")));
+    assertEquals(createModelOptionsModel.parallelCorpusContentType(), "application/x-tmx+xml");
     assertEquals(createModelOptionsModel.name(), "testString");
   }