Skip to content

Commit a2346d4

Browse files
kevinkowakevinkowa
committed
chore(examples): fix compilation errors and use maven on sdk examples
1 parent bccf404 commit a2346d4

18 files changed

Lines changed: 104 additions & 253 deletions

‎examples/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ This example shows you how to use the Java SDK.
66

77
To run the example you need to install the dependencies
88

9-
$ gradle assemble
9+
$ mvn install

‎examples/build.gradle‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎examples/pom.xml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>com.ibm.watson</groupId>
7+
<artifactId>examples</artifactId>
8+
<version>1.0-SNAPSHOT</version>
9+
<build>
10+
<plugins>
11+
<plugin>
12+
<groupId>org.apache.maven.plugins</groupId>
13+
<artifactId>maven-compiler-plugin</artifactId>
14+
<configuration>
15+
<source>8</source>
16+
<target>8</target>
17+
</configuration>
18+
</plugin>
19+
</plugins>
20+
</build>
21+
<dependencies>
22+
<dependency>
23+
<groupId>com.ibm.watson</groupId>
24+
<artifactId>ibm-watson</artifactId>
25+
<version>9.3.0</version>
26+
</dependency>
27+
</dependencies>
28+
</project>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.ibm.cloud.sdk.core.http.ServiceCallback;
1717
import com.ibm.cloud.sdk.core.security.Authenticator;
1818
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
19+
import com.ibm.watson.assistant.v1.model.MessageInput;
1920
import com.ibm.watson.assistant.v1.model.MessageOptions;
2021
import com.ibm.watson.assistant.v1.model.MessageResponse;
2122
import io.reactivex.Single;

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

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@
1414

