feat(Visual Recognition): Add generated code from newest version of service

Author: lpatino10

visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java

@@ -19,6 +19,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.visual_recognition.v3.model.ClassifiedImages;
 import com.ibm.watson.visual_recognition.v3.model.Classifier;
 import com.ibm.watson.visual_recognition.v3.model.Classifiers;
@@ -32,11 +33,11 @@
 import com.ibm.watson.visual_recognition.v3.model.GetCoreMlModelOptions;
 import com.ibm.watson.visual_recognition.v3.model.ListClassifiersOptions;
 import com.ibm.watson.visual_recognition.v3.model.UpdateClassifierOptions;
-import okhttp3.MultipartBody;
-import okhttp3.RequestBody;
-
 import java.io.InputStream;
 import java.util.Map;
+import java.util.Map.Entry;
+import okhttp3.MultipartBody;
+import okhttp3.RequestBody;
 
 /**
  * The IBM Watson™ Visual Recognition service uses deep learning algorithms to identify scenes, objects, and faces
@@ -70,52 +71,6 @@ public VisualRecognition(String versionDate) {
     this.versionDate = versionDate;
   }
 
-  /**
-   * Instantiates a new `VisualRecognition` with API Key.
-   *
-   * @param versionDate The version date (yyyy-MM-dd) of the REST API to use. Specifying this value will keep your API
-   *          calls from failing when the service introduces breaking changes.
-   * @param apiKey the API Key
-   * @deprecated This form of authentication is deprecated and will be removed in the next major release. Please
-   *             authenticate using IAM credentials, using either the (String, IamOptions) constructor or with the
-   *             setIamCredentials() method.
-   */
-  public VisualRecognition(String versionDate, String apiKey) {
-    this(versionDate);
-    setApiKey(apiKey);
-  }
-
-  /*
-   * (non-Javadoc)
-   */
-  @Override
-  protected void setAuthentication(okhttp3.Request.Builder builder) {
-    if ((getUsername() != null && getPassword() != null) || isTokenManagerSet()) {
-      super.setAuthentication(builder);
-    } else if (getApiKey() != null) {
-      addApiKeyQueryParameter(builder, getApiKey());
-    } else {
-      throw new IllegalArgumentException(
-          "Credentials need to be specified. Use setApiKey(), setIamCredentials(), or setUsernameAndPassword().");
-    }
-  }
-
-  /**
-   * Adds the API key as a query parameter to the request URL.
-   *
-   * @param builder builder for the current request
-   * @param apiKey API key to be added
-   */
-  private void addApiKeyQueryParameter(okhttp3.Request.Builder builder, String apiKey) {
-    final okhttp3.HttpUrl url = okhttp3.HttpUrl.parse(builder.build().url().toString());
-
-    if ((url.query() == null) || url.query().isEmpty()) {
-      builder.url(builder.build().url() + "?api_key=" + apiKey);
-    } else {
-      builder.url(builder.build().url() + "&api_key=" + apiKey);
-    }
-  }
-
   /**
    * Instantiates a new `VisualRecognition` with IAM. Note that if the access token is specified in the
    * iamOptions, you accept responsibility for managing the access token yourself. You must set a new access token
@@ -142,18 +97,17 @@ public VisualRecognition(String versionDate, IamOptions iamOptions) {
    */
   public ServiceCall<ClassifiedImages> classify(ClassifyOptions classifyOptions) {
     Validator.notNull(classifyOptions, "classifyOptions cannot be null");
-    Validator.isTrue((classifyOptions.imagesFile() != null)
-            || (classifyOptions.url() != null)
-            || (classifyOptions.threshold() != null)
-            || (classifyOptions.owners() != null)
-            || (classifyOptions.classifierIds() != null)
-            || (classifyOptions.parameters() != null),
-        "At least one of imagesFile, url, threshold, owners, classifierIds, or parameters must be supplied.");
+    Validator.isTrue((classifyOptions.imagesFile() != null) || (classifyOptions.url() != null) || (classifyOptions
+        .threshold() != null) || (classifyOptions.owners() != null) || (classifyOptions.classifierIds() != null),
+        "At least one of imagesFile, url, threshold, owners, or classifierIds must be supplied.");
     String[] pathSegments = { "v3/classify" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=classify");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "classify");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (classifyOptions.acceptLanguage() != null) {
       builder.header("Accept-Language", classifyOptions.acceptLanguage());
     }
@@ -164,9 +118,6 @@ public ServiceCall<ClassifiedImages> classify(ClassifyOptions classifyOptions) {
           .imagesFileContentType());
       multipartBuilder.addFormDataPart("images_file", classifyOptions.imagesFilename(), imagesFileBody);
     }
-    if (classifyOptions.parameters() != null) {
-      multipartBuilder.addFormDataPart("parameters", classifyOptions.parameters());
-    }
     if (classifyOptions.url() != null) {
       multipartBuilder.addFormDataPart("url", classifyOptions.url());
     }
