up

walmartlabs · Aug 28, 2023 · 3d9a8b7 · 3d9a8b7
1 parent d352bb7
commit 3d9a8b7
Show file tree

Hide file tree

Showing 22 changed files with 1,394 additions and 247 deletions.
diff --git a/client/pom.xml b/client/pom.xml
@@ -117,44 +117,44 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.openapitools</groupId>
-                <artifactId>openapi-generator-maven-plugin</artifactId>
-                <version>6.6.0</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                        <configuration>
-                            <inputSpec>${project.basedir}/../server/impl/target/classes/com/walmartlabs/concord/server/swagger/swagger.yaml</inputSpec>
-                            <generatorName>java</generatorName>
-                            <apiPackage>com.walmartlabs.concord.client</apiPackage>
-                            <modelPackage>com.walmartlabs.concord.client</modelPackage>
-                            <configOptions>
-                                <sourceFolder>src/gen/java/main</sourceFolder>
-                                <dateLibrary>java8</dateLibrary>
-                                <serializableModel>true</serializableModel>
-                                <openApiNullable>false</openApiNullable>
-                                <supportUrlQuery>false</supportUrlQuery>
-                            </configOptions>
-                            <skipValidateSpec>false</skipValidateSpec>
-                            <library>native</library>
-                            <generateApiTests>false</generateApiTests>
-                            <generateModelTests>false</generateModelTests>
-                            <generateApiDocumentation>false</generateApiDocumentation>
-                            <generateModelDocumentation>false</generateModelDocumentation>
-                            <generateSupportingFiles>true</generateSupportingFiles>
-                            <supportingFilesToGenerate>ApiClient.java,ApiResponse.java,ApiException.java,Pair.java</supportingFilesToGenerate>
-                            <templateDirectory>${project.basedir}/src/main/template</templateDirectory>
-                            <cleanupOutput>true</cleanupOutput>
-                            <typeMappings>string+binary=InputStream</typeMappings>
-                            <importMappings>InputStream=java.io.InputStream</importMappings>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            </plugin>            <plugin>
+            <groupId>org.openapitools</groupId>
+            <artifactId>openapi-generator-maven-plugin</artifactId>
+            <version>6.6.0</version>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>generate</goal>
+                    </goals>
+                    <configuration>
+                        <inputSpec>${project.basedir}/../server/impl/target/classes/com/walmartlabs/concord/server/swagger/swagger.yaml</inputSpec>
+                        <generatorName>java</generatorName>
+                        <apiPackage>com.walmartlabs.concord.client</apiPackage>
+                        <modelPackage>com.walmartlabs.concord.client</modelPackage>
+                        <configOptions>
+                            <sourceFolder>src/gen/java/main</sourceFolder>
+                            <dateLibrary>java8</dateLibrary>
+                            <serializableModel>true</serializableModel>
+                            <openApiNullable>false</openApiNullable>
+                            <supportUrlQuery>false</supportUrlQuery>
+                        </configOptions>
+                        <skipValidateSpec>false</skipValidateSpec>
+                        <library>native</library>
+                        <generateApiTests>false</generateApiTests>
+                        <generateModelTests>false</generateModelTests>
+                        <generateApiDocumentation>false</generateApiDocumentation>
+                        <generateModelDocumentation>false</generateModelDocumentation>
+                        <generateSupportingFiles>true</generateSupportingFiles>
+                        <supportingFilesToGenerate>ApiClient.java,ApiResponse.java,ApiException.java,Pair.java</supportingFilesToGenerate>
+                        <templateDirectory>${project.basedir}/src/main/template</templateDirectory>
+                        <cleanupOutput>true</cleanupOutput>
+                        <typeMappings>string+binary=InputStream</typeMappings>
+                        <importMappings>InputStream=java.io.InputStream</importMappings>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+
 
             <plugin>
                 <groupId>org.revapi</groupId>

diff --git a/client/src/main/template/libraries/native/api.mustache b/client/src/main/template/libraries/native/api.mustache
@@ -16,9 +16,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.walmartlabs.concord.client.auth.Authentication;
 
 import org.apache.hc.core5.http.HttpEntity;
-import org.apache.http.NameValuePair;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.hc.core5.http.NameValuePair;
+import org.apache.hc.core5.http.message.BasicNameValuePair;
+import org.apache.hc.client5.http.entity.UrlEncodedFormEntity;
 
 {{#hasFormParamsInSpec}}
 {{/hasFormParamsInSpec}}