Sample updated

Author: wiazur

java/Language/TextAnalytics/src/main/java/com/microsoft/azure/textanalytics/samples/TextAnalytics.java

@@ -1,10 +1,5 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
- */
-
-package com.microsoft.azure.textanalytics.samples;
+// Copyright (c) Microsoft Corporation. All rights reserved. MIT License. 
+// See License.txt in the project root for license information.
 
 import java.io.*;
 import java.net.*;
@@ -13,63 +8,34 @@
 
 import com.google.gson.Gson;
 
-public class TextAnalytics {
-    /**
-     * The API Subscription Key that was generated when you created a cognitive
-     * services resource in Azure. Make sure to change this.
-     */
-    private static final String subscriptionKey = "enter-your-key-here";
-    /**
-     * The host of the cognitive services service. We will then append the Text
-     * Analytics service path to this to generate the URI against which we will make
-     * requests. Please make sure to enter the region to match the Azure region in
-     * which your cognitive services resource was deployed to.
-     */
-    private static final String host = "https://<region>.api.cognitive.microsoft.com";
-
-    public static void addAuthenticationHeader(HttpsURLConnection connection) {
-        connection.setRequestProperty("Ocp-Apim-Subscription-Key", subscriptionKey);
-    }
-
-    public static String callTextAnalyticsService(URL serviceUrl, String text) {
-        try {
-            byte[] encoded_input;
-            encoded_input = text.getBytes("UTF-8");
-
-            HttpsURLConnection connection = (HttpsURLConnection) serviceUrl.openConnection();
-            connection.setRequestMethod("POST");
-            connection.setRequestProperty("Content-Type", "application/json");
-            addAuthenticationHeader(connection);
-            connection.setDoOutput(true);
-
-            DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
-            wr.write(encoded_input, 0, encoded_input.length);
-            wr.flush();
-            wr.close();
-
-            StringBuilder response = new StringBuilder();
-            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String line;
-            while ((line = in.readLine()) != null) {
-                response.append(line);
-            }
-            in.close();
+/**
+ * This sample uses the Text Analytics API to analyze text for: sentiment,
+ * language detection, entity recognition, and key phrase extraction.
+ * 
+ * Use this library: https://github.com/google/gson
+ * If running from the command line, add the gson jar to a lib folder.
+ * 
+ * Add your subscription key and endpoint to your environment variables.
+ *
+ * Download the project and run in an IDE, or build/run this file from the command line: 
+ *  javac TextAnalytics.java -encoding utf-8 -cp .;lib\*
+ *  java -cp .;lib\* TextAnalytics
+ */
 
-            return response.toString();
-        } catch (Exception e) {
-            return e.getMessage();
-        }
-    }
+public class TextAnalytics {
+    // The API subscription key and endpoint generated when you created an Azure Cognitive Services resource.
+    static String subscriptionKey = System.getenv("TEXT_ANALYTICS_SUBSCRIPTION_KEY");
+    static String endpoint = System.getenv("TEXT_ANALYTICS_ENDPOINT");
 
     public static void main(String[] args) {
-        /*
+        /**
          * For sentiment, keyphrase, and entity recognition your input documents must
          * specify language so that the proper model is used. If a language isn't
          * specified, we assume english is the document language. For language
          * detection, you need not specify a language.
          */
 
-        /* Sentiment Analysis */
+        // Sentiment Analysis
         Documents multiLanguageSentimentDocuments = new Documents();
         multiLanguageSentimentDocuments.add("1", "I had the best day of my life.", "en");
         multiLanguageSentimentDocuments.add("2", "This was a waste of my time. The speaker put me to sleep.", "en");
@@ -79,25 +45,25 @@ public static void main(String[] args) {
 
         String multiLanguageSentimentText = new Gson().toJson(multiLanguageSentimentDocuments);
 
-        String sentimentResult = SentimentAnalysis.AnalyzeSentiment(host, subscriptionKey, multiLanguageSentimentText);
+        String sentimentResult = SentimentAnalysis.AnalyzeSentiment(endpoint, subscriptionKey, multiLanguageSentimentText);
         System.out.println("SENTIMENT RESPONSE:");
         System.out.println(sentimentResult);
         System.out.println();
 
-        /* For language detection your input documents don't have to specify language */
+        // For language detection your input documents don't have to specify language
         Documents languageDetectionDocuments = new Documents();
         languageDetectionDocuments.add("1", "This is a document written in English.");
         languageDetectionDocuments.add("2", "Este es un document escrito en Español.");
         languageDetectionDocuments.add("3", "这是一个用中文写的文件");
 
         String languageDetectionText = new Gson().toJson(languageDetectionDocuments);
 
-        String languageResult = LanguageDetection.DetectLanguage(host, subscriptionKey, languageDetectionText);
+        String languageResult = LanguageDetection.DetectLanguage(endpoint, subscriptionKey, languageDetectionText);
         System.out.println("LANGUAGE RESPONSE:");
         System.out.println(languageResult);
         System.out.println();
 
-        /* Entity Recognition */
+        // Entity Recognition 
         Documents multiLanguageNerDocuments = new Documents();
         multiLanguageNerDocuments.add("1",
                 "Microsoft was founded by Bill Gates and Paul Allen on April 4, 1975, to develop and sell BASIC interpreters for the Altair 8800.",
@@ -107,12 +73,12 @@ public static void main(String[] args) {
                 "es");
 
         String multiLanguageNerText = new Gson().toJson(multiLanguageNerDocuments);
-        String entityRecognitionResult = EntityRecognition.DetectEntities(host, subscriptionKey, multiLanguageNerText);
+        String entityRecognitionResult = EntityRecognition.DetectEntities(endpoint, subscriptionKey, multiLanguageNerText);
         System.out.println("ENTITY RECOGNITION RESPONSE:");
         System.out.println(entityRecognitionResult);
         System.out.println();
 
-        /* KeyPhrase Extraction */
+        // KeyPhrase Extraction 
         Documents multiLanguageKpeDocuments = new Documents();
         multiLanguageKpeDocuments.add("1", "猫は幸せ", "ja");
         multiLanguageKpeDocuments.add("2", "Fahrt nach Stuttgart und dann zum Hotel zu Fu.", "de");
@@ -121,12 +87,46 @@ public static void main(String[] args) {
 
         String multiLanguageKpeText = new Gson().toJson(multiLanguageKpeDocuments);
 
-        String keyPhraseExtractionResult = KeyPhraseExtraction.DetectKeyPhrases(host, subscriptionKey,
+        String keyPhraseExtractionResult = KeyPhraseExtraction.DetectKeyPhrases(endpoint, subscriptionKey,
                 multiLanguageKpeText);
         System.out.println("KEY PHRASE RESPONSE:");
         System.out.println(keyPhraseExtractionResult);
         System.out.println();
     }
+
+    public static void addAuthenticationHeader(HttpsURLConnection connection) {
+        connection.setRequestProperty("Ocp-Apim-Subscription-Key", subscriptionKey);
+    }
+
+    public static String callTextAnalyticsService(URL serviceUrl, String text) {
+        try {
+            byte[] encoded_input;
+            encoded_input = text.getBytes("UTF-8");
+
+            HttpsURLConnection connection = (HttpsURLConnection) serviceUrl.openConnection();
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Content-Type", "application/json");
+            addAuthenticationHeader(connection);
+            connection.setDoOutput(true);
+
+            DataOutputStream wr = new DataOutputStream(connection.getOutputStream());
+            wr.write(encoded_input, 0, encoded_input.length);
+            wr.flush();
+            wr.close();
+
+            StringBuilder response = new StringBuilder();
+            BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String line;
+            while ((line = in.readLine()) != null) {
+                response.append(line);
+            }
+            in.close();
+
+            return response.toString();
+        } catch (Exception e) {
+            return e.getMessage();
+        }
+    }
 }
 
 class Document {
@@ -161,11 +161,11 @@ public void add(String id, String text, String language) {
 }
 
 class LanguageDetection {
-    public static String DetectLanguage(String host, String subscriptionKey, String text) {
+    public static String DetectLanguage(String endpoint, String subscriptionKey, String text) {
         String path = "/text/analytics/v2.1/languages";
 
         try {
-            URL serviceUrl = new URL(host + path);
+            URL serviceUrl = new URL(endpoint + path);
             String response = TextAnalytics.callTextAnalyticsService(serviceUrl, text);
             return response;
         } catch (Exception e) {
@@ -175,11 +175,11 @@ public static String DetectLanguage(String host, String subscriptionKey, String
 }
 
 class SentimentAnalysis {
-    public static String AnalyzeSentiment(String host, String subscriptionKey, String text) {
+    public static String AnalyzeSentiment(String endpoint, String subscriptionKey, String text) {
         String path = "/text/analytics/v2.1/sentiment";
 
         try {
-            URL serviceUrl = new URL(host + path);
+            URL serviceUrl = new URL(endpoint + path);
             String response = TextAnalytics.callTextAnalyticsService(serviceUrl, text);
             return response;
         } catch (Exception e) {
@@ -189,11 +189,11 @@ public static String AnalyzeSentiment(String host, String subscriptionKey, Strin
 }
 
 class KeyPhraseExtraction {
-    public static String DetectKeyPhrases(String host, String subscriptionKey, String text) {
+    public static String DetectKeyPhrases(String endpoint, String subscriptionKey, String text) {
         String path = "/text/analytics/v2.1/keyPhrases";
 
         try {
-            URL serviceUrl = new URL(host + path);
+            URL serviceUrl = new URL(endpoint + path);
             String response = TextAnalytics.callTextAnalyticsService(serviceUrl, text);
             return response;
         } catch (Exception e) {
@@ -203,11 +203,11 @@ public static String DetectKeyPhrases(String host, String subscriptionKey, Strin
 }
 
 class EntityRecognition {
-    public static String DetectEntities(String host, String subscriptionKey, String text) {
+    public static String DetectEntities(String endpoint, String subscriptionKey, String text) {
         String path = "/text/analytics/v2.1/entities";
 
         try {
-            URL serviceUrl = new URL(host + path);
+            URL serviceUrl = new URL(endpoint + path);
             String response = TextAnalytics.callTextAnalyticsService(serviceUrl, text);
             return response;
         } catch (Exception e) {