@@ -215,15 +166,16 @@ public ServiceCall<ClassifiedImages> classify() {
    */
   public ServiceCall<DetectedFaces> detectFaces(DetectFacesOptions detectFacesOptions) {
     Validator.notNull(detectFacesOptions, "detectFacesOptions cannot be null");
-    Validator.isTrue((detectFacesOptions.imagesFile() != null)
-            || (detectFacesOptions.url() != null)
-            || (detectFacesOptions.parameters() != null),
-        "At least one of imagesFile, url, or parameters must be supplied.");
+    Validator.isTrue((detectFacesOptions.imagesFile() != null) || (detectFacesOptions.url() != null),
+        "At least one of imagesFile or url must be supplied.");
     String[] pathSegments = { "v3/detect_faces" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=detectFaces");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "detectFaces");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (detectFacesOptions.acceptLanguage() != null) {
       builder.header("Accept-Language", detectFacesOptions.acceptLanguage());
     }
@@ -234,9 +186,6 @@ public ServiceCall<DetectedFaces> detectFaces(DetectFacesOptions detectFacesOpti
           .imagesFileContentType());
       multipartBuilder.addFormDataPart("images_file", detectFacesOptions.imagesFilename(), imagesFileBody);
     }
-    if (detectFacesOptions.parameters() != null) {
-      multipartBuilder.addFormDataPart("parameters", detectFacesOptions.parameters());
-    }
     if (detectFacesOptions.url() != null) {
       multipartBuilder.addFormDataPart("url", detectFacesOptions.url());
     }
@@ -284,17 +233,18 @@ public ServiceCall<Classifier> createClassifier(CreateClassifierOptions createCl
     String[] pathSegments = { "v3/classifiers" };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=createClassifier");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "createClassifier");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
     multipartBuilder.setType(MultipartBody.FORM);
     multipartBuilder.addFormDataPart("name", createClassifierOptions.name());
     for (Map.Entry<String, InputStream> entry : createClassifierOptions.positiveExamples().entrySet()) {
       String partName = String.format("%s_positive_examples", entry.getKey());
-      String fileName = createClassifierOptions.positiveExamplesFilename() != null ? createClassifierOptions
-          .positiveExamplesFilename().get(entry.getKey()) : null;
       RequestBody part = RequestUtils.inputStreamBody(entry.getValue(), "application/octet-stream");
-      multipartBuilder.addFormDataPart(partName, fileName, part);
+      multipartBuilder.addFormDataPart(partName, entry.getKey(), part);
     }
     if (createClassifierOptions.negativeExamples() != null) {
       RequestBody negativeExamplesBody = RequestUtils.inputStreamBody(createClassifierOptions.negativeExamples(),
@@ -319,8 +269,11 @@ public ServiceCall<Void> deleteClassifier(DeleteClassifierOptions deleteClassifi
     RequestBuilder builder = RequestBuilder.delete(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=deleteClassifier");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "deleteClassifier");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
   }
 
@@ -339,8 +292,11 @@ public ServiceCall<Classifier> getClassifier(GetClassifierOptions getClassifierO
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=getClassifier");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "getClassifier");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(Classifier.class));
   }
 
@@ -354,8 +310,11 @@ public ServiceCall<Classifiers> listClassifiers(ListClassifiersOptions listClass
     String[] pathSegments = { "v3/classifiers" };
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=listClassifiers");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "listClassifiers");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     if (listClassifiersOptions != null) {
       if (listClassifiersOptions.verbose() != null) {
         builder.query("verbose", String.valueOf(listClassifiersOptions.verbose()));
@@ -399,17 +358,18 @@ public ServiceCall<Classifier> updateClassifier(UpdateClassifierOptions updateCl
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=updateClassifier");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "updateClassifier");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
     multipartBuilder.setType(MultipartBody.FORM);
     if (updateClassifierOptions.positiveExamples() != null) {
       for (Map.Entry<String, InputStream> entry : updateClassifierOptions.positiveExamples().entrySet()) {
         String partName = String.format("%s_positive_examples", entry.getKey());
-        String fileName = updateClassifierOptions.positiveExamplesFilename() != null ? updateClassifierOptions
-            .positiveExamplesFilename().get(entry.getKey()) : null;
         RequestBody part = RequestUtils.inputStreamBody(entry.getValue(), "application/octet-stream");
-        multipartBuilder.addFormDataPart(partName, fileName, part);
+        multipartBuilder.addFormDataPart(partName, entry.getKey(), part);
       }
     }
     if (updateClassifierOptions.negativeExamples() != null) {
@@ -438,8 +398,11 @@ public ServiceCall<InputStream> getCoreMlModel(GetCoreMlModelOptions getCoreMlMo
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=getCoreMlModel");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "getCoreMlModel");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/octet-stream");
     return createServiceCall(builder.build(), ResponseConverterUtils.getInputStream());
   }
 
@@ -461,8 +424,11 @@ public ServiceCall<Void> deleteUserData(DeleteUserDataOptions deleteUserDataOpti
     String[] pathSegments = { "v3/user_data" };
     RequestBuilder builder = RequestBuilder.delete(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments));
     builder.query("version", versionDate);
-    builder.header("X-IBMCloud-SDK-Analytics",
-        "service_name=watson_vision_combined;service_version=v3;operation_id=deleteUserData");
+    Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("watson_vision_combined", "v3", "deleteUserData");
+    for (Entry<String, String> header : sdkHeaders.entrySet()) {
+      builder.header(header.getKey(), header.getValue());
+    }
+    builder.header("Accept", "application/json");
     builder.query("customer_id", deleteUserDataOptions.customerId());
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
   }