Skip to content

Commit fe98920

Browse files
lpatino10lpatino10
committed
docs: Update examples to use new library
1 parent fe142ed commit fe98920

19 files changed

Lines changed: 100 additions & 131 deletions

‎examples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ checkstyle {
3333
}
3434

3535
dependencies {
36-
compile 'com.ibm.watson:ibm-watson:7.0.0'
36+
compile 'com.ibm.watson:ibm-watson:8.0.0-rc1'
3737
}

‎examples/src/main/java/com/ibm/watson/assistant/v1/AssistantExample.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*/
1313
package com.ibm.watson.assistant.v1;
1414

15+
import com.ibm.cloud.sdk.core.security.Authenticator;
16+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1517
import com.ibm.watson.assistant.v1.model.InputData;
1618
import com.ibm.watson.assistant.v1.model.MessageOptions;
1719
import com.ibm.watson.assistant.v1.model.MessageResponse;
@@ -32,13 +34,11 @@
3234
public class AssistantExample {
3335

3436
public static void main(String[] args) throws Exception {
35-
Assistant service = new Assistant("2018-02-16");
36-
IamOptions options = new IamOptions.Builder()
37-
.apiKey("<iam_api_key>")
38-
.build();
39-
service.setIamCredentials(options);
37+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
38+
Assistant service = new Assistant("2018-02-16", authenticator);
4039

41-
InputData input = new InputData.Builder("Hi").build();
40+
MessageInput input = new MessageInput();
41+
input.setText("Hi");
4242
MessageOptions options = new MessageOptions.Builder("<workspaceId>")
4343
.input(input)
4444
.build();
@@ -69,6 +69,8 @@ public void accept(Response<MessageResponse> response) throws Exception {
6969
System.out.println(response.getResult());
7070
}
7171
});
72+
73+
Thread.sleep(5000);
7274
}
7375

7476
}

‎examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/AssistantToneAnalyzerIntegrationExample.java‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import com.ibm.watson.tone_analyzer.v3.model.ToneOptions;
2626
import com.ibm.cloud.sdk.core.http.Response;
2727
import com.ibm.cloud.sdk.core.http.ServiceCallback;
28-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
2928

3029

3130
/**
@@ -36,18 +35,12 @@ public class AssistantToneAnalyzerIntegrationExample {
3635
public static void main(String[] args) throws Exception {
3736

3837
// instantiate the assistant service
39-
Assistant assistantService = new Assistant("2018-02-16");
40-
IamOptions options = new IamOptions.Builder()
41-
.apiKey("<iam_api_key>")
42-
.build();
43-
assistantService.setIamCredentials(options);
38+
Authenticator assistantAuthenticator = new IamAuthenticator("<iam_api_key>");
39+
Assistant assistantService = new Assistant("2018-02-16", assistantAuthenticator);
4440

4541
// instantiate the tone analyzer service
46-
ToneAnalyzer toneService = new ToneAnalyzer("2017-09-21");
47-
IamOptions options = new IamOptions.Builder()
48-
.apiKey("<iam_api_key>")
49-
.build();
50-
toneService.setIamCredentials(options);
42+
Authenticator toneAuthenticator = new IamAuthenticator("<iam_api_key>");
43+
ToneAnalyzer toneService = new ToneAnalyzer("2017-09-21", toneAuthenticator);
5144

5245
// workspace id
5346
String workspaceId = "<workspace-id>";
@@ -58,12 +51,12 @@ public static void main(String[] args) throws Exception {
5851
boolean maintainHistory = false;
5952

6053
/**
61-
* Input for the Assistant service: input (String): an input string (the user's conversation turn) and context
62-
* (Map<String,Object>: any context that needs to be maintained - either added by the client app or passed in the
54+
* Input for the Assistant service: text (String): an input string (the user's conversation turn) and context
55+
* (Context): any context that needs to be maintained - either added by the client app or passed in the
6356
* response from the Assistant service on the previous conversation turn.
6457
*/
65-
String input = "I am happy";
66-
Map<String, Object> context = new HashMap<>();
58+
String text = "I am happy";
59+
Context context = null;
6760

