Skip to content

Commit f12334d

Browse files
committed
new parameter required by core 2021.1
1 parent 5403165 commit f12334d

7 files changed

Lines changed: 37 additions & 22 deletions

File tree

src/main/kotlin/io/openapiprocessor/spring/model/parameters/QueryParameter.kt

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,13 @@ import io.openapiprocessor.core.model.datatypes.ObjectDataType
2727
*
2828
* @author Martin Hauner
2929
*/
30-
class QueryParameter(name: String, dataType: DataType, required: Boolean, deprecated: Boolean)
31-
: ParameterBase(name, dataType, required, deprecated) {
30+
class QueryParameter(
31+
name: String,
32+
dataType: DataType,
33+
required: Boolean = false,
34+
deprecated: Boolean = false,
35+
description: String? = null
36+
): ParameterBase(name, dataType, required, deprecated, description) {
3237

3338
/**
3439
* controls if a parameter should have a {@code @RequestParam} annotation.

src/test/groovy/com/github/hauner/openapi/spring/writer/java/CookieParameterAnnotationWriterSpec.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class CookieParameterAnnotationWriterSpec extends Specification {
2828
def target = new StringWriter()
2929

3030
void "write simple (required) cookie parameter" () {
31-
def param = new CookieParameter('foo', new StringDataType(), true, false)
31+
def param = new CookieParameter(
32+
'foo', new StringDataType(), true, false, null)
3233
3334
when:
3435
writer.write (target, param)
@@ -38,7 +39,8 @@ class CookieParameterAnnotationWriterSpec extends Specification {
3839
}
3940
4041
void "write simple (optional) cookie parameter" () {
41-
def param = new CookieParameter('foo', new StringDataType(), false, false)
42+
def param = new CookieParameter(
43+
'foo', new StringDataType(), false, false, null)
4244
4345
when:
4446
writer.write (target, param)
@@ -50,7 +52,7 @@ class CookieParameterAnnotationWriterSpec extends Specification {
5052
void "write simple (optional with default) cookie parameter" () {
5153
def param = new CookieParameter('foo',
5254
new StringDataType(createConstraints ('bar'), false),
53-
false, false)
55+
false, false, null)
5456
5557
when:
5658
writer.write (target, param)

src/test/groovy/com/github/hauner/openapi/spring/writer/java/HeaderParameterAnnotationWriterSpec.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class HeaderParameterAnnotationWriterSpec extends Specification {
2828
def target = new StringWriter()
2929

3030
void "write simple (required) header parameter" () {
31-
def param = new HeaderParameter('foo', new StringDataType(), true, false)
31+
def param = new HeaderParameter(
32+
'foo', new StringDataType(), true, false, null)
3233
3334
when:
3435
writer.write (target, param)
@@ -38,7 +39,8 @@ class HeaderParameterAnnotationWriterSpec extends Specification {
3839
}
3940
4041
void "write simple (optional) header parameter" () {
41-
def param = new HeaderParameter('foo', new StringDataType(), false, false)
42+
def param = new HeaderParameter(
43+
'foo', new StringDataType(), false, false, null)
4244
4345
when:
4446
writer.write (target, param)
@@ -50,7 +52,7 @@ class HeaderParameterAnnotationWriterSpec extends Specification {
5052
void "write simple (optional with default) header parameter" () {
5153
def param = new HeaderParameter('foo',
5254
new StringDataType(createConstraints ('bar'), false),
53-
false, false)
55+
false, false, null)
5456
5557
when:
5658
writer.write (target, param)

src/test/groovy/com/github/hauner/openapi/spring/writer/java/MappingAnnotationWriterSpec.groovy

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class MappingAnnotationWriterSpec extends Specification {
7474

7575
void "writes 'produces' parameter with response content type" () {
7676
def endpoint = createEndpoint (path: '/foo', method: HttpMethod.GET, responses: [
77-
'200' : [new Response (contentType, new StringDataType ())]
77+
'200' : [new Response (contentType, new StringDataType (), null)]
7878
])
7979

8080
when:
@@ -92,7 +92,7 @@ class MappingAnnotationWriterSpec extends Specification {
9292
void "writes 'consumes' & 'produces' parameters" () {
9393
def endpoint = createEndpoint (path: '/foo', method: HttpMethod.GET, responses: [
9494
'200' : [
95-
new Response (responseContentType, new StringDataType ())
95+
new Response (responseContentType, new StringDataType (), null)
9696
]
9797
], requestBodies: [
9898
new RequestBody('body', requestContentType, new StringDataType (),
@@ -113,10 +113,10 @@ class MappingAnnotationWriterSpec extends Specification {
113113
void "writes mapping annotation with multiple result content types" () {
114114
def endpoint = createEndpoint (path: '/foo', method: HttpMethod.GET, responses: [
115115
'200' : [
116-
new Response ('application/json', new StringDataType ())
116+
new Response ('application/json', new StringDataType (), null)
117117
],
118118
'default': [
119-
new Response ('text/plain', new StringDataType ())
119+
new Response ('text/plain', new StringDataType (), null)
120120
]
121121
])
122122

@@ -133,7 +133,8 @@ class MappingAnnotationWriterSpec extends Specification {
133133
properties.path as String ?: '',
134134
properties.method as HttpMethod ?: HttpMethod.GET,
135135
properties.operationId as String ?: null,
136-
properties.deprecated as boolean ?: false
136+
properties.deprecated as boolean ?: false,
137+
properties.description as String ?: null
137138
)
138139
ep.parameters = properties.parameters ?: []
139140
ep.responses = properties.responses ?: [:]

src/test/groovy/com/github/hauner/openapi/spring/writer/java/ParameterAnnotationWriterSpec.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class ParameterAnnotationWriterSpec extends Specification {
3838
void "writes simple (optional) query parameter with quoted string default value" () {
3939
def param = clazz.newInstance('foo',
4040
new StringDataType(createConstraints ('bar'), false),
41-
false, false)
41+
false, false, null)
4242
4343
when:
4444
writer.write (target, param)
@@ -57,7 +57,7 @@ class ParameterAnnotationWriterSpec extends Specification {
5757
void "writes simple (optional) query parameter with quoted number default value" () {
5858
def param = clazz.newInstance ('foo',
5959
new LongDataType (createConstraints (5), false),
60-
false, false)
60+
false, false, null)
6161
6262
when:
6363
writer.write (target, param)

src/test/groovy/com/github/hauner/openapi/spring/writer/java/PathParameterAnnotationWriterSpec.groovy

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class PathParameterAnnotationWriterSpec extends Specification {
2828
def target = new StringWriter()
2929

3030
void "write simple (required) path parameter" () {
31-
def param = new PathParameter('foo', new StringDataType(), true, false)
31+
def param = new PathParameter(
32+
'foo', new StringDataType(), true, false, null)
3233
3334
when:
3435
writer.write (target, param)
@@ -38,7 +39,8 @@ class PathParameterAnnotationWriterSpec extends Specification {
3839
}
3940
4041
void "write simple (optional) path parameter" () {
41-
def param = new PathParameter('foo', new StringDataType(), false, false)
42+
def param = new PathParameter(
43+
'foo', new StringDataType(), false, false, null)
4244
4345
when:
4446
writer.write (target, param)
@@ -50,7 +52,7 @@ class PathParameterAnnotationWriterSpec extends Specification {
5052
void "write simple (optional with default) path parameter" () {
5153
def param = new PathParameter('foo',
5254
new StringDataType(createConstraints ('bar'), false),
53-
false, false)
55+
false, false, null)
5456
5557
when:
5658
writer.write (target, param)

src/test/groovy/com/github/hauner/openapi/spring/writer/java/QueryParameterAnnotationWriterSpec.groovy

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class QueryParameterAnnotationWriterSpec extends Specification {
2929
def target = new StringWriter()
3030

3131
void "write simple (required) query parameter" () {
32-
def param = new QueryParameter('foo', new StringDataType(), true, false)
32+
def param = new QueryParameter(
33+
'foo', new StringDataType(), true, false, null)
3334
3435
when:
3536
writer.write (target, param)
@@ -39,7 +40,8 @@ class QueryParameterAnnotationWriterSpec extends Specification {
3940
}
4041
4142
void "write simple (optional) query parameter" () {
42-
def param = new QueryParameter('foo', new StringDataType(), false, false)
43+
def param = new QueryParameter(
44+
'foo', new StringDataType(), false, false, null)
4345
4446
when:
4547
writer.write (target, param)
@@ -51,7 +53,7 @@ class QueryParameterAnnotationWriterSpec extends Specification {
5153
void "write simple (optional with default) query parameter" () {
5254
def param = new QueryParameter('foo',
5355
new StringDataType(new DataTypeConstraints(defaultValue: 'bar'), false),
54-
false, false)
56+
false, false, null)
5557
5658
when:
5759
writer.write (target, param)
@@ -68,7 +70,8 @@ class QueryParameterAnnotationWriterSpec extends Specification {
6870
foo1: new StringDataType (),
6971
foo2: new StringDataType ()
7072
], null, false
71-
), false, false)
73+
), false, false, null
74+
)
7275
7376
when:
7477
writer.write (target, param)

0 commit comments

Comments
 (0)