Skip to content

Commit 7d33340

Browse files
apaparazzi0329apaparazzi0329
committed
feat(wa-v2): add environmentId param to sessions functions and update sdk headers
BREAKING CHANGE: `assistantId` and `environmentId` are now required parameters for the `createSession` and `deleteSession` functions
1 parent 5f034ac commit 7d33340

File tree

6 files changed

+124
-84
lines changed

6 files changed

+124
-84
lines changed

‎assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,7 @@ public ServiceCall<ProviderResponse> createProvider(CreateProviderOptions create
195195
createProviderOptions, "createProviderOptions cannot be null");
196196
RequestBuilder builder =
197197
RequestBuilder.post(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/v2/providers"));
198-
Map<String, String> sdkHeaders =
199-
SdkCommon.getSdkHeaders("conversation", "v2", "createProvider");
198+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "createProvider");
200199
for (Entry<String, String> header : sdkHeaders.entrySet()) {
201200
builder.header(header.getKey(), header.getValue());
202201
}
@@ -234,7 +233,7 @@ public ServiceCall<ProviderCollection> listProviders(ListProvidersOptions listPr
234233
}
235234
RequestBuilder builder =
236235
RequestBuilder.get(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/v2/providers"));
237-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "listProviders");
236+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "listProviders");
238237
for (Entry<String, String> header : sdkHeaders.entrySet()) {
239238
builder.header(header.getKey(), header.getValue());
240239
}
@@ -290,8 +289,7 @@ public ServiceCall<ProviderResponse> updateProvider(UpdateProviderOptions update
290289
RequestBuilder.post(
291290
RequestBuilder.resolveRequestUrl(
292291
getServiceUrl(), "/v2/providers/{provider_id}", pathParamsMap));
293-
Map<String, String> sdkHeaders =
294-
SdkCommon.getSdkHeaders("conversation", "v2", "updateProvider");
292+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "updateProvider");
295293
for (Entry<String, String> header : sdkHeaders.entrySet()) {
296294
builder.header(header.getKey(), header.getValue());
297295
}
@@ -330,8 +328,7 @@ public ServiceCall<AssistantData> createAssistant(CreateAssistantOptions createA
330328
}
331329
RequestBuilder builder =
332330
RequestBuilder.post(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/v2/assistants"));
333-
Map<String, String> sdkHeaders =
334-
SdkCommon.getSdkHeaders("conversation", "v2", "createAssistant");
331+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "createAssistant");
335332
for (Entry<String, String> header : sdkHeaders.entrySet()) {
336333
builder.header(header.getKey(), header.getValue());
337334
}
@@ -383,8 +380,7 @@ public ServiceCall<AssistantCollection> listAssistants(
383380
}
384381
RequestBuilder builder =
385382
RequestBuilder.get(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/v2/assistants"));
386-
Map<String, String> sdkHeaders =
387-
SdkCommon.getSdkHeaders("conversation", "v2", "listAssistants");
383+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "listAssistants");
388384
for (Entry<String, String> header : sdkHeaders.entrySet()) {
389385
builder.header(header.getKey(), header.getValue());
390386
}
@@ -440,8 +436,7 @@ public ServiceCall<Void> deleteAssistant(DeleteAssistantOptions deleteAssistantO
440436
RequestBuilder.delete(
441437
RequestBuilder.resolveRequestUrl(
442438
getServiceUrl(), "/v2/assistants/{assistant_id}", pathParamsMap));
443-
Map<String, String> sdkHeaders =
444-
SdkCommon.getSdkHeaders("conversation", "v2", "deleteAssistant");
439+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "deleteAssistant");
445440
for (Entry<String, String> header : sdkHeaders.entrySet()) {
446441
builder.header(header.getKey(), header.getValue());
447442
}
@@ -468,11 +463,14 @@ public ServiceCall<SessionResponse> createSession(CreateSessionOptions createSes
468463
createSessionOptions, "createSessionOptions cannot be null");
469464
Map<String, String> pathParamsMap = new HashMap<String, String>();
470465
pathParamsMap.put("assistant_id", createSessionOptions.assistantId());
466+
pathParamsMap.put("environment_id", createSessionOptions.environmentId());
471467
RequestBuilder builder =
472468
RequestBuilder.post(
473469
RequestBuilder.resolveRequestUrl(
474-
getServiceUrl(), "/v2/assistants/{assistant_id}/sessions", pathParamsMap));
475-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "createSession");
470+
getServiceUrl(),
471+
"/v2/assistants/{assistant_id}/environments/{environment_id}/sessions",
472+
pathParamsMap));
473+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "createSession");
476474
for (Entry<String, String> header : sdkHeaders.entrySet()) {
477475
builder.header(header.getKey(), header.getValue());
478476
}
@@ -508,14 +506,15 @@ public ServiceCall<Void> deleteSession(DeleteSessionOptions deleteSessionOptions
508506
deleteSessionOptions, "deleteSessionOptions cannot be null");
509507
Map<String, String> pathParamsMap = new HashMap<String, String>();
510508
pathParamsMap.put("assistant_id", deleteSessionOptions.assistantId());
509+
pathParamsMap.put("environment_id", deleteSessionOptions.environmentId());
511510
pathParamsMap.put("session_id", deleteSessionOptions.sessionId());
512511
RequestBuilder builder =
513512
RequestBuilder.delete(
514513
RequestBuilder.resolveRequestUrl(
515514
getServiceUrl(),
516-
"/v2/assistants/{assistant_id}/sessions/{session_id}",
515+
"/v2/assistants/{assistant_id}/environments/{environment_id}/sessions/{session_id}",
517516
pathParamsMap));
518-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "deleteSession");
517+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "deleteSession");
519518
for (Entry<String, String> header : sdkHeaders.entrySet()) {
520519
builder.header(header.getKey(), header.getValue());
521520
}
@@ -546,7 +545,7 @@ public ServiceCall<StatefulMessageResponse> message(MessageOptions messageOption
546545
getServiceUrl(),
547546
"/v2/assistants/{assistant_id}/sessions/{session_id}/message",
548547
pathParamsMap));
549-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "message");
548+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "message");
550549
for (Entry<String, String> header : sdkHeaders.entrySet()) {
551550
builder.header(header.getKey(), header.getValue());
552551
}
@@ -647,7 +646,7 @@ public ServiceCall<InputStream> messageStream(MessageStreamOptions messageStream
647646
getServiceUrl(),
648647
"/v2/assistants/{assistant_id}/environments/{environment_id}/sessions/{session_id}/message_stream",
649648
pathParamsMap));
650-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "messageStream");
649+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "messageStream");
651650
for (Entry<String, String> header : sdkHeaders.entrySet()) {
652651
builder.header(header.getKey(), header.getValue());
653652
}
@@ -698,7 +697,7 @@ public ServiceCall<InputStream> messageStreamStateless(
698697
"/v2/assistants/{assistant_id}/environments/{environment_id}/message_stream",
699698
pathParamsMap));
700699
Map<String, String> sdkHeaders =
701-
SdkCommon.getSdkHeaders("conversation", "v2", "messageStreamStateless");
700+
SdkCommon.getSdkHeaders("assistant", "v2", "messageStreamStateless");
702701
for (Entry<String, String> header : sdkHeaders.entrySet()) {
703702
builder.header(header.getKey(), header.getValue());
704703
}
@@ -746,7 +745,7 @@ public ServiceCall<BulkClassifyResponse> bulkClassify(BulkClassifyOptions bulkCl
746745
RequestBuilder.post(
747746
RequestBuilder.resolveRequestUrl(
748747
getServiceUrl(), "/v2/skills/{skill_id}/workspace/bulk_classify", pathParamsMap));
749-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "bulkClassify");
748+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "bulkClassify");
750749
for (Entry<String, String> header : sdkHeaders.entrySet()) {
751750
builder.header(header.getKey(), header.getValue());
752751
}
@@ -788,7 +787,7 @@ public ServiceCall<LogCollection> listLogs(ListLogsOptions listLogsOptions) {
788787
RequestBuilder.get(
789788
RequestBuilder.resolveRequestUrl(
790789
getServiceUrl(), "/v2/assistants/{assistant_id}/logs", pathParamsMap));
791-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "listLogs");
790+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "listLogs");
792791
for (Entry<String, String> header : sdkHeaders.entrySet()) {
793792
builder.header(header.getKey(), header.getValue());
794793
}
@@ -837,8 +836,7 @@ public ServiceCall<Void> deleteUserData(DeleteUserDataOptions deleteUserDataOpti
837836
deleteUserDataOptions, "deleteUserDataOptions cannot be null");
838837
RequestBuilder builder =
839838
RequestBuilder.delete(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/v2/user_data"));
840-
Map<String, String> sdkHeaders =
841-
SdkCommon.getSdkHeaders("conversation", "v2", "deleteUserData");
839+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "deleteUserData");
842840
for (Entry<String, String> header : sdkHeaders.entrySet()) {
843841
builder.header(header.getKey(), header.getValue());
844842
}
@@ -868,8 +866,7 @@ public ServiceCall<EnvironmentCollection> listEnvironments(
868866
RequestBuilder.get(
869867
RequestBuilder.resolveRequestUrl(
870868
getServiceUrl(), "/v2/assistants/{assistant_id}/environments", pathParamsMap));
871-
Map<String, String> sdkHeaders =
872-
SdkCommon.getSdkHeaders("conversation", "v2", "listEnvironments");
869+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "listEnvironments");
873870
for (Entry<String, String> header : sdkHeaders.entrySet()) {
874871
builder.header(header.getKey(), header.getValue());
875872
}
@@ -918,8 +915,7 @@ public ServiceCall<Environment> getEnvironment(GetEnvironmentOptions getEnvironm
918915
getServiceUrl(),
919916
"/v2/assistants/{assistant_id}/environments/{environment_id}",
920917
pathParamsMap));
921-
Map<String, String> sdkHeaders =
922-
SdkCommon.getSdkHeaders("conversation", "v2", "getEnvironment");
918+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "getEnvironment");
923919
for (Entry<String, String> header : sdkHeaders.entrySet()) {
924920
builder.header(header.getKey(), header.getValue());
925921
}
@@ -959,7 +955,7 @@ public ServiceCall<Environment> updateEnvironment(
959955
"/v2/assistants/{assistant_id}/environments/{environment_id}",
960956
pathParamsMap));
961957
Map<String, String> sdkHeaders =
962-
SdkCommon.getSdkHeaders("conversation", "v2", "updateEnvironment");
958+
SdkCommon.getSdkHeaders("assistant", "v2", "updateEnvironment");
963959
for (Entry<String, String> header : sdkHeaders.entrySet()) {
964960
builder.header(header.getKey(), header.getValue());
965961
}
@@ -1013,7 +1009,7 @@ public ServiceCall<Release> createRelease(CreateReleaseOptions createReleaseOpti
10131009
RequestBuilder.post(
10141010
RequestBuilder.resolveRequestUrl(
10151011
getServiceUrl(), "/v2/assistants/{assistant_id}/releases", pathParamsMap));
1016-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "createRelease");
1012+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "createRelease");
10171013
for (Entry<String, String> header : sdkHeaders.entrySet()) {
10181014
builder.header(header.getKey(), header.getValue());
10191015
}
@@ -1048,7 +1044,7 @@ public ServiceCall<ReleaseCollection> listReleases(ListReleasesOptions listRelea
10481044
RequestBuilder.get(
10491045
RequestBuilder.resolveRequestUrl(
10501046
getServiceUrl(), "/v2/assistants/{assistant_id}/releases", pathParamsMap));
1051-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "listReleases");
1047+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "listReleases");
10521048
for (Entry<String, String> header : sdkHeaders.entrySet()) {
10531049
builder.header(header.getKey(), header.getValue());
10541050
}
@@ -1100,7 +1096,7 @@ public ServiceCall<Release> getRelease(GetReleaseOptions getReleaseOptions) {
11001096
getServiceUrl(),
11011097
"/v2/assistants/{assistant_id}/releases/{release}",
11021098
pathParamsMap));
1103-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "getRelease");
1099+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "getRelease");
11041100
for (Entry<String, String> header : sdkHeaders.entrySet()) {
11051101
builder.header(header.getKey(), header.getValue());
11061102
}
@@ -1137,7 +1133,7 @@ public ServiceCall<Void> deleteRelease(DeleteReleaseOptions deleteReleaseOptions
11371133
getServiceUrl(),
11381134
"/v2/assistants/{assistant_id}/releases/{release}",
11391135
pathParamsMap));
1140-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "deleteRelease");
1136+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "deleteRelease");
11411137
for (Entry<String, String> header : sdkHeaders.entrySet()) {
11421138
builder.header(header.getKey(), header.getValue());
11431139
}
@@ -1169,7 +1165,7 @@ public ServiceCall<Environment> deployRelease(DeployReleaseOptions deployRelease
11691165
getServiceUrl(),
11701166
"/v2/assistants/{assistant_id}/releases/{release}/deploy",
11711167
pathParamsMap));
1172-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "deployRelease");
1168+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "deployRelease");
11731169
for (Entry<String, String> header : sdkHeaders.entrySet()) {
11741170
builder.header(header.getKey(), header.getValue());
11751171
}
@@ -1216,7 +1212,7 @@ public ServiceCall<CreateReleaseExportWithStatusErrors> createReleaseExport(
12161212
"/v2/assistants/{assistant_id}/releases/{release}/export",
12171213
pathParamsMap));
12181214
Map<String, String> sdkHeaders =
1219-
SdkCommon.getSdkHeaders("conversation", "v2", "createReleaseExport");
1215+
SdkCommon.getSdkHeaders("assistant", "v2", "createReleaseExport");
12201216
for (Entry<String, String> header : sdkHeaders.entrySet()) {
12211217
builder.header(header.getKey(), header.getValue());
12221218
}
@@ -1268,7 +1264,7 @@ public ServiceCall<CreateReleaseExportWithStatusErrors> downloadReleaseExport(
12681264
"/v2/assistants/{assistant_id}/releases/{release}/export",
12691265
pathParamsMap));
12701266
Map<String, String> sdkHeaders =
1271-
SdkCommon.getSdkHeaders("conversation", "v2", "downloadReleaseExport");
1267+
SdkCommon.getSdkHeaders("assistant", "v2", "downloadReleaseExport");
12721268
for (Entry<String, String> header : sdkHeaders.entrySet()) {
12731269
builder.header(header.getKey(), header.getValue());
12741270
}
@@ -1320,7 +1316,7 @@ public ServiceCall<InputStream> downloadReleaseExportAsStream(
13201316
"/v2/assistants/{assistant_id}/releases/{release}/export",
13211317
pathParamsMap));
13221318
Map<String, String> sdkHeaders =
1323-
SdkCommon.getSdkHeaders("conversation", "v2", "downloadReleaseExportAsStream");
1319+
SdkCommon.getSdkHeaders("assistant", "v2", "downloadReleaseExportAsStream");
13241320
for (Entry<String, String> header : sdkHeaders.entrySet()) {
13251321
builder.header(header.getKey(), header.getValue());
13261322
}
@@ -1368,7 +1364,7 @@ public ServiceCall<CreateAssistantReleaseImportResponse> createReleaseImport(
13681364
RequestBuilder.resolveRequestUrl(
13691365
getServiceUrl(), "/v2/assistants/{assistant_id}/import", pathParamsMap));
13701366
Map<String, String> sdkHeaders =
1371-
SdkCommon.getSdkHeaders("conversation", "v2", "createReleaseImport");
1367+
SdkCommon.getSdkHeaders("assistant", "v2", "createReleaseImport");
13721368
for (Entry<String, String> header : sdkHeaders.entrySet()) {
13731369
builder.header(header.getKey(), header.getValue());
13741370
}
@@ -1407,7 +1403,7 @@ public ServiceCall<MonitorAssistantReleaseImportArtifactResponse> getReleaseImpo
14071403
RequestBuilder.resolveRequestUrl(
14081404
getServiceUrl(), "/v2/assistants/{assistant_id}/import", pathParamsMap));
14091405
Map<String, String> sdkHeaders =
1410-
SdkCommon.getSdkHeaders("conversation", "v2", "getReleaseImportStatus");
1406+
SdkCommon.getSdkHeaders("assistant", "v2", "getReleaseImportStatus");
14111407
for (Entry<String, String> header : sdkHeaders.entrySet()) {
14121408
builder.header(header.getKey(), header.getValue());
14131409
}
@@ -1441,7 +1437,7 @@ public ServiceCall<Skill> getSkill(GetSkillOptions getSkillOptions) {
14411437
RequestBuilder.get(
14421438
RequestBuilder.resolveRequestUrl(
14431439
getServiceUrl(), "/v2/assistants/{assistant_id}/skills/{skill_id}", pathParamsMap));
1444-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "getSkill");
1440+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "getSkill");
14451441
for (Entry<String, String> header : sdkHeaders.entrySet()) {
14461442
builder.header(header.getKey(), header.getValue());
14471443
}
@@ -1474,7 +1470,7 @@ public ServiceCall<Skill> updateSkill(UpdateSkillOptions updateSkillOptions) {
14741470
RequestBuilder.post(
14751471
RequestBuilder.resolveRequestUrl(
14761472
getServiceUrl(), "/v2/assistants/{assistant_id}/skills/{skill_id}", pathParamsMap));
1477-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "updateSkill");
1473+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "updateSkill");
14781474
for (Entry<String, String> header : sdkHeaders.entrySet()) {
14791475
builder.header(header.getKey(), header.getValue());
14801476
}
@@ -1544,7 +1540,7 @@ public ServiceCall<SkillsExport> exportSkills(ExportSkillsOptions exportSkillsOp
15441540
RequestBuilder.get(
15451541
RequestBuilder.resolveRequestUrl(
15461542
getServiceUrl(), "/v2/assistants/{assistant_id}/skills_export", pathParamsMap));
1547-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "exportSkills");
1543+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "exportSkills");
15481544
for (Entry<String, String> header : sdkHeaders.entrySet()) {
15491545
builder.header(header.getKey(), header.getValue());
15501546
}
@@ -1586,7 +1582,7 @@ public ServiceCall<SkillsAsyncRequestStatus> importSkills(
15861582
RequestBuilder.post(
15871583
RequestBuilder.resolveRequestUrl(
15881584
getServiceUrl(), "/v2/assistants/{assistant_id}/skills_import", pathParamsMap));
1589-
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("conversation", "v2", "importSkills");
1585+
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("assistant", "v2", "importSkills");
15901586
for (Entry<String, String> header : sdkHeaders.entrySet()) {
15911587
builder.header(header.getKey(), header.getValue());
15921588
}
@@ -1634,7 +1630,7 @@ public ServiceCall<SkillsAsyncRequestStatus> importSkillsStatus(
16341630
"/v2/assistants/{assistant_id}/skills_import/status",
16351631
pathParamsMap));
16361632
Map<String, String> sdkHeaders =
1637-
SdkCommon.getSdkHeaders("conversation", "v2", "importSkillsStatus");
1633+
SdkCommon.getSdkHeaders("assistant", "v2", "importSkillsStatus");
16381634
for (Entry<String, String> header : sdkHeaders.entrySet()) {
16391635
builder.header(header.getKey(), header.getValue());
16401636
}

0 commit comments

Comments
 (0)