6861
// UPDATE CONTEXT HERE IF CONTINUING AN ONGOING CONVERSATION
6962
// set local context variable to the context from the last response from the
@@ -82,10 +75,14 @@ public void onResponse(Response<ToneAnalysis> toneResponsePayload) {
8275
// update context with the tone data returned by the Tone Analyzer
8376
context = ToneDetection.updateUserTone(context, toneResponsePayload.getResult(), maintainHistory);
8477

78+
// create input for message
79+
MessageInput input = new MessageInput();
80+
input.setText(text);
81+
8582
// call Assistant Service with the input and tone-aware context
8683
MessageOptions messageOptions = new MessageOptions.Builder(workspaceId)
87-
.input(new InputData.Builder(input).build())
88-
.context((Context) context)
84+
.input(input)
85+
.context(context)
8986
.build();
9087
assistantService.message(messageOptions).enqueue(new ServiceCallback<MessageResponse>() {
9188
@Override

‎examples/src/main/java/com/ibm/watson/assistant/v1/tone_analyzer_integration/ToneDetection.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ private ToneDetection() { }
6262
* @returns assistantPayload where the user object has been updated with tone information from the
6363
* toneAnalyzerPayload
6464
*/
65-
public static Map<String, Object> updateUserTone(Map<String, Object> context, ToneAnalysis toneAnalyzerPayload,
65+
public static Map<String, Object> updateUserTone(Context context, ToneAnalysis toneAnalyzerPayload,
6666
boolean maintainHistory) {
6767

6868
List<ToneScore> emotionTone = new ArrayList<ToneScore>();
6969
List<ToneScore> languageTone = new ArrayList<ToneScore>();
7070
List<ToneScore> socialTone = new ArrayList<ToneScore>();
7171

7272
// If the context doesn't already contain the user object, initialize it
73-
if (!context.containsKey("user")) {
73+
if (context.containsKey("user") != null) {
7474
context.put("user", initUser());
7575
}
7676

‎examples/src/main/java/com/ibm/watson/discovery/v1/DiscoveryQueryExample.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
import com.ibm.watson.discovery.v1.model.QueryOptions;
3535
import com.ibm.watson.discovery.v1.model.QueryResponse;
3636
import com.ibm.cloud.sdk.core.http.HttpMediaType;
37-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
37+
import com.ibm.cloud.sdk.core.security.Authenticator;
38+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
3839

3940
/**
4041
* End-to-end example for querying Discovery.
@@ -43,11 +44,8 @@ public class DiscoveryQueryExample {
4344
private static final String DEFAULT_CONFIG_NAME = "Default Configuration";
4445

4546
public static void main(String[] args) {
46-
Discovery discovery = new Discovery("2017-11-07");
47-
IamOptions options = new IamOptions.Builder()
48-
.apiKey("<iam_api_key>")
49-
.build();
50-
service.setIamCredentials(options);
47+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
48+
Discovery discovery = new Discovery("2017-11-07", authenticator);
5149

5250
String environmentId = null;
5351
String configurationId = null;

‎examples/src/main/java/com/ibm/watson/language_translator/v2/LanguageTranslatorExample.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,20 @@
1212
*/
1313
package com.ibm.watson.language_translator.v2;
1414

15+
import com.ibm.cloud.sdk.core.security.Authenticator;
16+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1517
import com.ibm.watson.language_translator.v2.model.TranslateOptions;
1618
import com.ibm.watson.language_translator.v2.model.TranslationResult;
1719
import com.ibm.watson.language_translator.v2.util.Language;
18-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
1920

2021
/**
2122
* Example of how to translate a sentence from English to Spanish.
2223
*/
2324
public class LanguageTranslatorExample {
2425

2526
public static void main(String[] args) {
26-
LanguageTranslator service = new LanguageTranslator();
27-
IamOptions options = new IamOptions.Builder()
28-
.apiKey("<iam_api_key>")
29-
.build();
30-
service.setIamCredentials(options);
27+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
28+
LanguageTranslator service = new LanguageTranslator(authenticator);
3129

3230
TranslateOptions translateOptions = new TranslateOptions.Builder()
3331
.addText("hello")

‎examples/src/main/java/com/ibm/watson/natural_language_classifier/v1/NaturalLanguageClassifierExample.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
*/
1313
package com.ibm.watson.natural_language_classifier.v1;
1414

15-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
15+
import com.ibm.cloud.sdk.core.security.Authenticator;
16+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1617
import com.ibm.watson.natural_language_classifier.v1.model.ClassifyOptions;
1718
import com.ibm.watson.natural_language_classifier.v1.model.Classification;
1819

1920
public class NaturalLanguageClassifierExample {
2021

2122
public static void main(String[] args) {
22-
NaturalLanguageClassifier service = new NaturalLanguageClassifier();
23-
IamOptions options = new IamOptions.Builder()
24-
.apiKey("<iam_api_key>")
25-
.build();
26-
service.setIamCredentials(options);
23+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
24+
NaturalLanguageClassifier service = new NaturalLanguageClassifier(authenticator);
2725

2826
ClassifyOptions classifyOptions = new ClassifyOptions.Builder()
2927
.classifierId("<classifierId>")

‎examples/src/main/java/com/ibm/watson/personality_insights/v3/PersonalityInsightsExample.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
*/
1313
package com.ibm.watson.personality_insights.v3;
1414

15+
import com.ibm.cloud.sdk.core.security.Authenticator;
16+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1517
import com.ibm.watson.personality_insights.v3.model.Profile;
1618
import com.ibm.watson.personality_insights.v3.model.ProfileOptions;
17-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
1819

1920
public class PersonalityInsightsExample {
2021

2122
public static void main(String[] args) {
22-
PersonalityInsights service = new PersonalityInsights("2016-10-19");
23-
IamOptions options = new IamOptions.Builder()
24-
.apiKey("<iam_api_key>")
25-
.build();
26-
service.setIamCredentials(options);
23+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
24+
PersonalityInsights service = new PersonalityInsights("2016-10-19", authenticator);
2725

2826
String text = "Call me Ishmael. Some years ago-never mind how long "
2927
+ "precisely-having little or no money in my purse, and nothing "

‎examples/src/main/java/com/ibm/watson/speech_to_text/v1/CustomizationExample.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
package com.ibm.watson.speech_to_text.v1;
1414

1515
import com.ibm.cloud.sdk.core.http.HttpMediaType;
16-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
1716
import com.ibm.watson.speech_to_text.v1.model.AddCorpusOptions;
1817
import com.ibm.watson.speech_to_text.v1.model.AddWordOptions;
1918
import com.ibm.watson.speech_to_text.v1.model.Corpora;
@@ -29,6 +28,8 @@
2928
import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
3029
import com.ibm.watson.speech_to_text.v1.model.TrainLanguageModelOptions;
3130
import com.ibm.watson.speech_to_text.v1.model.Words;
31+
import com.ibm.cloud.sdk.core.security.Authenticator;
32+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
3233

3334
import java.io.File;
3435
import java.io.FileNotFoundException;
@@ -48,11 +49,8 @@ public class CustomizationExample {
4849
* @throws InterruptedException the interrupted exception
4950
*/
5051
public static void main(String[] args) throws InterruptedException, FileNotFoundException {
51-
SpeechToText service = new SpeechToText();
52-
IamOptions options = new IamOptions.Builder()
53-
.apiKey("<iam_api_key>")
54-
.build();
55-
service.setIamCredentials(options);
52+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
53+
SpeechToText service = new SpeechToText(authenticator);
5654

5755
// Create language model
5856
CreateLanguageModelOptions createOptions = new CreateLanguageModelOptions.Builder()
@@ -69,19 +67,19 @@ public static void main(String[] args) throws InterruptedException, FileNotFound
6967
.customizationId(id)
7068
.corpusName("corpus-1")
7169
.corpusFile(new File(CORPUS_FILE))
72-
.corpusFileContentType(HttpMediaType.TEXT_PLAIN)
7370
.allowOverwrite(false)
7471
.build();
75-
service.addCorpus(addOptions).execute();
72+
service.addCorpus(addOptions).execute().getResult();
7673

7774
// Get corpus status
7875
GetCorpusOptions getOptions = new GetCorpusOptions.Builder()
7976
.customizationId(id)
8077
.corpusName("corpus-1")
8178
.build();
8279
for (
83-
int x = 0; x < 30
84-
&& (service.getCorpus(getOptions).execute().getResult()).getStatus() != Corpus.Status.ANALYZED; x++
80+
int x = 0;
81+
x < 30 && !service.getCorpus(getOptions).execute().getResult().getStatus().equals(Corpus.Status.ANALYZED);
82+
x++
8583
) {
8684
Thread.sleep(5000);
8785
}
@@ -142,7 +140,7 @@ public static void main(String[] args) throws InterruptedException, FileNotFound
142140
.build();
143141
service.trainLanguageModel(trainOptions).execute();
144142

145-
for (int x = 0; x < 30 && myModel.getStatus() != LanguageModel.Status.AVAILABLE; x++) {
143+
for (int x = 0; x < 30 && !myModel.getStatus().equals(LanguageModel.Status.AVAILABLE); x++) {
146144
GetLanguageModelOptions getLanguageModelOptions = new GetLanguageModelOptions.Builder()
147145
.customizationId(id)
148146
.build();

‎examples/src/main/java/com/ibm/watson/speech_to_text/v1/MicrophoneWithWebSocketsExample.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818
import javax.sound.sampled.DataLine;
1919
import javax.sound.sampled.TargetDataLine;
2020

21+
import com.ibm.cloud.sdk.core.security.Authenticator;
22+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
2123
import com.ibm.cloud.sdk.core.http.HttpMediaType;
22-
import com.ibm.cloud.sdk.core.service.security.IamOptions;
2324
import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
2425
import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
2526
import com.ibm.watson.speech_to_text.v1.websocket.BaseRecognizeCallback;
@@ -36,11 +37,8 @@ public class MicrophoneWithWebSocketsExample {
3637
* @throws Exception the exception
3738
*/
3839
public static void main(final String[] args) throws Exception {
39-
SpeechToText service = new SpeechToText();
40-
IamOptions options = new IamOptions.Builder()
41-
.apiKey("<iam_api_key>")
42-
.build();
43-
service.setIamCredentials(options);
40+
Authenticator authenticator = new IamAuthenticator("<iam_api_key>");
41+
SpeechToText service = new SpeechToText(authenticator);
4442

4543
// Signed PCM AudioFormat with 16kHz, 16 bit sample size, mono
4644
int sampleRate = 16000;

0 commit comments

Comments
 (0)