docs: Update examples to use new library

lpatino10 · lpatino10 · commit fe989209bcde · 2019-08-28T16:26:32.000-04:00
diff --git a/examples/build.gradle b/examples/build.gradle
@@ -33,5 +33,5 @@ checkstyle {
 }
 
 dependencies {
-    compile 'com.ibm.watson:ibm-watson:7.0.0'
+    compile 'com.ibm.watson:ibm-watson:8.0.0-rc1'
 }
diff --git a/examples/src/main/java/com/ibm/watson/assistant/v1/AssistantExample.java b/examples/src/main/java/com/ibm/watson/assistant/v1/AssistantExample.java
@@ -12,6 +12,8 @@
  */
 package com.ibm.watson.assistant.v1;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.assistant.v1.model.InputData;
 import com.ibm.watson.assistant.v1.model.MessageOptions;
 import com.ibm.watson.assistant.v1.model.MessageResponse;
@@ -32,13 +34,11 @@
 public class AssistantExample {
 
   public static void main(String[] args) throws Exception {
-    Assistant service = new Assistant("2018-02-16");
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    Assistant service = new Assistant("2018-02-16", authenticator);
 
-    InputData input = new InputData.Builder("Hi").build();
+    MessageInput input = new MessageInput();
+    input.setText("Hi");
     MessageOptions options = new MessageOptions.Builder("<workspaceId>")
         .input(input)
         .build();
@@ -69,6 +69,8 @@ public void accept(Response<MessageResponse> response) throws Exception {
             System.out.println(response.getResult());
           }
         });
+
+    Thread.sleep(5000);
   }
 
 }
diff --git a/examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/AssistantToneAnalyzerIntegrationExample.java b/examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/AssistantToneAnalyzerIntegrationExample.java
@@ -25,7 +25,6 @@
 import com.ibm.watson.tone_analyzer.v3.model.ToneOptions;
 import com.ibm.cloud.sdk.core.http.Response;
 import com.ibm.cloud.sdk.core.http.ServiceCallback;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 
 
 /**
@@ -36,18 +35,12 @@ public class AssistantToneAnalyzerIntegrationExample {
   public static void main(String[] args) throws Exception {
 
     // instantiate the assistant service
-    Assistant assistantService = new Assistant("2018-02-16");
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    assistantService.setIamCredentials(options);
+    Authenticator assistantAuthenticator = new IamAuthenticator("<iam_api_key>");
+    Assistant assistantService = new Assistant("2018-02-16", assistantAuthenticator);
 
     // instantiate the tone analyzer service
-    ToneAnalyzer toneService = new ToneAnalyzer("2017-09-21");
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    toneService.setIamCredentials(options);
+    Authenticator toneAuthenticator = new IamAuthenticator("<iam_api_key>");
+    ToneAnalyzer toneService = new ToneAnalyzer("2017-09-21", toneAuthenticator);
 
     // workspace id
     String workspaceId = "<workspace-id>";
@@ -58,12 +51,12 @@ public static void main(String[] args) throws Exception {
     boolean maintainHistory = false;
 
     /**
-     * Input for the Assistant service: input (String): an input string (the user's conversation turn) and context
-     * (Map<String,Object>: any context that needs to be maintained - either added by the client app or passed in the
+     * Input for the Assistant service: text (String): an input string (the user's conversation turn) and context
+     * (Context): any context that needs to be maintained - either added by the client app or passed in the
      * response from the Assistant service on the previous conversation turn.
      */
-    String input = "I am happy";
-    Map<String, Object> context = new HashMap<>();
+    String text = "I am happy";
+    Context context = null;
 
     // UPDATE CONTEXT HERE IF CONTINUING AN ONGOING CONVERSATION
     // set local context variable to the context from the last response from the
