SDK regen'd using latest swagger, manual ResponseConverter fix

Author: tomasroy-ibm

modules/examples/pom.xml

@@ -39,6 +39,27 @@
     <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <executions>
+            <execution>
+                <phase>package</phase>
+                <goals>
+                    <goal>shade</goal>
+                </goals>
+                <configuration>
+                    <minimizeJar>true</minimizeJar>
+                    <filters>
+                        <filter>
+                            <artifact>*:*</artifact>
+                            <excludes>
+                                <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
+                                <exclude>META-INF/*.RSA</exclude>
+                            </excludes>
+                        </filter>
+                    </filters>
+                </configuration>
+            </execution>
+        </executions>
     </plugin>
     <plugin>
         <!-- Build an executable JAR -->

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

@@ -94,12 +94,9 @@ public ServiceCall<String> listKubeconfig(ListKubeconfigOptions listKubeconfigOp
     for (Entry<String, String> header : sdkHeaders.entrySet()) {
       builder.header(header.getKey(), header.getValue());
     }
+    builder.header("Accept", "text/plain");
     builder.header("Refresh-Token", listKubeconfigOptions.refreshToken());
-    if (listKubeconfigOptions.accept() != null) {
-      builder.header("Accept", listKubeconfigOptions.accept());
-    }
-    ResponseConverter<String> responseConverter =
-      ResponseConverterUtils.getValue(new com.google.gson.reflect.TypeToken<String>() { }.getType());
+    ResponseConverter<String> responseConverter = ResponseConverterUtils.getString();
     return createServiceCall(builder.build(), responseConverter);
   }
 

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

@@ -21,20 +21,17 @@ public class ListKubeconfigOptions extends GenericModel {
 
   protected String refreshToken;
   protected String id;
-  protected String accept;
 
   /**
    * Builder.
    */
   public static class Builder {
     private String refreshToken;
     private String id;
-    private String accept;
 
     private Builder(ListKubeconfigOptions listKubeconfigOptions) {
       this.refreshToken = listKubeconfigOptions.refreshToken;
       this.id = listKubeconfigOptions.id;
-      this.accept = listKubeconfigOptions.accept;
     }
 
     /**
@@ -84,17 +81,6 @@ public Builder id(String id) {
       this.id = id;
       return this;
     }
-
-    /**
-     * Set the accept.
-     *
-     * @param accept the accept
-     * @return the ListKubeconfigOptions builder
-     */
-    public Builder accept(String accept) {
-      this.accept = accept;
-      return this;
-    }
   }
 
   protected ListKubeconfigOptions(Builder builder) {
@@ -104,7 +90,6 @@ protected ListKubeconfigOptions(Builder builder) {
       "id cannot be empty");
     refreshToken = builder.refreshToken;
     id = builder.id;
-    accept = builder.accept;
   }
 
   /**
@@ -137,17 +122,5 @@ public String refreshToken() {
   public String id() {
     return id;
   }
-
-  /**
-   * Gets the accept.
-   *
-   * The type of the response: text/html or application/json. A character encoding can be specified by including a
-   * `charset` parameter. For example, 'text/html;charset=utf-8'.
-   *
-   * @return the accept
-   */
-  public String accept() {
-    return accept;
-  }
 }
 

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

@@ -87,11 +87,11 @@ public void testConstructorWithNullAuthenticator() throws Throwable {
   @Test
   public void testListKubeconfigWOptions() throws Throwable {
     // Schedule some responses.
-    String mockResponseBody = "\"operationResponse\"";
+    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>\"";
     String listKubeconfigPath = java.net.URLEncoder.encode("/namespaces/testString/config", "UTF-8").replace("%2F", "/");
 
     server.enqueue(new MockResponse()
-    .setHeader("Content-type", "text/html")
+    .setHeader("Content-type", "text/plain")
     .setResponseCode(200)
     .setBody(mockResponseBody));
 
@@ -101,7 +101,6 @@ public void testListKubeconfigWOptions() throws Throwable {
     ListKubeconfigOptions listKubeconfigOptionsModel = new ListKubeconfigOptions.Builder()
     .refreshToken("testString")
     .id("testString")
-    .accept("text/html")
     .build();
 
     // Invoke operation with valid options model (positive test)

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

@@ -37,11 +37,9 @@ public void testListKubeconfigOptions() throws Throwable {
     ListKubeconfigOptions listKubeconfigOptionsModel = new ListKubeconfigOptions.Builder()
       .refreshToken("testString")
       .id("testString")
-      .accept("text/html")
       .build();
     assertEquals(listKubeconfigOptionsModel.refreshToken(), "testString");
     assertEquals(listKubeconfigOptionsModel.id(), "testString");
-    assertEquals(listKubeconfigOptionsModel.accept(), "text/html");
   }
 
   @Test(expectedExceptions = IllegalArgumentException.class)