1515
import com.ibm.cloud.sdk.core.http.Response;
1616
import com.ibm.cloud.sdk.core.http.ServiceCallback;
17+
import com.ibm.cloud.sdk.core.security.Authenticator;
18+
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1719
import com.ibm.watson.assistant.v1.Assistant;
1820
import com.ibm.watson.assistant.v1.model.Context;
21+
import com.ibm.watson.assistant.v1.model.MessageInput;
1922
import com.ibm.watson.assistant.v1.model.MessageOptions;
2023
import com.ibm.watson.assistant.v1.model.MessageResponse;
2124
import com.ibm.watson.tone_analyzer.v3.ToneAnalyzer;
@@ -29,28 +32,28 @@ public static void main(String[] args) throws Exception {
2932

3033
// instantiate the assistant service
3134
Authenticator assistantAuthenticator = new IamAuthenticator("<iam_api_key>");
32-
Assistant assistantService = new Assistant("2019-02-28", assistantAuthenticator);
35+
final Assistant assistantService = new Assistant("2019-02-28", assistantAuthenticator);
3336

3437
// instantiate the tone analyzer service
3538
Authenticator toneAuthenticator = new IamAuthenticator("<iam_api_key>");
3639
ToneAnalyzer toneService = new ToneAnalyzer("2017-09-21", toneAuthenticator);
3740

3841
// workspace id
39-
String workspaceId = "<workspace-id>";
42+
final String workspaceId = "<workspace-id>";
4043

4144
// maintain history in the context variable - will add a history variable to
4245
// each of the emotion, social
4346
// and language tones
44-
boolean maintainHistory = false;
47+
final boolean maintainHistory = false;
4548

4649
/**
4750
* Input for the Assistant service: text (String): an input string (the user's conversation
4851
* turn) and context (Context): any context that needs to be maintained - either added by the
4952
* client app or passed in the response from the Assistant service on the previous conversation
5053
* turn.
5154
*/
52-
String text = "I am happy";
53-
Context context = null;
55+
final String text = "I am happy";
56+
final Context context = new Context();
5457

5558
// UPDATE CONTEXT HERE IF CONTINUING AN ONGOING CONVERSATION
5659
// set local context variable to the context from the last response from the
@@ -59,7 +62,7 @@ public static void main(String[] args) throws Exception {
5962
// com.ibm.watson.assistant.v1.model)
6063

6164
// async call to Tone Analyzer
62-
ToneOptions toneOptions = new ToneOptions.Builder().text(input).build();
65+
ToneOptions toneOptions = new ToneOptions.Builder().text(text).build();
6366
toneService
6467
.tone(toneOptions)
6568
.enqueue(
@@ -68,9 +71,9 @@ public static void main(String[] args) throws Exception {
6871
public void onResponse(Response<ToneAnalysis> toneResponsePayload) {
6972

7073
// update context with the tone data returned by the Tone Analyzer
71-
context =
74+
context.setSystem(
7275
ToneDetection.updateUserTone(
73-
context, toneResponsePayload.getResult(), maintainHistory);
76+
context, toneResponsePayload.getResult(), maintainHistory));
7477

7578
// create input for message
7679
MessageInput input = new MessageInput();

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

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

15+
import com.ibm.watson.assistant.v1.model.Context;
1516
import com.ibm.watson.tone_analyzer.v3.model.ToneAnalysis;
1617
import com.ibm.watson.tone_analyzer.v3.model.ToneCategory;
1718
import com.ibm.watson.tone_analyzer.v3.model.ToneScore;
@@ -58,14 +59,14 @@ private ToneDetection() {}
5859
* toneAnalyzerPayload
5960
*/
6061
public static Map<String, Object> updateUserTone(
61-
Context context, ToneAnalysis toneAnalyzerPayload, boolean maintainHistory) {
62+
Context context, ToneAnalysis toneAnalyzerPayload, boolean maintainHistory) {
6263

6364
List<ToneScore> emotionTone = new ArrayList<ToneScore>();
6465
List<ToneScore> languageTone = new ArrayList<ToneScore>();
6566
List<ToneScore> socialTone = new ArrayList<ToneScore>();
6667

6768
// If the context doesn't already contain the user object, initialize it
68-
if (context.containsKey("user") != null) {
69+
if (context.getSystem().containsKey("user")) {
6970
context.put("user", initUser());
7071
}
7172

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static void main(String[] args) {
6868
// no environment found, create a new one (assuming we are a FREE plan)
6969
String environmentName = "watson_developer_cloud_test_environment";
7070
CreateEnvironmentOptions createOptions =
71-
new CreateEnvironmentOptions.Builder().name(environmentName).size(0L) /* FREE */.build();
71+
new CreateEnvironmentOptions.Builder().name(environmentName).size(String.valueOf(0L)) /* FREE */.build();
7272
Environment createResponse = discovery.createEnvironment(createOptions).execute().getResult();
7373
environmentId = createResponse.getEnvironmentId();
7474
System.out.println("Created new environment ID: " + environmentId);
@@ -100,8 +100,8 @@ public static void main(String[] args) {
100100
ListConfigurationsResponse listConfigsResponse =
101101
discovery.listConfigurations(listConfigsOptions).execute().getResult();
102102
for (Configuration configuration : listConfigsResponse.getConfigurations()) {
103-
if (configuration.getName().equals(DEFAULT_CONFIG_NAME)) {
104-
configurationId = configuration.getConfigurationId();
103+
if (configuration.name().equals(DEFAULT_CONFIG_NAME)) {
104+
configurationId = configuration.configurationId();
105105
System.out.println("Found default configuration ID: " + configurationId);
106106
break;
107107
}

‎examples/src/main/java/com/ibm/watson/discovery/v2/DiscoveryV2Example.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
package com.ibm.watson.discovery.v2;
2+
13
import com.ibm.cloud.sdk.core.security.Authenticator;
24
import com.ibm.cloud.sdk.core.security.BearerTokenAuthenticator;
35
import com.ibm.watson.discovery.v2.Discovery;
@@ -39,14 +41,14 @@ public static void main(String[] args) throws IOException {
3941
String documentId = addResponse.getDocumentId();
4042

4143
// Query your collection with the new document inside.
42-
QueryOptions queryOptoins =
44+
QueryOptions queryOptions =
4345
new QueryOptions.Builder()
4446
.projectId(projectId)
4547
.addCollectionIds(collectionId)
4648
.naturalLanguageQuery(
4749
"Watson") // Feel free to replace this to query something different.
4850
.build();
49-
QueryResponse queryResponse = service.query(options).execute().getResult();
51+
QueryResponse queryResponse = service.query(queryOptions).execute().getResult();
5052

5153
System.out.println(queryResponse.getMatchingResults() + " results were returned by the query!");
5254

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void main(String[] args) {
2525
LanguageTranslator service = new LanguageTranslator("2018-05-01", authenticator);
2626

2727
TranslateOptions translateOptions =
28-
new TranslateOptions.Builder().addText(text).modelId("en-es").build();
28+
new TranslateOptions.Builder().addText("text").modelId("en-es").build();
2929
TranslationResult translationResult = service.translate(translateOptions).execute().getResult();
3030

3131
System.out.println(translationResult);

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.ibm.cloud.sdk.core.security.Authenticator;
1717
import com.ibm.cloud.sdk.core.security.IamAuthenticator;
1818
import com.ibm.watson.speech_to_text.v1.model.RecognizeOptions;
19+
import com.ibm.watson.speech_to_text.v1.model.RecognizeWithWebsocketsOptions;
1920
import com.ibm.watson.speech_to_text.v1.model.SpeechRecognitionResults;
2021
import com.ibm.watson.speech_to_text.v1.websocket.BaseRecognizeCallback;
2122
import javax.sound.sampled.AudioFormat;
@@ -53,8 +54,8 @@ public static void main(final String[] args) throws Exception {
5354

5455
AudioInputStream audio = new AudioInputStream(line);
5556

56-
RecognizeOptions options =
57-
new RecognizeOptions.Builder()
57+
RecognizeWithWebsocketsOptions options =
58+
new RecognizeWithWebsocketsOptions.Builder()
5859
.audio(audio)
5960
.interimResults(true)
6061
.timestamps(true)

0 commit comments

Comments
 (0)