feat(Language Translator): Add generated code from newest version of service

Author: lpatino10

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

@@ -21,6 +21,7 @@
 import com.ibm.cloud.sdk.core.util.RequestUtils;
 import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
 import com.ibm.cloud.sdk.core.util.Validator;
+import com.ibm.watson.common.SdkCommon;
 import com.ibm.watson.language_translator.v3.model.CreateModelOptions;
 import com.ibm.watson.language_translator.v3.model.DeleteModelOptions;
 import com.ibm.watson.language_translator.v3.model.GetModelOptions;
@@ -33,6 +34,8 @@
 import com.ibm.watson.language_translator.v3.model.TranslationModel;
 import com.ibm.watson.language_translator.v3.model.TranslationModels;
 import com.ibm.watson.language_translator.v3.model.TranslationResult;
+import java.util.Map;
+import java.util.Map.Entry;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
@@ -111,8 +114,11 @@ public ServiceCall<TranslationResult> translate(TranslateOptions translateOption
     String[] pathSegments = { "v3/translate" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=translate");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "translate");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     final JsonObject contentJson = new JsonObject();
     contentJson.add("text", GsonSingleton.getGson().toJsonTree(translateOptions.text()));
     if (translateOptions.modelId() != null) {
@@ -141,8 +147,11 @@ public ServiceCall<IdentifiedLanguages> identify(IdentifyOptions identifyOptions
     String[] pathSegments = { "v3/identify" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=identify");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "identify");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     builder.bodyContent(identifyOptions.text(), "text/plain");
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(IdentifiedLanguages.class));
   }
@@ -162,8 +171,11 @@ public ServiceCall<IdentifiableLanguages> listIdentifiableLanguages(
     String[] pathSegments = { "v3/identifiable_languages" };
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=listIdentifiableLanguages");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "listIdentifiableLanguages");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (listIdentifiableLanguagesOptions != null) {
     }
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(IdentifiableLanguages.class));
@@ -207,8 +219,11 @@ public ServiceCall<TranslationModel> createModel(CreateModelOptions createModelO
     String[] pathSegments = { "v3/models" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=createModel");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "createModel");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     builder.query("base_model_id", createModelOptions.baseModelId());
     if (createModelOptions.name() != null) {
       builder.query("name", createModelOptions.name());
@@ -218,14 +233,12 @@ public ServiceCall<TranslationModel> createModel(CreateModelOptions createModelO
     if (createModelOptions.forcedGlossary() != null) {
       RequestBody forcedGlossaryBody = RequestUtils.inputStreamBody(createModelOptions.forcedGlossary(),
           "application/octet-stream");
-      multipartBuilder.addFormDataPart("forced_glossary", createModelOptions.forcedGlossaryFilename(),
-          forcedGlossaryBody);
+      multipartBuilder.addFormDataPart("forced_glossary", "filename", forcedGlossaryBody);
     }
     if (createModelOptions.parallelCorpus() != null) {
       RequestBody parallelCorpusBody = RequestUtils.inputStreamBody(createModelOptions.parallelCorpus(),
           "application/octet-stream");
-      multipartBuilder.addFormDataPart("parallel_corpus", createModelOptions.parallelCorpusFilename(),
-          parallelCorpusBody);
+      multipartBuilder.addFormDataPart("parallel_corpus", "filename", parallelCorpusBody);
     }
     builder.body(multipartBuilder.build());
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(TranslationModel.class));
@@ -246,8 +259,11 @@ public ServiceCall<Void> deleteModel(DeleteModelOptions deleteModelOptions) {
     RequestBuilder builder = RequestBuilder.delete(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=deleteModel");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "deleteModel");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
   }
 
@@ -267,8 +283,11 @@ public ServiceCall<TranslationModel> getModel(GetModelOptions getModelOptions) {
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=getModel");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "getModel");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(TranslationModel.class));
   }
 
@@ -284,8 +303,11 @@ public ServiceCall<TranslationModels> listModels(ListModelsOptions listModelsOpt
     String[] pathSegments = { "v3/models" };
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=language_translator;service_version=v3;operation_id=listModels");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("language_translator", "v3", "listModels");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (listModelsOptions != null) {
       if (listModelsOptions.source() != null) {
         builder.query("source", listModelsOptions.source());

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

@@ -26,30 +26,24 @@
 public class CreateModelOptions extends GenericModel {
 
   private String baseModelId;
-  private String name;
   private InputStream forcedGlossary;
-  private String forcedGlossaryFilename;
   private InputStream parallelCorpus;
-  private String parallelCorpusFilename;
+  private String name;
 
   /**
    * Builder.
    */
   public static class Builder {
     private String baseModelId;
-    private String name;
     private InputStream forcedGlossary;
-    private String forcedGlossaryFilename;
     private InputStream parallelCorpus;
-    private String parallelCorpusFilename;
+    private String name;
 
     private Builder(CreateModelOptions createModelOptions) {
-      baseModelId = createModelOptions.baseModelId;
-      name = createModelOptions.name;
-      forcedGlossary = createModelOptions.forcedGlossary;
-      forcedGlossaryFilename = createModelOptions.forcedGlossaryFilename;
-      parallelCorpus = createModelOptions.parallelCorpus;
-      parallelCorpusFilename = createModelOptions.parallelCorpusFilename;
+      this.baseModelId = createModelOptions.baseModelId;
+      this.forcedGlossary = createModelOptions.forcedGlossary;
+      this.parallelCorpus = createModelOptions.parallelCorpus;
+      this.name = createModelOptions.name;
     }
 
     /**
@@ -87,17 +81,6 @@ public Builder baseModelId(String baseModelId) {
       return this;
     }
 
-    /**
-     * Set the name.
-     *
-     * @param name the name
-     * @return the CreateModelOptions builder
-     */
-    public Builder name(String name) {
-      this.name = name;
-      return this;
-    }
-
     /**
      * Set the forcedGlossary.
      *
@@ -109,17 +92,6 @@ public Builder forcedGlossary(InputStream forcedGlossary) {
       return this;
     }
 
-    /**
-     * Set the forcedGlossaryFilename.
-     *
-     * @param forcedGlossaryFilename the forcedGlossaryFilename
-     * @return the CreateModelOptions builder
-     */
-    public Builder forcedGlossaryFilename(String forcedGlossaryFilename) {
-      this.forcedGlossaryFilename = forcedGlossaryFilename;
-      return this;
-    }
-
     /**
      * Set the parallelCorpus.
      *
@@ -132,13 +104,13 @@ public Builder parallelCorpus(InputStream parallelCorpus) {
     }
 
     /**
-     * Set the parallelCorpusFilename.
+     * Set the name.
      *
-     * @param parallelCorpusFilename the parallelCorpusFilename
+     * @param name the name
      * @return the CreateModelOptions builder
      */
-    public Builder parallelCorpusFilename(String parallelCorpusFilename) {
-      this.parallelCorpusFilename = parallelCorpusFilename;
+    public Builder name(String name) {
+      this.name = name;
       return this;
     }
 
@@ -152,7 +124,6 @@ public Builder parallelCorpusFilename(String parallelCorpusFilename) {
      */
     public Builder forcedGlossary(File forcedGlossary) throws FileNotFoundException {
       this.forcedGlossary = new FileInputStream(forcedGlossary);
-      this.forcedGlossaryFilename = forcedGlossary.getName();
       return this;
     }
 
@@ -166,19 +137,16 @@ public Builder forcedGlossary(File forcedGlossary) throws FileNotFoundException
      */
     public Builder parallelCorpus(File parallelCorpus) throws FileNotFoundException {
       this.parallelCorpus = new FileInputStream(parallelCorpus);
-      this.parallelCorpusFilename = parallelCorpus.getName();
       return this;
     }
   }
 
   private CreateModelOptions(Builder builder) {
     Validator.notNull(builder.baseModelId, "baseModelId cannot be null");
     baseModelId = builder.baseModelId;
-    name = builder.name;
     forcedGlossary = builder.forcedGlossary;
-    forcedGlossaryFilename = builder.forcedGlossaryFilename;
     parallelCorpus = builder.parallelCorpus;
-    parallelCorpusFilename = builder.parallelCorpusFilename;
+    name = builder.name;
   }
 
   /**
@@ -203,18 +171,6 @@ public String baseModelId() {
     return baseModelId;
   }
 
-  /**
-   * Gets the name.
-   *
-   * An optional model name that you can use to identify the model. Valid characters are letters, numbers, dashes,
-   * underscores, spaces and apostrophes. The maximum length is 32 characters.
-   *
-   * @return the name
-   */
-  public String name() {
-    return name;
-  }
-
   /**
    * Gets the forcedGlossary.
    *
@@ -228,17 +184,6 @@ public InputStream forcedGlossary() {
     return forcedGlossary;
   }
 
-  /**
-   * Gets the forcedGlossaryFilename.
-   *
-   * The filename for forcedGlossary.
-   *
-   * @return the forcedGlossaryFilename
-   */
-  public String forcedGlossaryFilename() {
-    return forcedGlossaryFilename;
-  }
-
   /**
    * Gets the parallelCorpus.
    *
@@ -253,13 +198,14 @@ public InputStream parallelCorpus() {
   }
 
   /**
-   * Gets the parallelCorpusFilename.
+   * Gets the name.
    *
-   * The filename for parallelCorpus.
+   * An optional model name that you can use to identify the model. Valid characters are letters, numbers, dashes,
+   * underscores, spaces and apostrophes. The maximum length is 32 characters.
    *
-   * @return the parallelCorpusFilename
+   * @return the name
    */
-  public String parallelCorpusFilename() {
-    return parallelCorpusFilename;
+  public String name() {
+    return name;
   }
 }

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

@@ -29,7 +29,7 @@ public static class Builder {
     private String modelId;
 
     private Builder(DeleteModelOptions deleteModelOptions) {
-      modelId = deleteModelOptions.modelId;
+      this.modelId = deleteModelOptions.modelId;
     }
 
     /**

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

@@ -29,7 +29,7 @@ public static class Builder {
     private String modelId;
 
     private Builder(GetModelOptions getModelOptions) {
-      modelId = getModelOptions.modelId;
+      this.modelId = getModelOptions.modelId;
     }
 
     /**

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

@@ -29,7 +29,7 @@ public static class Builder {
     private String text;
 
     private Builder(IdentifyOptions identifyOptions) {
-      text = identifyOptions.text;
+      this.text = identifyOptions.text;
     }
 
     /**

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

@@ -32,9 +32,9 @@ public static class Builder {
     private Boolean defaultModels;
 
     private Builder(ListModelsOptions listModelsOptions) {
-      source = listModelsOptions.source;
-      target = listModelsOptions.target;
-      defaultModels = listModelsOptions.defaultModels;
+      this.source = listModelsOptions.source;
+      this.target = listModelsOptions.target;
+      this.defaultModels = listModelsOptions.defaultModels;
     }
 
     /**

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

@@ -38,10 +38,10 @@ public static class Builder {
     private String target;
 
     private Builder(TranslateOptions translateOptions) {
-      text = translateOptions.text;
-      modelId = translateOptions.modelId;
-      source = translateOptions.source;
-      target = translateOptions.target;
+      this.text = translateOptions.text;
+      this.modelId = translateOptions.modelId;
+      this.source = translateOptions.source;
+      this.target = translateOptions.target;
     }
 
     /**