Skip to content

Commit fbbe64e

Browse files
jochenrjochenr
committed
fix: #10618 make samples compile and switch jandex-maven-plugin
1 parent 7d7b9dd commit fbbe64e

25 files changed

Lines changed: 42 additions & 39 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/api_test.mustache‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ package {{package}};
44

55
{{#imports}}import {{import}};
66
{{/imports}}
7+
{{#isFile}}
8+
import java.io.File;
9+
{{/isFile}}
710
import org.junit.jupiter.api.BeforeEach;
811
import org.junit.jupiter.api.Test;
912
import org.junit.jupiter.api.Assertions;
@@ -70,7 +73,7 @@ public class {{classname}}Test {
7073
public void {{operationId}}Test() {
7174
// TODO: test validations
7275
{{#allParams}}
73-
{{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}org.apache.cxf.jaxrs.ext.multipart.Attachment {{paramName}} = null;{{/isFile}}
76+
{{^isFile}}{{{dataType}}} {{paramName}} = null;{{/isFile}}{{#isFile}}File {{paramName}} = null;{{/isFile}}
7477
{{/allParams}}
7578
//{{^vendorExtensions.x-java-is-response-void}}{{#microprofileMutiny}}Uni<{{{returnType}}}>{{/microprofileMutiny}}{{^microprofileMutiny}}{{{returnType}}}{{/microprofileMutiny}} response = {{/vendorExtensions.x-java-is-response-void}}api.{{operationId}}({{#allParams}}{{paramName}}{{^-last}}, {{/-last}}{{/allParams}});
7679
//{{#returnType}}Assertions.assertNotNull(response);{{/returnType}}

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/formParams.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") Attachment {{paramName}}Detail{{/isFile}}{{/isFormParam}}
1+
{{#isFormParam}}{{^isFile}}{{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}} {{#required}}{{#useBeanValidation}}@NotNull {{/useBeanValidation}}{{/required}}@FormParam("{{baseName}}") File {{paramName}}Detail{{/isFile}}{{/isFormParam}}

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<sourceDirectory>src/main/java</sourceDirectory>
1313
<plugins>
1414
<plugin>
15-
<groupId>org.jboss.jandex</groupId>
15+
<groupId>io.smallrye</groupId>
1616
<artifactId>jandex-maven-plugin</artifactId>
1717
<version>${jandex.maven.plugin.version}</version>
1818
<executions>
@@ -239,7 +239,7 @@
239239
<jaxb.core.version>2.2.11</jaxb.core.version>
240240
<jaxb.impl.version>2.2.11</jaxb.impl.version>
241241
<hibernate.validator.version>5.2.2.Final</hibernate.validator.version>
242-
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
242+
<jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
243243
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
244244
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
245245
{{#microprofileMutiny}}

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pom_3.0.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<sourceDirectory>src/main/java</sourceDirectory>
1313
<plugins>
1414
<plugin>
15-
<groupId>org.jboss.jandex</groupId>
15+
<groupId>io.smallrye</groupId>
1616
<artifactId>jandex-maven-plugin</artifactId>
1717
<version>${jandex.maven.plugin.version}</version>
1818
<executions>
@@ -239,7 +239,7 @@
239239
<jaxb.core.version>3.0.2</jaxb.core.version>
240240
<jaxb.impl.version>3.0.2</jaxb.impl.version>
241241
<hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
242-
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
242+
<jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
243243
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
244244
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
245245
{{#microprofileMutiny}}

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<sourceDirectory>src/main/java</sourceDirectory>
1111
<plugins>
1212
<plugin>
13-
<groupId>org.jboss.jandex</groupId>
13+
<groupId>io.smallrye</groupId>
1414
<artifactId>jandex-maven-plugin</artifactId>
1515
<version>${jandex.maven.plugin.version}</version>
1616
<executions>
@@ -170,7 +170,7 @@
170170
<jaxb.core.version>3.0.2</jaxb.core.version>
171171
<jaxb.impl.version>3.0.2</jaxb.impl.version>
172172
<hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
173-
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
173+
<jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
174174
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
175175
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
176176
</properties>

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/api/PetApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,5 @@ public interface PetApi {
133133
@Path("/{petId}/uploadImage")
134134
@Consumes({ "multipart/form-data" })
135135
@Produces({ "application/json" })
136-
ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
136+
ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
137137
}

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<sourceDirectory>src/main/java</sourceDirectory>
1111
<plugins>
1212
<plugin>
13-
<groupId>org.jboss.jandex</groupId>
13+
<groupId>io.smallrye</groupId>
1414
<artifactId>jandex-maven-plugin</artifactId>
1515
<version>${jandex.maven.plugin.version}</version>
1616
<executions>
@@ -165,7 +165,7 @@
165165
<jaxb.core.version>3.0.2</jaxb.core.version>
166166
<jaxb.impl.version>3.0.2</jaxb.impl.version>
167167
<hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
168-
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
168+
<jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
169169
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
170170
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
171171
<commons.lang3.version>3.17.0</commons.lang3.version>

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/FakeApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public interface FakeApi {
154154
@POST
155155

156156
@Consumes({ "application/x-www-form-urlencoded" })
157-
void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") Attachment binaryDetail, @FormParam("date") Date date, @FormParam("dateTime") Date dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
157+
void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binaryDetail, @FormParam("date") Date date, @FormParam("dateTime") Date dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
158158

159159
/**
160160
* To test enum parameters

‎samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/api/PetApi.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public interface PetApi {
132132
@Path("/pet/{petId}/uploadImage")
133133
@Consumes({ "multipart/form-data" })
134134
@Produces({ "application/json" })
135-
ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") Attachment _fileDetail) throws ApiException, ProcessingException;
135+
ModelApiResponse uploadFile(@PathParam("petId") Long petId, @FormParam("additionalMetadata") String additionalMetadata, @FormParam("file") File _fileDetail) throws ApiException, ProcessingException;
136136

137137
/**
138138
* uploads an image (required)
@@ -144,5 +144,5 @@ public interface PetApi {
144144
@Path("/fake/{petId}/uploadImageWithRequiredFile")
145145
@Consumes({ "multipart/form-data" })
146146
@Produces({ "application/json" })
147-
ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam("requiredFile") Attachment requiredFileDetail, @FormParam("additionalMetadata") String additionalMetadata) throws ApiException, ProcessingException;
147+
ModelApiResponse uploadFileWithRequiredFile(@PathParam("petId") Long petId, @FormParam("requiredFile") File requiredFileDetail, @FormParam("additionalMetadata") String additionalMetadata) throws ApiException, ProcessingException;
148148
}

‎samples/client/petstore/java/microprofile-rest-client-3.0-mutiny/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<sourceDirectory>src/main/java</sourceDirectory>
1111
<plugins>
1212
<plugin>
13-
<groupId>org.jboss.jandex</groupId>
13+
<groupId>io.smallrye</groupId>
1414
<artifactId>jandex-maven-plugin</artifactId>
1515
<version>${jandex.maven.plugin.version}</version>
1616
<executions>
@@ -172,7 +172,7 @@
172172
<jaxb.core.version>3.0.2</jaxb.core.version>
173173
<jaxb.impl.version>3.0.2</jaxb.impl.version>
174174
<hibernate.validator.version>7.0.4.Final</hibernate.validator.version>
175-
<jandex.maven.plugin.version>1.1.0</jandex.maven.plugin.version>
175+
<jandex.maven.plugin.version>3.2.7</jandex.maven.plugin.version>
176176
<maven.failsafe.plugin.version>2.6</maven.failsafe.plugin.version>
177177
<build.helper.maven.plugin.version>1.9.1</build.helper.maven.plugin.version>
178178
<mutiny.version>1.10.0</mutiny.version>

0 commit comments

Comments
 (0)