Skip to content

Commit a8714cb

Browse files
authored
new plugin using latest sdkgen with response type fix (#2)
* new plugin using latest sdkgen with response type fix * example response un-removed * official sdkgen used
1 parent a55bf7c commit a8714cb

4 files changed

Lines changed: 8 additions & 17 deletions

File tree

modules/ibm-cloud-code-engine/src/main/java/com/ibm/cloud/code_engine/ibm_cloud_code_engine/v1/IbmCloudCodeEngine.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313

1414
/*
15-
* IBM OpenAPI SDK Code Generator Version: 3.12.0-64fe8d3f-20200820-144050
15+
* IBM OpenAPI SDK Code Generator Version: 3.15.0-45841b53-20201019-214802
1616
*/
1717

1818
package com.ibm.cloud.code_engine.ibm_cloud_code_engine.v1;
@@ -26,6 +26,7 @@
2626
import com.ibm.cloud.sdk.core.security.ConfigBasedAuthenticatorFactory;
2727
import com.ibm.cloud.sdk.core.service.BaseService;
2828
import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
29+
import java.util.HashMap;
2930
import java.util.Map;
3031
import java.util.Map.Entry;
3132

@@ -87,9 +88,9 @@ public IbmCloudCodeEngine(String serviceName, Authenticator authenticator) {
8788
public ServiceCall<String> listKubeconfig(ListKubeconfigOptions listKubeconfigOptions) {
8889
com.ibm.cloud.sdk.core.util.Validator.notNull(listKubeconfigOptions,
8990
"listKubeconfigOptions cannot be null");
90-
String[] pathSegments = { "namespaces", "config" };
91-
String[] pathParameters = { listKubeconfigOptions.id() };
92-
RequestBuilder builder = RequestBuilder.get(RequestBuilder.constructHttpUrl(getServiceUrl(), pathSegments, pathParameters));
91+
Map<String, String> pathParamsMap = new HashMap<String, String>();
92+
pathParamsMap.put("id", listKubeconfigOptions.id());
93+
RequestBuilder builder = RequestBuilder.get(RequestBuilder.resolveRequestUrl(getServiceUrl(), "/namespaces/{id}/config", pathParamsMap));
9394
Map<String, String> sdkHeaders = SdkCommon.getSdkHeaders("ibm_cloud_code_engine", "v1", "listKubeconfig");
9495
for (Entry<String, String> header : sdkHeaders.entrySet()) {
9596
builder.header(header.getKey(), header.getValue());

modules/ibm-cloud-code-engine/src/test/java/com/ibm/cloud/code_engine/ibm_cloud_code_engine/v1/IbmCloudCodeEngineTest.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,21 @@
1919
import com.ibm.cloud.sdk.core.security.Authenticator;
2020
import com.ibm.cloud.sdk.core.security.NoAuthAuthenticator;
2121
import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
22-
2322
import com.ibm.cloud.sdk.core.util.EnvironmentUtils;
24-
2523
import java.io.IOException;
2624
import java.io.InputStream;
27-
2825
import java.util.HashMap;
2926
import java.util.List;
3027
import java.util.Map;
31-
3228
import okhttp3.mockwebserver.MockResponse;
3329
import okhttp3.mockwebserver.MockWebServer;
3430
import okhttp3.mockwebserver.RecordedRequest;
35-
3631
import org.powermock.api.mockito.PowerMockito;
3732
import org.powermock.core.classloader.annotations.PowerMockIgnore;
3833
import org.powermock.core.classloader.annotations.PrepareForTest;
3934
import org.powermock.modules.testng.PowerMockTestCase;
40-
4135
import org.testng.annotations.AfterMethod;
4236
import org.testng.annotations.BeforeMethod;
43-
4437
import org.testng.annotations.Test;
4538
import static org.testng.Assert.*;
4639

@@ -88,7 +81,7 @@ public void testConstructorWithNullAuthenticator() throws Throwable {
8881
public void testListKubeconfigWOptions() throws Throwable {
8982
// Schedule some responses.
9083
String mockResponseBody = "\"apiVersion: v1 clusters: - cluster: server: https://proxy.us-south.codeengine.test.cloud.ibm.com name: https://proxy.us-south.codeengine.test.cloud.ibm.com contexts: - context: cluster: https://proxy.us-south.codeengine.test.cloud.ibm.com user: <userID> namespace: <namespace> name: <namespace> current-context: <current namespace> kind: Config preferences: {} users: - name: <userID> user: auth-provider: name: oidc config: client-id: ce client-secret: ce id-token: <id-token> idp-issuer-url: https://iam.test.cloud.ibm.com/identity refresh-token: <refresh-token>\"";
91-
String listKubeconfigPath = java.net.URLEncoder.encode("/namespaces/testString/config", "UTF-8").replace("%2F", "/");
84+
String listKubeconfigPath = "/namespaces/testString/config";
9285

9386
server.enqueue(new MockResponse()
9487
.setHeader("Content-type", "text/plain")

modules/ibm-cloud-code-engine/src/test/java/com/ibm/cloud/code_engine/ibm_cloud_code_engine/v1/model/ListKubeconfigOptionsTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@
1515

1616
import com.ibm.cloud.code_engine.ibm_cloud_code_engine.v1.model.ListKubeconfigOptions;
1717
import com.ibm.cloud.code_engine.ibm_cloud_code_engine.v1.utils.TestUtilities;
18-
1918
import com.ibm.cloud.sdk.core.service.model.FileWithMetadata;
2019
import java.io.InputStream;
21-
2220
import java.util.HashMap;
2321
import java.util.List;
24-
2522
import org.testng.annotations.Test;
2623
import static org.testng.Assert.*;
2724

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
of the SDK generator used to generate your SDK code.
1717
See this link for details: https://github.ibm.com/CloudEngineering/openapi-sdkgen/wiki/Compatibility-Chart
1818
-->
19-
<sdk-core-version>9.1.0</sdk-core-version>
19+
<sdk-core-version>9.4.0</sdk-core-version>
2020
<git-repository-name>code-engine-java-sdk</git-repository-name>
2121

2222
<testng-version>7.1.0</testng-version>
23-
<okhttp3-version>3.14.9</okhttp3-version>
23+
<okhttp3-version>4.9.0</okhttp3-version>
2424
<surefire-version>3.0.0-M3</surefire-version>
2525
<jacoco-plugin-version>0.8.5</jacoco-plugin-version>
2626
<bintray-plugin-version>1.5.20191113165555</bintray-plugin-version>

0 commit comments

Comments
 (0)