provide the annotation text and imports

Author: hauner

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

@@ -23,8 +23,7 @@ import io.openapiprocessor.core.model.datatypes.PropertyDataType
 class JacksonAnnotations(apiOptions: ApiOptions): JsonAnnotationFactory {
     private val jsonProperty: Annotation
     private val jsonCreator: Annotation
-    @Deprecated("use methods")
-    override val jsonValue: Annotation
+    private val jsonValue: Annotation
 
     init {
         when (getJacksonFormat(apiOptions)) {
@@ -63,6 +62,10 @@ class JacksonAnnotations(apiOptions: ApiOptions): JsonAnnotationFactory {
         return AnnotationData(jsonCreator.annotationName, jsonCreator.imports)
     }
 
+    override fun createValueAnnotation(): AnnotationData {
+        return AnnotationData(jsonValue.annotationName, jsonValue.imports)
+    }
+
     private fun createPropertyParameter(propertyName: String, access: PropertyAccess?): Collection<String> {
         return if (access != null) {
             listOf(

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

@@ -5,13 +5,9 @@
 
 package io.openapiprocessor.core.writer.java
 
-import io.openapiprocessor.core.model.Annotation
 import io.openapiprocessor.core.model.datatypes.PropertyDataType
 
 interface JsonAnnotationFactory {
-    @Deprecated(message = "use methods")
-    val jsonValue: Annotation
-
     /** get property annotations imports */
     fun createPropertyImports(propDataType: PropertyDataType): Collection<String>
     /** get property annotations */
@@ -24,4 +20,6 @@ interface JsonAnnotationFactory {
     fun createPropertyAnnotation(propertyName: String, propDataType: PropertyDataType): AnnotationData
     /** get creator annotation */
     fun createCreatorAnnotation(): AnnotationData
+    /** get value annotation */
+    fun createValueAnnotation(): AnnotationData
 }

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

@@ -58,11 +58,12 @@ open class StringEnumWriter(
             |
             """.trimMargin())
 
+        val jsonValue = jacksonAnnotations.createValueAnnotation()
         if(isSupplier()) {
-            collectedImports.addAll(jacksonAnnotations.jsonValue.imports)
+            collectedImports.addAll(jsonValue.imports)
             content.write(
                 """
-                |    @JsonValue
+                |    ${jsonValue.text}
                 |    public String get() {
                 |        return this.value;
                 |    }
@@ -72,10 +73,10 @@ open class StringEnumWriter(
 
         } else {
             // default
-            collectedImports.addAll(jacksonAnnotations.jsonValue.imports)
+            collectedImports.addAll(jsonValue.imports)
             content.write(
                 """
-                |    @JsonValue
+                |    ${jsonValue.text}
                 |    public String getValue() {
                 |        return this.value;
                 |    }

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/JacksonAnnotationsSpec.kt

@@ -23,8 +23,6 @@ class JacksonAnnotationsSpec: StringSpec({
 
         jackson.createPropertyImports(mockk<PropertyDataType>())
             .shouldContainExactly(setOf("com.fasterxml.jackson.annotation.JsonProperty"))
-
-        jackson.jsonValue.imports shouldContainExactly setOf("com.fasterxml.jackson.annotation.JsonValue")
     }
 
     "creates jackson creator annotation data" {
@@ -37,6 +35,16 @@ class JacksonAnnotationsSpec: StringSpec({
         annotation.imports shouldContainExactly setOf("com.fasterxml.jackson.annotation.JsonCreator")
     }
 
+    "creates jackson value annotation data" {
+        val options = ApiOptions()
+        val jackson = JacksonAnnotations(options)
+
+        val annotation = jackson.createValueAnnotation()
+
+        annotation.text shouldBe "@JsonValue"
+        annotation.imports shouldContainExactly setOf("com.fasterxml.jackson.annotation.JsonValue")
+    }
+
     "creates jackson property annotation data" {
         val options = ApiOptions()
         val jackson = JacksonAnnotations(options)
@@ -80,6 +88,6 @@ class JacksonAnnotationsSpec: StringSpec({
             .shouldContainExactly(setOf("tools.jackson.annotation.JsonProperty"))
 
         jackson.createCreatorAnnotation().imports shouldContainExactly setOf("tools.jackson.annotation.JsonCreator")
-        jackson.jsonValue.imports shouldContainExactly setOf("tools.jackson.annotation.JsonValue")
+        jackson.createValueAnnotation().imports shouldContainExactly setOf("tools.jackson.annotation.JsonValue")
     }
 })

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/writer/java/StringEnumWriterSpec.kt

@@ -39,7 +39,7 @@ class StringEnumWriterSpec : StringSpec({
         writer.write(target, dataType)
 
         verify { jackson.createCreatorAnnotation() }
-        verify { jackson.jsonValue }
+        verify { jackson.createValueAnnotation() }
     }
 
     "writes enum" {