@@ -82,10 +75,14 @@ public void onResponse(Response<ToneAnalysis> toneResponsePayload) {
         // update context with the tone data returned by the Tone Analyzer
         context = ToneDetection.updateUserTone(context, toneResponsePayload.getResult(), maintainHistory);
 
+        // create input for message
+        MessageInput input = new MessageInput();
+        input.setText(text);
+
         // call Assistant Service with the input and tone-aware context
         MessageOptions messageOptions = new MessageOptions.Builder(workspaceId)
-            .input(new InputData.Builder(input).build())
-            .context((Context) context)
+            .input(input)
+            .context(context)
             .build();
         assistantService.message(messageOptions).enqueue(new ServiceCallback<MessageResponse>() {
           @Override
diff --git a/examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/ToneDetection.java b/examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/ToneDetection.java
@@ -62,15 +62,15 @@ private ToneDetection() { }
    * @returns assistantPayload where the user object has been updated with tone information from the
    *          toneAnalyzerPayload
    */
-  public static Map<String, Object> updateUserTone(Map<String, Object> context, ToneAnalysis toneAnalyzerPayload,
+  public static Map<String, Object> updateUserTone(Context context, ToneAnalysis toneAnalyzerPayload,
       boolean maintainHistory) {
 
     List<ToneScore> emotionTone = new ArrayList<ToneScore>();
     List<ToneScore> languageTone = new ArrayList<ToneScore>();
     List<ToneScore> socialTone = new ArrayList<ToneScore>();
 
     // If the context doesn't already contain the user object, initialize it
-    if (!context.containsKey("user")) {
+    if (context.containsKey("user") != null) {
       context.put("user", initUser());
     }
 
diff --git a/examples/src/main/java/com/ibm/watson/discovery/v1/DiscoveryQueryExample.java b/examples/src/main/java/com/ibm/watson/discovery/v1/DiscoveryQueryExample.java
@@ -34,7 +34,8 @@
 import com.ibm.watson.discovery.v1.model.QueryOptions;
 import com.ibm.watson.discovery.v1.model.QueryResponse;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 
 /**
  * End-to-end example for querying Discovery.
@@ -43,11 +44,8 @@ public class DiscoveryQueryExample {
   private static final String DEFAULT_CONFIG_NAME = "Default Configuration";
 
   public static void main(String[] args) {
-    Discovery discovery = new Discovery("2017-11-07");
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    Discovery discovery = new Discovery("2017-11-07", authenticator);
 
     String environmentId = null;
     String configurationId = null;
diff --git a/examples/src/main/java/com/ibm/watson/language_translator/v2/LanguageTranslatorExample.java b/examples/src/main/java/com/ibm/watson/language_translator/v2/LanguageTranslatorExample.java
@@ -12,22 +12,20 @@
  */
 package com.ibm.watson.language_translator.v2;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.language_translator.v2.model.TranslateOptions;
 import com.ibm.watson.language_translator.v2.model.TranslationResult;
 import com.ibm.watson.language_translator.v2.util.Language;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 
 /**
  * Example of how to translate a sentence from English to Spanish.
  */
 public class LanguageTranslatorExample {
 
   public static void main(String[] args) {
-    LanguageTranslator service = new LanguageTranslator();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    LanguageTranslator service = new LanguageTranslator(authenticator);
 
     TranslateOptions translateOptions = new TranslateOptions.Builder()
         .addText("hello")
diff --git a/examples/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierExample.java b/examples/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierExample.java
@@ -12,18 +12,16 @@
  */
 package com.ibm.watson.natural_language_classifier.v1;
 
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.natural_language_classifier.v1.model.ClassifyOptions;
 import com.ibm.watson.natural_language_classifier.v1.model.Classification;
 
 public class NaturalLanguageClassifierExample {
 
   public static void main(String[] args) {
-    NaturalLanguageClassifier service = new NaturalLanguageClassifier();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    NaturalLanguageClassifier service = new NaturalLanguageClassifier(authenticator);
 
     ClassifyOptions classifyOptions = new ClassifyOptions.Builder()
         .classifierId("<classifierId>")
diff --git a/examples/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsExample.java b/examples/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsExample.java
@@ -12,18 +12,16 @@
  */
 package com.ibm.watson.personality_insights.v3;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.personality_insights.v3.model.Profile;
 import com.ibm.watson.personality_insights.v3.model.ProfileOptions;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 
 public class PersonalityInsightsExample {
 
   public static void main(String[] args) {
-    PersonalityInsights service = new PersonalityInsights("2016-10-19");
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    PersonalityInsights service = new PersonalityInsights("2016-10-19", authenticator);
 
     String text = "Call me Ishmael. Some years ago-never mind how long "
         + "precisely-having little or no money in my purse, and nothing "
diff --git a/examples/src/main/java/com/ibm/watson/speech_to_text/v1/CustomizationExample.java b/examples/src/main/java/com/ibm/watson/speech_to_text/v1/CustomizationExample.java
@@ -13,7 +13,6 @@
 package com.ibm.watson.speech_to_text.v1;
 
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.watson.speech_to_text.v1.model.AddCorpusOptions;
 import com.ibm.watson.speech_to_text.v1.model.AddWordOptions;
 import com.ibm.watson.speech_to_text.v1.model.Corpora;
@@ -29,6 +28,8 @@
 import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
 import com.ibm.watson.speech_to_text.v1.model.TrainLanguageModelOptions;
 import com.ibm.watson.speech_to_text.v1.model.Words;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -48,11 +49,8 @@ public class CustomizationExample {
    * @throws InterruptedException the interrupted exception
    */
   public static void main(String[] args) throws InterruptedException, FileNotFoundException {
-    SpeechToText service = new SpeechToText();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    SpeechToText service = new SpeechToText(authenticator);
 
     // Create language model
     CreateLanguageModelOptions createOptions = new CreateLanguageModelOptions.Builder()
@@ -69,19 +67,19 @@ public static void main(String[] args) throws InterruptedException, FileNotFound
           .customizationId(id)
           .corpusName("corpus-1")
           .corpusFile(new File(CORPUS_FILE))
-          .corpusFileContentType(HttpMediaType.TEXT_PLAIN)
           .allowOverwrite(false)
           .build();
-      service.addCorpus(addOptions).execute();
+      service.addCorpus(addOptions).execute().getResult();
 
       // Get corpus status
       GetCorpusOptions getOptions = new GetCorpusOptions.Builder()
           .customizationId(id)
           .corpusName("corpus-1")
           .build();
       for (
-          int x = 0; x < 30
-          && (service.getCorpus(getOptions).execute().getResult()).getStatus() != Corpus.Status.ANALYZED; x++
+          int x = 0;
+          x < 30 && !service.getCorpus(getOptions).execute().getResult().getStatus().equals(Corpus.Status.ANALYZED);
+          x++
       ) {
         Thread.sleep(5000);
       }
@@ -142,7 +140,7 @@ public static void main(String[] args) throws InterruptedException, FileNotFound
           .build();
       service.trainLanguageModel(trainOptions).execute();
 
-      for (int x = 0; x < 30 && myModel.getStatus() != LanguageModel.Status.AVAILABLE; x++) {
+      for (int x = 0; x < 30 && !myModel.getStatus().equals(LanguageModel.Status.AVAILABLE); x++) {
         GetLanguageModelOptions getLanguageModelOptions = new GetLanguageModelOptions.Builder()
             .customizationId(id)
             .build();
diff --git a/examples/src/main/java/com/ibm/watson/speech_to_text/v1/MicrophoneWithWebSocketsExample.java b/examples/src/main/java/com/ibm/watson/speech_to_text/v1/MicrophoneWithWebSocketsExample.java
@@ -18,8 +18,9 @@
 import javax.sound.sampled.DataLine;
 import javax.sound.sampled.TargetDataLine;
 
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
 import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
 import com.ibm.watson.speech_to_text.v1.websocket.BaseRecognizeCallback;
@@ -36,11 +37,8 @@ public class MicrophoneWithWebSocketsExample {
    * @throws Exception the exception
    */
   public static void main(final String[] args) throws Exception {
-    SpeechToText service = new SpeechToText();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    SpeechToText service = new SpeechToText(authenticator);
 
     // Signed PCM AudioFormat with 16kHz, 16 bit sample size, mono
     int sampleRate = 16000;
diff --git a/examples/src/main/java/com/ibm/watson/speech_to_text/v1/RecognizeUsingWebSocketsExample.java b/examples/src/main/java/com/ibm/watson/speech_to_text/v1/RecognizeUsingWebSocketsExample.java
@@ -18,7 +18,8 @@
 import java.util.concurrent.TimeUnit;
 
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
 import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
 import com.ibm.watson.speech_to_text.v1.websocket.BaseRecognizeCallback;
@@ -30,11 +31,8 @@ public class RecognizeUsingWebSocketsExample {
   private static CountDownLatch lock = new CountDownLatch(1);
 
   public static void main(String[] args) throws FileNotFoundException, InterruptedException {
-    SpeechToText service = new SpeechToText();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    SpeechToText service = new SpeechToText(authenticator);
 
     FileInputStream audio = new FileInputStream("src/test/resources/speech_to_text/sample1.wav");
 
diff --git a/examples/src/main/java/com/ibm/watson/speech_to_text/v1/RecognizeUsingWebSocketsWithSpeakerLabelsExample.java b/examples/src/main/java/com/ibm/watson/speech_to_text/v1/RecognizeUsingWebSocketsWithSpeakerLabelsExample.java
@@ -14,7 +14,8 @@
 
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import com.ibm.cloud.sdk.core.http.HttpMediaType;
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
 import com.ibm.watson.speech_to_text.v1.model.SpeakerLabelsResult;
 import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionAlternative;
@@ -230,11 +231,8 @@ private void cleanFinal() {
   public static void main(String[] args) throws FileNotFoundException, InterruptedException {
     FileInputStream audio = new FileInputStream("src/test/resources/speech_to_text/twospeakers.wav");
 
-    SpeechToText service = new SpeechToText();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    SpeechToText service = new SpeechToText(authenticator);
 
     RecognizeOptions options = new RecognizeOptions.Builder()
         .audio(audio)
diff --git a/examples/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToTextExample.java b/examples/src/main/java/com/ibm/watson/speech_to_text/v1/SpeechToTextExample.java
@@ -15,7 +15,8 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 
-import com.ibm.cloud.sdk.core.service.security.IamOptions;
+import com.ibm.cloud.sdk.core.security.Authenticator;
+import com.ibm.cloud.sdk.core.security.IamAuthenticator;
 import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
 import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
 
@@ -26,11 +27,8 @@
 public class SpeechToTextExample {
 
   public static void main(String[] args) throws FileNotFoundException {
-    SpeechToText service = new SpeechToText();
-    IamOptions options = new IamOptions.Builder()
-        .apiKey("<iam_api_key>")
-        .build();
-    service.setIamCredentials(options);
+    Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
+    SpeechToText service = new SpeechToText(authenticator);
 
     File audio = new File("src/test/resources/speech_to_text/sample1.wav");
     RecognizeOptions options = new RecognizeOptions.Builder()
diff --git a/examples/src/main/java/com/ibm/watson/text_to_speech/v1/CustomizationExample.java b/examples/src/main/java/com/ibm/watson/text_to_speech/v1/CustomizationExample.java
diff --git a/examples/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeechExample.java b/examples/src/main/java/com/ibm/watson/text_to_speech/v1/TextToSpeechExample.java
diff --git a/examples/src/main/java/com/ibm/watson/text_to_speech/v1/TranslateAndSynthesizeExample.java b/examples/src/main/java/com/ibm/watson/text_to_speech/v1/TranslateAndSynthesizeExample.java
diff --git a/examples/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerChatExample.java b/examples/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerChatExample.java
diff --git a/examples/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerExample.java b/examples/src/main/java/com/ibm/watson/tone_analyzer/v3/ToneAnalyzerExample.java
diff --git a/examples/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionExample.java b/examples/src/main/java/com/ibm/watson/visual_recognition/v3/VisualRecognitionExample.java

Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,5 @@ checkstyle {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`dependencies {`
`36`		`- compile 'com.ibm.watson:ibm-watson:7.0.0'`
	`36`	`+ compile 'com.ibm.watson:ibm-watson:8.0.0-rc1'`
`37`	`37`	`}`