Updated libraries

Author: wiazur

java/Vision/ComputerVision1.0.java java/Vision/ComputerVision2.1.javajava/Vision/ComputerVision1.0.java renamed to java/Vision/ComputerVision2.1.java

@@ -1,8 +1,5 @@
-//Copyright (c) Microsoft Corporation. All rights reserved.
-//Licensed under the MIT License.
-
-// This sample uses the Apache HTTP client library(org.apache.httpcomponents:httpclient:4.2.4)
-// and the org.json library (org.json:json:20170516). You can download these from Maven repo into lib directory of your project.
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 
 import java.net.URI;
 import org.apache.http.HttpEntity;
@@ -15,33 +12,36 @@
 import org.apache.http.util.EntityUtils;
 import org.json.JSONObject;
 
+/**
+ * Include these library jars (or newer +), add to a lib folder:
+ *   commons-logging-4.0.6+ 
+ *   httpclient-4.5.3+ 
+ *   httpcore-4.4.13+ 
+ *   json-20190722+
+ *
+ * To compile and run from command line: 
+ *   javac Main.java -cp .;lib\*
+ *   java -cp .;lib\* Main
+ */
+
 public class Main
 {
-    // **********************************************
-    // *** Update or verify the following values. ***
-    // **********************************************
+  // Add your Computer Vision subscription key and endpoint to your environment variables.
+    private static String subscriptionKey = System.getenv("COMPUTER_VISION_SUBSCRIPTION_KEY");
+    private static String baseUrl = System.getenv("COMPUTER_VISION_ENDPOINT");
 
-    // Replace the subscriptionKey string value with your valid subscription key.
-    public static final String subscriptionKey = "Enter key here";
-
-    // Replace or verify the region.
-    //
-    // You must use the same region in your REST API call as you used to obtain your subscription keys.
-    // For example, if you obtained your subscription keys from the westus region, replace
-    // "westcentralus" in the URI below with "westus".
-    //
-    // NOTE: Free trial subscription keys are generated in the westcentralus region, so if you are using
-    // a free trial subscription key, you should not need to change this region.
-    public static final String uriBase = "https://westcentralus.api.cognitive.microsoft.com/vision/v1.0/analyze";
+    private static final String endpoint = baseUrl + "/vision/v2.1/analyze";
 
+    // Image of an entity (well-known place)
+    private static String image = "https://raw.githubusercontent.com/Azure-Samples/cognitive-services-sample-data-files/master/ComputerVision/Images/landmark.jpg";
 
     public static void main(String[] args)
     {
         HttpClient httpclient = new DefaultHttpClient();
 
         try
         {
-            URIBuilder builder = new URIBuilder(uriBase);
+            URIBuilder builder = new URIBuilder(endpoint);
 
             // Request parameters. All of them are optional.
             builder.setParameter("visualFeatures", "Categories,Description,Color");
@@ -56,7 +56,7 @@ public static void main(String[] args)
             request.setHeader("Ocp-Apim-Subscription-Key", subscriptionKey);
 
             // Request body.
-            StringEntity reqEntity = new StringEntity("{\"url\":\"https://upload.wikimedia.org/wikipedia/commons/1/12/Broadway_and_Times_Square_by_night.jpg\"}");
+            StringEntity reqEntity = new StringEntity("{\"url\": \"" + image + "\"}");
             request.setEntity(reqEntity);
 
             // Execute the REST API call and get the response entity.
@@ -77,5 +77,6 @@ public static void main(String[] args)
             // Display error message.
             System.out.println(e.getMessage());
         }
-    }
+    }  
+
 }