Merge pull request #912 from watson-developer-cloud/visual-recognition-update

Update Visual Recognition service

Author: lpatino10

config.properties.enc

@@ -164,13 +164,14 @@ public ServiceCall<ClassifiedImages> classify() {
   /**
    * Detect faces in images.
    *
-   * **Important:** On April 2, 2018, the identity information in the response to calls to the Face model will be
-   * removed. The identity information refers to the `name` of the person, `score`, and `type_hierarchy` knowledge
-   * graph. For details about the enhanced Face model, see the [Release
-   * notes](https://console.bluemix.net/docs/services/visual-recognition/release-notes.html#23february2018). Analyze and
-   * get data about faces in images. Responses can include estimated age and gender, and the service can identify
-   * celebrities. This feature uses a built-in classifier, so you do not train it on custom classifiers. The Detect
-   * faces method does not support general biometric facial recognition.
+   * **Important:** On April 2, 2018, the identity information in the response to calls to the Face model was removed.
+   * The identity information refers to the `name` of the person, `score`, and `type_hierarchy` knowledge graph. For
+   * details about the enhanced Face model, see the [Release
+   * notes](https://console.bluemix.net/docs/services/visual-recognition/release-notes.html#2april2018). Analyze and get
+   * data about faces in images. Responses can include estimated age and gender. This feature uses a built-in model, so
+   * no training is necessary. The Detect faces method does not support general biometric facial recognition. Supported
+   * image formats include .gif, .jpg, .png, and .tif. The maximum image size is 10 MB. The minimum recommended pixel
+   * density is 32X32 pixels per inch.
    *
    * @param detectFacesOptions the {@link DetectFacesOptions} containing the options for the call
    * @return a {@link ServiceCall} with a response type of {@link DetectedFaces}
@@ -201,23 +202,6 @@ public ServiceCall<DetectedFaces> detectFaces(DetectFacesOptions detectFacesOpti
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(DetectedFaces.class));
   }
 
-  /**
-   * Detect faces in images.
-   *
-   * **Important:** On April 2, 2018, the identity information in the response to calls to the Face model will be
-   * removed. The identity information refers to the `name` of the person, `score`, and `type_hierarchy` knowledge
-   * graph. For details about the enhanced Face model, see the [Release
-   * notes](https://console.bluemix.net/docs/services/visual-recognition/release-notes.html#23february2018). Analyze and
-   * get data about faces in images. Responses can include estimated age and gender, and the service can identify
-   * celebrities. This feature uses a built-in classifier, so you do not train it on custom classifiers. The Detect
-   * faces method does not support general biometric facial recognition.
-   *
-   * @return a {@link ServiceCall} with a response type of {@link DetectedFaces}
-   */
-  public ServiceCall<DetectedFaces> detectFaces() {
-    return detectFaces(null);
-  }
-
   /**
    * Create a classifier.
    *

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

@@ -52,7 +52,7 @@ public Float getScore() {
   /**
    * Gets the typeHierarchy.
    *
-   * Knowledge graph of the property. For example, `People/Leaders/Presidents/USA/Barack Obama`. Included only if
+   * Knowledge graph of the property. For example, `/fruit/pome/apple/eating apple/Granny Smith`. Included only if
    * identified.
    *
    * @return the typeHierarchy

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

@@ -353,11 +353,11 @@ public List<String> owners() {
   /**
    * Gets the classifierIds.
    *
-   * Which classifiers to apply. Overrides the **owners** parameter. You can specify both custom and built-in
-   * classifiers. The built-in `default` classifier is used if both **classifier_ids** and **owners** parameters are
-   * empty. The following built-in classifier IDs require no training: - `default`: Returns classes from thousands of
-   * general tags. - `food`: (Beta) Enhances specificity and accuracy for images of food items. - `explicit`: (Beta)
-   * Evaluates whether the image might be pornographic.
+   * Which classifiers to apply. Overrides the **owners** parameter. You can specify both custom and built-in classifier
+   * IDs. The built-in `default` classifier is used if both **classifier_ids** and **owners** parameters are empty. The
+   * following built-in classifier IDs require no training: - `default`: Returns classes from thousands of general tags.
+   * - `food`: (Beta) Enhances specificity and accuracy for images of food items. - `explicit`: (Beta) Evaluates whether
+   * the image might be pornographic.
    *
    * @return the classifierIds
    */

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

@@ -156,9 +156,10 @@ public Builder newBuilder() {
   /**
    * Gets the imagesFile.
    *
-   * An image file (.jpg, .png) or .zip file with images. Include no more than 15 images. All faces are detected, but if
-   * there are more than 10 faces in an image, age and gender confidence scores might return scores of 0. You can also
-   * include an image with the **url** parameter.
+   * An image file (gif, .jpg, .png, .tif.) or .zip file with images. Limit the .zip file to 100 MB. You can include a
+   * maximum of 15 images in a request. Encode the image and .zip file names in UTF-8 if they contain non-ASCII
+   * characters. The service assumes UTF-8 encoding if it encounters non-ASCII characters. You can also include an
+   * image with the **url** parameter.
    *
    * @return the imagesFile
    */
@@ -180,9 +181,9 @@ public String imagesFilename() {
   /**
    * Gets the url.
    *
-   * The URL of an image to analyze. Must be in .jpg, or .png format. The minimum recommended pixel density is 32X32
-   * pixels per inch, and the maximum image size is 2 MB. You can also include images with the **images_file**
-   * parameter.
+   * The URL of an image to analyze. Must be in .gif, .jpg, .png, or .tif format. The minimum recommended pixel density
+   * is 32X32 pixels per inch, and the maximum image size is 10 MB. Redirects are followed, so you can use a shortened
+   * URL. You can also include images with the **images_file** parameter.
    *
    * @return the url
    */

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

@@ -24,7 +24,6 @@ public class Face extends GenericModel {
   private FaceGender gender;
   @SerializedName("face_location")
   private FaceLocation faceLocation;
-  private FaceIdentity identity;
 
   /**
    * Gets the age.
@@ -52,13 +51,4 @@ public FaceGender getGender() {
   public FaceLocation getFaceLocation() {
     return faceLocation;
   }
-
-  /**
-   * Gets the identity.
-   *
-   * @return the identity
-   */
-  public FaceIdentity getIdentity() {
-    return identity;
-  }
 }

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

@@ -15,8 +15,7 @@
 import com.ibm.watson.developer_cloud.service.model.GenericModel;
 
 /**
- * Provides age information about a face. If there are more than 10 faces in an image, the response might return the
- * confidence score `0`.
+ * Provides age information about a face.
  */
 public class FaceAge extends GenericModel {
 
@@ -49,8 +48,8 @@ public Long getMax() {
   /**
    * Gets the score.
    *
-   * Confidence score for the property in the range of 0 to 1. A higher score indicates greater likelihood that the
-   * class is depicted in the image. The default threshold for returning scores from a classifier is 0.5.
+   * Confidence score in the range of 0 to 1. A higher score indicates greater confidence in the estimated value for the
+   * property.
    *
    * @return the score
    */