Skip to content

Commit 5795831

Browse files
committed
less duplication
1 parent 0b314bd commit 5795831

1 file changed

Lines changed: 10 additions & 7 deletions

File tree

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/BeanValidationSupportedTypes.kt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,13 @@ class Array(): SupportedType {
112112
}
113113
}
114114

115+
116+
private const val JSON_NULLABLE = "org.openapitools.jackson.nullable.JsonNullable"
117+
115118
private val BOOLEAN_TYPES = listOf(
116119
Type("java.lang.Boolean"),
117120
Primitive("boolean"),
118-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
121+
AdditionalType(JSON_NULLABLE)
119122
)
120123

121124
private val NUMBER_TYPES = listOf(
@@ -133,7 +136,7 @@ private val NUMBER_TYPES = listOf(
133136
Primitive("long"),
134137
Primitive("float"),
135138
Primitive("double"),
136-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
139+
AdditionalType(JSON_NULLABLE)
137140
)
138141

139142
private val INTEGER_TYPES = listOf(
@@ -148,15 +151,15 @@ private val INTEGER_TYPES = listOf(
148151
Primitive("short"),
149152
Primitive("int"),
150153
Primitive("long"),
151-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
154+
AdditionalType(JSON_NULLABLE)
152155
)
153156

154157
private val LENGTH_TYPES = listOf(
155158
Type("java.lang.CharSequence"),
156159
Type("java.util.Collection"),
157160
Type("java.util.Map"),
158161
Array(),
159-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
162+
AdditionalType(JSON_NULLABLE)
160163
)
161164

162165
private val MAX_MIN_TYPES = listOf(
@@ -170,12 +173,12 @@ private val MAX_MIN_TYPES = listOf(
170173
Primitive("short"),
171174
Primitive("int"),
172175
Primitive("long"),
173-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
176+
AdditionalType(JSON_NULLABLE)
174177
)
175178

176179
private val EMAIL_TYPES = listOf(
177180
Type("java.lang.CharSequence"),
178-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
181+
AdditionalType(JSON_NULLABLE)
179182
)
180183

181184
private val ANY_TYPES = listOf(TypeAny())
@@ -197,7 +200,7 @@ private val PAST_TYPES = listOf(
197200
Type("java.time.JapaneseDate"),
198201
Type("java.time.MinguoDate"),
199202
Type("java.time.ThaiBuddhistDate"),
200-
AdditionalType("org.openapitools.jackson.nullable.JsonNullable")
203+
AdditionalType(JSON_NULLABLE)
201204
)
202205

203206
// not all annotation are supported/used by the BeanValidationFactory

0 commit comments

Comments
 (0)