Skip to content

Commit 926a07f

Browse files
authored
Add tests for @Valid (enum) (#18664)
* add tests for #18430 * add new filies
1 parent d5559d5 commit 926a07f

File tree

7 files changed

+535
-0
lines changed

7 files changed

+535
-0
lines changed

modules/openapi-generator/src/test/resources/3_0/jaxrs-spec/petstore-with-fake-endpoints-models-for-testing.yaml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,38 @@ paths:
13031303
responses:
13041304
200:
13051305
description: The instance started successfully
1306+
/fake/tests/defaults:
1307+
get:
1308+
tags:
1309+
- fake
1310+
summary: test enum default in request body
1311+
operationId: fake-tests-defaults
1312+
responses:
1313+
default:
1314+
description: response
1315+
content:
1316+
application/json:
1317+
schema:
1318+
type: object
1319+
properties:
1320+
stringEnum:
1321+
$ref: '#/components/schemas/StringEnum'
1322+
integerEnum:
1323+
$ref: '#/components/schemas/IntegerEnum'
1324+
stringEnumInline:
1325+
type: string
1326+
enum:
1327+
- foo
1328+
- bar
1329+
- baz
1330+
default: foo
1331+
integerEnumInline:
1332+
type: integer
1333+
enum:
1334+
- 1
1335+
- 2
1336+
- 3
1337+
default: 1
13061338
servers:
13071339
- url: 'http://{server}.swagger.io:{port}/v2'
13081340
description: petstore server
@@ -2061,3 +2093,17 @@ components:
20612093
enum:
20622094
- admin
20632095
- user
2096+
StringEnum:
2097+
type: string
2098+
enum:
2099+
- foo
2100+
- bar
2101+
- baz
2102+
default: foo
2103+
IntegerEnum:
2104+
type: integer
2105+
enum:
2106+
- 1
2107+
- 2
2108+
- 3
2109+
default: 1

samples/server/petstore/jaxrs-spec/.openapi-generator/FILES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ src/gen/java/org/openapitools/model/EnumArrays.java
2727
src/gen/java/org/openapitools/model/EnumClass.java
2828
src/gen/java/org/openapitools/model/EnumTest.java
2929
src/gen/java/org/openapitools/model/FakeBigDecimalMap200Response.java
30+
src/gen/java/org/openapitools/model/FakeTestsDefaultsDefaultResponse.java
3031
src/gen/java/org/openapitools/model/FileSchemaTestClass.java
3132
src/gen/java/org/openapitools/model/Foo.java
3233
src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
3334
src/gen/java/org/openapitools/model/FormatTest.java
3435
src/gen/java/org/openapitools/model/HasOnlyReadOnly.java
3536
src/gen/java/org/openapitools/model/HealthCheckResult.java
37+
src/gen/java/org/openapitools/model/IntegerEnum.java
3638
src/gen/java/org/openapitools/model/MapTest.java
3739
src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
3840
src/gen/java/org/openapitools/model/Model200Response.java
@@ -56,6 +58,7 @@ src/gen/java/org/openapitools/model/Pet.java
5658
src/gen/java/org/openapitools/model/ReadOnlyFirst.java
5759
src/gen/java/org/openapitools/model/SingleRefType.java
5860
src/gen/java/org/openapitools/model/SpecialModelName.java
61+
src/gen/java/org/openapitools/model/StringEnum.java
5962
src/gen/java/org/openapitools/model/Tag.java
6063
src/gen/java/org/openapitools/model/TestInlineFreeformAdditionalPropertiesRequest.java
6164
src/gen/java/org/openapitools/model/User.java

samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Date;
77
import org.openapitools.model.EnumClass;
88
import org.openapitools.model.FakeBigDecimalMap200Response;
9+
import org.openapitools.model.FakeTestsDefaultsDefaultResponse;
910
import java.io.File;
1011
import org.openapitools.model.FileSchemaTestClass;
1112
import org.openapitools.model.HealthCheckResult;
@@ -133,6 +134,17 @@ public Response fakePropertyEnumIntegerSerialize(@Valid @NotNull OuterObjectWith
133134
return Response.ok().entity("magic!").build();
134135
}
135136

137+
@GET
138+
@Path("/tests/defaults")
139+
@Produces({ "application/json" })
140+
@ApiOperation(value = "test enum default in request body", notes = "", response = FakeTestsDefaultsDefaultResponse.class, tags={ "fake" })
141+
@ApiResponses(value = {
142+
@ApiResponse(code = 200, message = "response", response = FakeTestsDefaultsDefaultResponse.class)
143+
})
144+
public Response fakeTestsDefaults() {
145+
return Response.ok().entity("magic!").build();
146+
}
147+
136148
@POST
137149
@Path("/additionalProperties-reference")
138150
@Consumes({ "application/json" })

0 commit comments

Comments
 (0)