From c24f09eed2e38d5e36ef5689e9e535c085b4d2fc Mon Sep 17 00:00:00 2001 From: Jacob Burroughs Date: Thu, 25 Apr 2024 18:31:45 -0500 Subject: [PATCH] Allow putting OpenApi annotations on fields in addition to methods --- gradlew | 0 .../io/javalin/openapi/OpenApiAnnotations.kt | 22 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/openapi-specification/src/main/kotlin/io/javalin/openapi/OpenApiAnnotations.kt b/openapi-specification/src/main/kotlin/io/javalin/openapi/OpenApiAnnotations.kt index 4282a21..f8b98b3 100644 --- a/openapi-specification/src/main/kotlin/io/javalin/openapi/OpenApiAnnotations.kt +++ b/openapi-specification/src/main/kotlin/io/javalin/openapi/OpenApiAnnotations.kt @@ -160,21 +160,21 @@ annotation class OpenApiSecurity( val scopes: Array = [] ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiIgnore -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiRequired -@Target(CLASS, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(CLASS, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiName( val value: String ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiExample( val value: String = NULL_STRING, @@ -189,14 +189,14 @@ annotation class OpenApiExampleProperty( val objects: Array = [] ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) @CustomAnnotation annotation class OpenApiNullable( val nullable: Boolean = true ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, CLASS) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD, CLASS) @Retention(RUNTIME) annotation class OpenApiDescription( val value: String @@ -208,7 +208,7 @@ enum class Nullability { AUTO } -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiNumberValidation( val minimum: String = NULL_STRING, @@ -218,7 +218,7 @@ annotation class OpenApiNumberValidation( val multipleOf: String = NULL_STRING ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiStringValidation( val minLength: String = NULL_STRING, @@ -227,7 +227,7 @@ annotation class OpenApiStringValidation( val pattern: String = NULL_STRING ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiArrayValidation( val minItems: String = NULL_STRING, @@ -235,14 +235,14 @@ annotation class OpenApiArrayValidation( val uniqueItems: Boolean = false ) -@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiObjectValidation( val minProperties: String = NULL_STRING, val maxProperties: String = NULL_STRING, ) -@Target(CLASS, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER) +@Target(CLASS, FUNCTION, PROPERTY_GETTER, PROPERTY_SETTER, FIELD) @Retention(RUNTIME) annotation class OpenApiPropertyType( val definedBy: KClass<*>,