feat: [OpenAPI] Part 2: Testing Apache Client Support and some fixes. (#1062)

Moving to single larger PR (sorry), because its getting difficult to sync changes across. Both PRs have been thoroughly review at this point.

Author: rpanackal

datamodel/openapi/openapi-api-apache-sample/pom.xml

@@ -47,6 +47,36 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
         </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -82,11 +112,11 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <inputSpec>${project.basedir}/src/main/resources/sodastore.yaml</inputSpec>
-                            <apiPackage>com.sap.cloud.sdk.datamodel.openapi.apache.sample.api</apiPackage>
-                            <modelPackage>com.sap.cloud.sdk.datamodel.openapi.apache.sample.model</modelPackage>
+                            <apiPackage>com.sap.cloud.sdk.datamodel.openapi.apache.sodastore.api</apiPackage>
+                            <modelPackage>com.sap.cloud.sdk.datamodel.openapi.apache.sodastore.model</modelPackage>
+                            <typeMappings>File=byte[]</typeMappings>
                             <additionalProperties>
                                 <library>apache-httpclient</library>
-                                <supportUrlQuery>false</supportUrlQuery>
                                 <pojoBuilderMethodName>create</pojoBuilderMethodName>
                                 <pojoConstructorVisibility>protected</pojoConstructorVisibility>
                                 <useOneOfInterfaces>true</useOneOfInterfaces>

datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/petstore/api/DefaultApi.java

@@ -98,13 +98,13 @@ public Pet addPet( @Nonnull final PetInput pet )
 
         final String[] localVarAccepts = { "application/json" };
         final String localVarAccept = ApiClient.selectHeaderAccept(localVarAccepts);
-
         final String[] localVarContentTypes = { "application/json" };
         final String localVarContentType = ApiClient.selectHeaderContentType(localVarContentTypes);
 
         final TypeReference<Pet> localVarReturnType = new TypeReference<Pet>()
         {
         };
+
         return apiClient
             .invokeAPI(
                 localVarPath,
@@ -159,7 +159,6 @@ public OpenApiResponse deletePet( @Nonnull final Long id )
 
         final String[] localVarAccepts = { "application/json" };
         final String localVarAccept = ApiClient.selectHeaderAccept(localVarAccepts);
-
         final String[] localVarContentTypes = {
 
         };
@@ -168,6 +167,7 @@ public OpenApiResponse deletePet( @Nonnull final Long id )
         final TypeReference<OpenApiResponse> localVarReturnType = new TypeReference<OpenApiResponse>()
         {
         };
+
         return apiClient
             .invokeAPI(
                 localVarPath,
@@ -222,7 +222,6 @@ public Pet findPetById( @Nonnull final Long id )
 
         final String[] localVarAccepts = { "application/json", "application/xml", "text/xml", "text/html" };
         final String localVarAccept = ApiClient.selectHeaderAccept(localVarAccepts);
-
         final String[] localVarContentTypes = {
 
         };
@@ -231,6 +230,7 @@ public Pet findPetById( @Nonnull final Long id )
         final TypeReference<Pet> localVarReturnType = new TypeReference<Pet>()
         {
         };
+
         return apiClient
             .invokeAPI(
                 localVarPath,
@@ -283,7 +283,6 @@ public List<Pet> findPets( @Nullable final List<String> tags, @Nullable final In
 
         final String[] localVarAccepts = { "application/json", "application/xml", "text/xml", "text/html" };
         final String localVarAccept = ApiClient.selectHeaderAccept(localVarAccepts);
-
         final String[] localVarContentTypes = {
 
         };
@@ -292,6 +291,7 @@ public List<Pet> findPets( @Nullable final List<String> tags, @Nullable final In
         final TypeReference<List<Pet>> localVarReturnType = new TypeReference<List<Pet>>()
         {
         };
+
         return apiClient
             .invokeAPI(
                 localVarPath,

datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/petstore/model/ErrorModel.java

@@ -15,14 +15,11 @@
 
 package com.sap.cloud.sdk.datamodel.openapi.apache.petstore.model;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
-import java.util.StringJoiner;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -232,78 +229,4 @@ private String toIndentedString( final java.lang.Object o )
         return o.toString().replace("\n", "\n    ");
     }
 
-    /**
-     * Convert the instance into URL query string.
-     *
-     * @return URL query string
-     */
-    public String toUrlQueryString()
-    {
-        return toUrlQueryString(null);
-    }
-
-    /**
-     * Convert the instance into URL query string.
-     *
-     * @param prefix
-     *            prefix of the query string
-     * @return URL query string
-     */
-    public String toUrlQueryString( String prefix )
-    {
-        String suffix = "";
-        String containerSuffix = "";
-        String containerPrefix = "";
-        if( prefix == null ) {
-            // style=form, explode=true, e.g. /pet?name=cat&type=manx
-            prefix = "";
-        } else {
-            // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-            prefix = prefix + "[";
-            suffix = "]";
-            containerSuffix = "]";
-            containerPrefix = "[";
-        }
-
-        StringJoiner joiner = new StringJoiner("&");
-
-        // add `code` to the URL query string
-        if( getCode() != null ) {
-            try {
-                joiner
-                    .add(
-                        String
-                            .format(
-                                "%scode%s=%s",
-                                prefix,
-                                suffix,
-                                URLEncoder.encode(String.valueOf(getCode()), "UTF-8").replaceAll("\\+", "%20")));
-            }
-            catch( UnsupportedEncodingException e ) {
-                // Should never happen, UTF-8 is always supported
-                throw new RuntimeException(e);
-            }
-        }
-
-        // add `message` to the URL query string
-        if( getMessage() != null ) {
-            try {
-                joiner
-                    .add(
-                        String
-                            .format(
-                                "%smessage%s=%s",
-                                prefix,
-                                suffix,
-                                URLEncoder.encode(String.valueOf(getMessage()), "UTF-8").replaceAll("\\+", "%20")));
-            }
-            catch( UnsupportedEncodingException e ) {
-                // Should never happen, UTF-8 is always supported
-                throw new RuntimeException(e);
-            }
-        }
-
-        return joiner.toString();
-    }
-
 }

datamodel/openapi/openapi-api-apache-sample/src/main/java/com/sap/cloud/sdk/datamodel/openapi/apache/petstore/model/Pet.java

@@ -15,14 +15,11 @@
 
 package com.sap.cloud.sdk.datamodel.openapi.apache.petstore.model;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.Set;
-import java.util.StringJoiner;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -275,96 +272,4 @@ private String toIndentedString( final java.lang.Object o )
         return o.toString().replace("\n", "\n    ");
     }
 
-    /**
-     * Convert the instance into URL query string.
-     *
-     * @return URL query string
-     */
-    public String toUrlQueryString()
-    {
-        return toUrlQueryString(null);
-    }
-
-    /**
-     * Convert the instance into URL query string.
-     *
-     * @param prefix
-     *            prefix of the query string
-     * @return URL query string
-     */
-    public String toUrlQueryString( String prefix )
-    {
-        String suffix = "";
-        String containerSuffix = "";
-        String containerPrefix = "";
-        if( prefix == null ) {
-            // style=form, explode=true, e.g. /pet?name=cat&type=manx
-            prefix = "";
-        } else {
-            // deepObject style e.g. /pet?id[name]=cat&id[type]=manx
-            prefix = prefix + "[";
-            suffix = "]";
-            containerSuffix = "]";
-            containerPrefix = "[";
-        }
-
-        StringJoiner joiner = new StringJoiner("&");
-
-        // add `id` to the URL query string
-        if( getId() != null ) {
-            try {
-                joiner
-                    .add(
-                        String
-                            .format(
-                                "%sid%s=%s",
-                                prefix,
-                                suffix,
-                                URLEncoder.encode(String.valueOf(getId()), "UTF-8").replaceAll("\\+", "%20")));
-            }
-            catch( UnsupportedEncodingException e ) {
-                // Should never happen, UTF-8 is always supported
-                throw new RuntimeException(e);
-            }
-        }
-
-        // add `name` to the URL query string
-        if( getName() != null ) {
-            try {
-                joiner
-                    .add(
-                        String
-                            .format(
-                                "%sname%s=%s",
-                                prefix,
-                                suffix,
-                                URLEncoder.encode(String.valueOf(getName()), "UTF-8").replaceAll("\\+", "%20")));
-            }
-            catch( UnsupportedEncodingException e ) {
-                // Should never happen, UTF-8 is always supported
-                throw new RuntimeException(e);
-            }
-        }
-
-        // add `tag` to the URL query string
-        if( getTag() != null ) {
-            try {
-                joiner
-                    .add(
-                        String
-                            .format(
-                                "%stag%s=%s",
-                                prefix,
-                                suffix,
-                                URLEncoder.encode(String.valueOf(getTag()), "UTF-8").replaceAll("\\+", "%20")));
-            }
-            catch( UnsupportedEncodingException e ) {
-                // Should never happen, UTF-8 is always supported
-                throw new RuntimeException(e);
-            }
-        }
-
-        return joiner.toString();
-    }
-
 }