chore(visual-recognition-v3): manual changes

kevinkowa · kevinkowa · commit 18bf2f37c070 · 2020-08-21T13:55:29.000-05:00
diff --git a/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java b/visual-recognition/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognition.java
@@ -47,7 +47,7 @@
  */
 public class VisualRecognition extends BaseService {
 
-  private static final String DEFAULT_SERVICE_NAME = "watson_vision_combined";
+  private static final String DEFAULT_SERVICE_NAME = "visual_recognition";
 
   private static final String DEFAULT_SERVICE_URL =
       "https://api.us-south.visual-recognition.watson.cloud.ibm.com";
@@ -154,14 +154,10 @@ public ServiceCall<ClassifiedImages> classify(ClassifyOptions classifyOptions) {
       multipartBuilder.addFormDataPart("threshold", String.valueOf(classifyOptions.threshold()));
     }
     if (classifyOptions.owners() != null) {
-      for (String item : classifyOptions.owners()) {
-        multipartBuilder.addFormDataPart("owners", item);
-      }
+      multipartBuilder.addFormDataPart("owners", RequestUtils.join(classifyOptions.owners(), ","));
     }
     if (classifyOptions.classifierIds() != null) {
-      for (String item : classifyOptions.classifierIds()) {
-        multipartBuilder.addFormDataPart("classifier_ids", item);
-      }
+      multipartBuilder.addFormDataPart("classifier_ids", RequestUtils.join(classifyOptions.classifierIds(), ","));
     }
     builder.body(multipartBuilder.build());
     ResponseConverter<ClassifiedImages> responseConverter =
@@ -224,16 +220,17 @@ public ServiceCall<Classifier> createClassifier(CreateClassifierOptions createCl
       String partName = String.format("%s_positive_examples", entry.getKey());
       okhttp3.RequestBody part =
           RequestUtils.inputStreamBody(entry.getValue(), "application/octet-stream");
-      multipartBuilder.addFormDataPart(partName, entry.getKey(), part);
+      multipartBuilder.addFormDataPart(partName, entry.getKey() + ".zip", part);
     }
     if (createClassifierOptions.negativeExamples() != null) {
       okhttp3.RequestBody negativeExamplesBody =
           RequestUtils.inputStreamBody(
               createClassifierOptions.negativeExamples(), "application/octet-stream");
-      multipartBuilder.addFormDataPart(
-          "negative_examples",
-          createClassifierOptions.negativeExamplesFilename(),
-          negativeExamplesBody);
+      String negativeExamplesFilename = createClassifierOptions.negativeExamplesFilename();
+      if (!negativeExamplesFilename.contains(".")) {
+        negativeExamplesFilename += ".zip";
+      }
+      multipartBuilder.addFormDataPart("negative_examples", negativeExamplesFilename, negativeExamplesBody);
     }
     builder.body(multipartBuilder.build());
     ResponseConverter<Classifier> responseConverter =
