Skip to content

Commit 1a35099

Browse files
chore: java 8 compatibility
1 parent 1c427f5 commit 1a35099

File tree

3 files changed

+23
-35
lines changed

3 files changed

+23
-35
lines changed

Diff for: assistant/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,6 @@
22
xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5-
<build>
6-
<plugins>
7-
<plugin>
8-
<groupId>org.apache.maven.plugins</groupId>
9-
<artifactId>maven-compiler-plugin</artifactId>
10-
<configuration>
11-
<source>11</source>
12-
<target>11</target>
13-
</configuration>
14-
</plugin>
15-
</plugins>
16-
</build>
175

186
<parent>
197
<artifactId>ibm-watson-parent</artifactId>

Diff for: assistant/src/main/java/com/ibm/watson/assistant/v2/model/MessageEventDeserializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public Builder() {}
4545
* @param inputStream the inputStream
4646
*/
4747
public Builder(InputStream inputStream) {
48-
var inputStreamConnectStrategy =
48+
InputStreamConnectStrategy inputStreamConnectStrategy =
4949
new InputStreamConnectStrategy.Builder().inputStream(inputStream).build();
5050
this.eventSource = new EventSource.Builder(inputStreamConnectStrategy).build();
5151
}
@@ -66,7 +66,7 @@ public MessageEventDeserializer build() {
6666
* @return the MessageEventDeserializer builder
6767
*/
6868
public MessageEventDeserializer.Builder inputStream(InputStream inputStream) {
69-
var inputStreamConnectStrategy =
69+
InputStreamConnectStrategy inputStreamConnectStrategy =
7070
new InputStreamConnectStrategy.Builder().inputStream(inputStream).build();
7171
this.eventSource = new EventSource.Builder(inputStreamConnectStrategy).build();
7272
return this;
@@ -109,8 +109,8 @@ public boolean hasNext() {
109109
}
110110

111111
public T next() {
112-
var gson = new Gson();
113-
var messageEvent = messageEvents.iterator().next();
112+
Gson gson = new Gson();
113+
MessageEvent messageEvent = messageEvents.iterator().next();
114114
T item = (T) gson.fromJson(messageEvent.getData(), MessageStreamResponse.class);
115115
return item;
116116
}
@@ -128,8 +128,8 @@ public boolean hasNext() {
128128
}
129129

130130
public T next() {
131-
var gson = new Gson();
132-
var messageEvent = messageEvents.iterator().next();
131+
Gson gson = new Gson();
132+
MessageEvent messageEvent = messageEvents.iterator().next();
133133
T item = (T) gson.fromJson(messageEvent.getData(), StatelessMessageStreamResponse.class);
134134
return item;
135135
}

Diff for: assistant/src/test/java/com/ibm/watson/assistant/v2/AssistantServiceIT.java

+17-17
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,9 @@ public void testGettingReleases() {
296296
/** Test Provider API */
297297
@Test
298298
public void testProviders() {
299-
var listProviderOptions = new ListProvidersOptions.Builder().build();
300-
var listProvidersResponse = service.listProviders(listProviderOptions).execute().getResult();
301-
var providerId = listProvidersResponse.getConversationalSkillProviders().get(0).getProviderId();
299+
ListProvidersOptions listProviderOptions = new ListProvidersOptions.Builder().build();
300+
ProviderCollection listProvidersResponse = service.listProviders(listProviderOptions).execute().getResult();
301+
String providerId = listProvidersResponse.getConversationalSkillProviders().get(0).getProviderId();
302302
assertNotNull(listProvidersResponse);
303303
assertNotNull(providerId);
304304

@@ -311,19 +311,19 @@ public void testProviders() {
311311
ProviderSpecification providerSpecification =
312312
new ProviderSpecification.Builder().servers(serverList).build();
313313

314-
var password = new ProviderAuthenticationTypeAndValue.Builder().type("value").value("test").build();
315-
var basicFlow = new ProviderPrivateAuthenticationBasicFlow.Builder().password(password).build();
316-
var providerPrivate = new ProviderPrivate.Builder().authentication(basicFlow).build();
314+
ProviderAuthenticationTypeAndValue password = new ProviderAuthenticationTypeAndValue.Builder().type("value").value("test").build();
315+
ProviderPrivateAuthenticationBasicFlow basicFlow = new ProviderPrivateAuthenticationBasicFlow.Builder().password(password).build();
316+
ProviderPrivate providerPrivate = new ProviderPrivate.Builder().authentication(basicFlow).build();
317317

318318
// service.setServiceUrl("http://localhost:9001");
319319

320-
var updateProvidersOptions =
320+
UpdateProviderOptions updateProvidersOptions =
321321
new UpdateProviderOptions.Builder()
322322
.providerId(providerId)
323323
.specification(providerSpecification)
324324
.xPrivate(providerPrivate)
325325
.build();
326-
var updateProvidersResponse =
326+
ProviderResponse updateProvidersResponse =
327327
service.updateProvider(updateProvidersOptions).execute().getResult();
328328
assertNotNull(updateProvidersResponse);
329329
}
@@ -332,37 +332,37 @@ public void testProviders() {
332332
@Test
333333
public void testImportRelease() throws IOException {
334334
InputStream testFile = new FileInputStream(RESOURCE + "demo_wa_V4.zip");
335-
var importOptions =
335+
CreateReleaseImportOptions importOptions =
336336
new CreateReleaseImportOptions.Builder().assistantId(assistantId).body(testFile).build();
337-
var importResponse = service.createReleaseImport(importOptions).execute().getResult();
337+
CreateAssistantReleaseImportResponse importResponse = service.createReleaseImport(importOptions).execute().getResult();
338338
assertNotNull(importResponse);
339339
}
340340

341341
@Test
342342
public void testDownloadExportRelease() throws IOException {
343-
var exportOptions =
343+
DownloadReleaseExportOptions exportOptions =
344344
new DownloadReleaseExportOptions.Builder().assistantId(assistantId).release("1").build();
345-
var exportResponse = service.downloadReleaseExport(exportOptions).execute().getResult();
345+
CreateReleaseExportWithStatusErrors exportResponse = service.downloadReleaseExport(exportOptions).execute().getResult();
346346
assertNotNull(exportResponse);
347347
}
348348

349349
@Test
350350
public void testDownloadExportReleaseStream() throws IOException {
351-
var exportOptions =
351+
DownloadReleaseExportOptions exportOptions =
352352
new DownloadReleaseExportOptions.Builder().assistantId(assistantId).release("1").build();
353-
var exportReleaseStream =
353+
InputStream exportReleaseStream =
354354
service.downloadReleaseExportAsStream(exportOptions).execute().getResult();
355355
assertNotNull(exportReleaseStream);
356356
}
357357

358358
@Test
359359
public void testMessageStreamStateless() throws IOException, StreamException {
360-
var messageInput =
360+
MessageInput messageInput =
361361
new MessageInput.Builder()
362362
.messageType("text")
363363
.text("can you list the steps to create a custom extension?")
364364
.build();
365-
var messageStreamStatelessOptions =
365+
MessageStreamStatelessOptions messageStreamStatelessOptions =
366366
new MessageStreamStatelessOptions.Builder()
367367
.assistantId("99a74576-47de-42a9-ab05-9dd98978809b")
368368
.environmentId("03dce212-1aa3-436a-a747-8717a96ded5a")
@@ -372,7 +372,7 @@ public void testMessageStreamStateless() throws IOException, StreamException {
372372
InputStream inputStream =
373373
service.messageStreamStateless(messageStreamStatelessOptions).execute().getResult();
374374

375-
var messageDeserializer = new MessageEventDeserializer.Builder(inputStream).build();
375+
MessageEventDeserializer messageDeserializer = new MessageEventDeserializer.Builder(inputStream).build();
376376
for (StatelessMessageStreamResponse message : messageDeserializer.statelessMessages()) {
377377
if (message.getPartialItem() != null) {
378378
assertNotNull(message.getPartialItem().getText());

0 commit comments

Comments
 (0)