chore(Visual Recognition): Add code directly from generator

Author: lpatino10

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

@@ -32,12 +32,10 @@
 import com.ibm.watson.developer_cloud.visual_recognition.v3.model.GetCoreMlModelOptions;
 import com.ibm.watson.developer_cloud.visual_recognition.v3.model.ListClassifiersOptions;
 import com.ibm.watson.developer_cloud.visual_recognition.v3.model.UpdateClassifierOptions;
+import java.io.InputStream;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 
-import java.io.File;
-import java.io.InputStream;
-
 /**
  * The IBM Watson™ Visual Recognition service uses deep learning algorithms to identify scenes, objects, and faces
  * in images you upload to the service. You can create and train a custom classifier to identify subjects that suit
@@ -70,52 +68,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,13 +94,9 @@ 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);
@@ -162,9 +110,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());
     }
@@ -212,10 +157,8 @@ 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);
@@ -226,9 +169,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());
     }
@@ -278,12 +218,12 @@ public ServiceCall<Classifier> createClassifier(CreateClassifierOptions createCl
     MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
     multipartBuilder.setType(MultipartBody.FORM);
     multipartBuilder.addFormDataPart("name", createClassifierOptions.name());
-    // Classes
-    for (String className : createClassifierOptions.classNames()) {
-      String dataName = className + "_positive_examples";
-      File positiveExamples = createClassifierOptions.positiveExamplesByClassName(className);
-      RequestBody body = RequestUtils.fileBody(positiveExamples, "application/octet-stream");
-      multipartBuilder.addFormDataPart(dataName, positiveExamples.getName(), body);
+    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);
     }
     if (createClassifierOptions.negativeExamples() != null) {
       RequestBody negativeExamplesBody = RequestUtils.inputStreamBody(createClassifierOptions.negativeExamples(),
@@ -362,8 +302,7 @@ public ServiceCall<Classifiers> listClassifiers() {
    * Update a custom classifier by adding new positive or negative classes (examples) or by adding new images to
    * existing classes. You must supply at least one set of positive or negative examples. For details, see [Updating
    * custom
-   * classifiers]
-   * (https://console.bluemix.net/docs/services/visual-recognition/customizing.html#updating-custom-classifiers).
+   * classifiers](https://console.bluemix.net/docs/services/visual-recognition/customizing.html#updating-custom-classifiers).
    *
    * Encode all names in UTF-8 if they contain non-ASCII characters (.zip and image file names, and classifier and class
    * names). The service assumes UTF-8 encoding if it encounters non-ASCII characters.
@@ -377,22 +316,23 @@ public ServiceCall<Classifiers> listClassifiers() {
    */
   public ServiceCall<Classifier> updateClassifier(UpdateClassifierOptions updateClassifierOptions) {
     Validator.notNull(updateClassifierOptions, "updateClassifierOptions cannot be null");
-    Validator.isTrue((updateClassifierOptions.classNames().size() > 0) || (updateClassifierOptions
-        .negativeExamples() != null),
-        "At least one of classnamePositiveExamples or negativeExamples must be supplied.");
+    Validator.isTrue((updateClassifierOptions.positiveExamples() != null) || (updateClassifierOptions
+        .negativeExamples() != null), "At least one of positiveExamples or negativeExamples must be supplied.");
     String[] pathSegments = { "v3/classifiers" };
     String[] pathParameters = { updateClassifierOptions.classifierId() };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query(VERSION, versionDate);
     MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
     multipartBuilder.setType(MultipartBody.FORM);
-    // Classes
-    for (String className : updateClassifierOptions.classNames()) {
-      String dataName = className + "_positive_examples";
-      File positiveExamples = updateClassifierOptions.positiveExamplesByClassName(className);
-      RequestBody body = RequestUtils.fileBody(positiveExamples, "application/octet-stream");
-      multipartBuilder.addFormDataPart(dataName, positiveExamples.getName(), body);
+    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);
+      }
     }
     if (updateClassifierOptions.negativeExamples() != null) {
       RequestBody negativeExamplesBody = RequestUtils.inputStreamBody(updateClassifierOptions.negativeExamples(),
@@ -420,7 +360,7 @@ public ServiceCall<InputStream> getCoreMlModel(GetCoreMlModelOptions getCoreMlMo
     RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
     builder.query(VERSION, versionDate);
-    return createServiceCall(builder.build(), ResponseConverterUtils.getInputStream());
+    return createServiceCall(builder.build(), ResponseConverterUtils.getObject(InputStream.class));
   }
 
   /**

visual-recognition/src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/model/ClassifyOptions.java

@@ -67,8 +67,6 @@ public interface AcceptLanguage {
   private List<String> owners;
   private List<String> classifierIds;
   private String imagesFileContentType;
-  @Deprecated
-  private String parameters;
 
   /**
    * Builder.
@@ -82,8 +80,6 @@ public static class Builder {
     private List<String> owners;
     private List<String> classifierIds;
     private String imagesFileContentType;
-    @Deprecated
-    private String parameters;
 
     private Builder(ClassifyOptions classifyOptions) {
       imagesFile = classifyOptions.imagesFile;
@@ -94,7 +90,6 @@ private Builder(ClassifyOptions classifyOptions) {
       owners = classifyOptions.owners;
       classifierIds = classifyOptions.classifierIds;
       imagesFileContentType = classifyOptions.imagesFileContentType;
-      parameters = classifyOptions.parameters;
     }
 
     /**
@@ -245,18 +240,6 @@ public Builder imagesFile(File imagesFile) throws FileNotFoundException {
       this.imagesFilename = imagesFile.getName();
       return this;
     }
-
-    /**
-     * Set the parameters.
-     *
-     * @param parameters the parameters
-     * @return the ClassifyOptions builder
-     * @deprecated replaced by the top-level parameters url, threshold, owners, and classifierIds
-     */
-    public Builder parameters(String parameters) {
-      this.parameters = parameters;
-      return this;
-    }
   }
 
   private ClassifyOptions(Builder builder) {
@@ -268,7 +251,6 @@ private ClassifyOptions(Builder builder) {
     owners = builder.owners;
     classifierIds = builder.classifierIds;
     imagesFileContentType = builder.imagesFileContentType;
-    parameters = builder.parameters;
   }
 
   /**
@@ -391,14 +373,4 @@ public List<String> classifierIds() {
   public String imagesFileContentType() {
     return imagesFileContentType;
   }
-
-  /**
-   * Gets the parameters.
-   *
-   * @return the parameters
-   * @deprecated replaced by the top-level parameters url, threshold, owners, and classifierIds
-   */
-  public String parameters() {
-    return parameters;
-  }
 }