better name

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/MappingAnnotationWriter.kt renamed to openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/writer/java/MappingAnnotationFactory.kt

@@ -7,15 +7,10 @@ package io.openapiprocessor.core.writer.java
 
 import io.openapiprocessor.core.model.Endpoint
 import io.openapiprocessor.core.model.EndpointResponse
-import java.io.Writer
 
 /**
- * mapping annotation writer interface.
+ * mapping annotation factory.
  */
-// TODO rename to factory
-interface MappingAnnotationWriter {
-    @Deprecated("remove, use create()")
-    fun write (target: Writer, endpoint: Endpoint, endpointResponse: EndpointResponse)
-
+interface MappingAnnotationFactory {
     fun create(endpoint: Endpoint, endpointResponse: EndpointResponse): List<String>
 }

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

@@ -18,7 +18,7 @@ import io.openapiprocessor.core.support.LF
 import io.openapiprocessor.core.support.capitalizeFirstChar
 import io.openapiprocessor.core.support.indent
 import io.openapiprocessor.core.writer.Identifier
-import io.openapiprocessor.core.writer.java.MappingAnnotationWriter as CoreMappingAnnotationWriter
+import io.openapiprocessor.core.writer.java.MappingAnnotationFactory as CoreMappingAnnotationFactory
 import io.openapiprocessor.core.writer.java.ParameterAnnotationWriter as CoreParameterAnnotationWriter
 import io.openapiprocessor.core.writer.java.StatusAnnotationWriter as CoreStatusAnnotationWriter
 import java.io.StringWriter
@@ -31,7 +31,7 @@ open class MethodWriter(
     private val apiOptions: ApiOptions,
     private val identifier: Identifier,
     private val statusAnnotationWriter: CoreStatusAnnotationWriter,
-    private val mappingAnnotationWriter: CoreMappingAnnotationWriter,
+    private val mappingAnnotationFactory: CoreMappingAnnotationFactory,
     private val parameterAnnotationWriter: CoreParameterAnnotationWriter,
     private val beanValidationFactory: BeanValidationFactory,
     private val javadocFactory: JavaDocFactory = JavaDocFactory(identifier)
@@ -113,7 +113,7 @@ open class MethodWriter(
     }
 
     private fun createMappingAnnotations(endpoint: Endpoint, endpointResponse: EndpointResponse): List<String> {
-        return mappingAnnotationWriter.create(endpoint, endpointResponse)
+        return mappingAnnotationFactory.create(endpoint, endpointResponse)
     }
 
     private fun createResult(endpoint: Endpoint, endpointResponse: EndpointResponse): String {

openapi-processor-core/src/test/groovy/io/openapiprocessor/core/converter/ApiConverterGSpec.groovy

@@ -128,7 +128,7 @@ paths:
                 options,
                 identifier,
                 Stub(StatusAnnotationWriter),
-                Stub (MappingAnnotationWriter),
+                Stub (MappingAnnotationFactory),
                 Stub (ParameterAnnotationWriter),
                 Stub (BeanValidationFactory),
                 Stub (JavaDocFactory)),

openapi-processor-core/src/test/groovy/io/openapiprocessor/core/writer/java/MethodWriterGSpec.groovy

@@ -5,7 +5,7 @@
 
 package io.openapiprocessor.core.writer.java
 
-import io.openapiprocessor.core.support.TestMappingAnnotationWriter
+import io.openapiprocessor.core.support.TestMappingAnnotationFactory
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.converter.mapping.SimpleParameterValue
 import io.openapiprocessor.core.parser.HttpMethod
@@ -28,7 +28,7 @@ class MethodWriterGSpec extends Specification {
         apiOptions,
         identifier,
         new TestStatusAnnotationWriter(),
-        new TestMappingAnnotationWriter(),
+        new TestMappingAnnotationFactory(),
         new TestParameterAnnotationWriter(),
         Stub (BeanValidationFactory),
         Stub (JavaDocFactory))
@@ -181,7 +181,7 @@ class MethodWriterGSpec extends Specification {
             apiOptions,
             identifier,
             new TestStatusAnnotationWriter(),
-            new TestMappingAnnotationWriter(),
+            new TestMappingAnnotationFactory(),
             Stub (ParameterAnnotationWriter) {},
             Stub (BeanValidationFactory),
             Stub (JavaDocFactory))

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/TestMappingAnnotationWriter.kt renamed to openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/support/TestMappingAnnotationFactory.kt

@@ -7,16 +7,9 @@ package io.openapiprocessor.core.support
 
 import io.openapiprocessor.core.model.Endpoint
 import io.openapiprocessor.core.model.EndpointResponse
-import io.openapiprocessor.core.writer.java.MappingAnnotationWriter
-import java.io.Writer
+import io.openapiprocessor.core.writer.java.MappingAnnotationFactory
 
-// todo rename to Factory
-class TestMappingAnnotationWriter: MappingAnnotationWriter {
-
-    @Deprecated("remove, use create()")
-    override fun write(target: Writer, endpoint: Endpoint, endpointResponse: EndpointResponse) {
-        target.write ("@CoreMapping")
-    }
+class TestMappingAnnotationFactory: MappingAnnotationFactory {
 
     override fun create(endpoint: Endpoint, endpointResponse: EndpointResponse): List<String> {
         return listOf("@CoreMapping")

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

@@ -15,7 +15,7 @@ import io.openapiprocessor.core.model.datatypes.MappedDataType
 import io.openapiprocessor.core.model.datatypes.ObjectDataType
 import io.openapiprocessor.core.model.parameters.ParameterBase
 import io.openapiprocessor.core.support.TestStatusAnnotationWriter
-import io.openapiprocessor.core.support.TestMappingAnnotationWriter
+import io.openapiprocessor.core.support.TestMappingAnnotationFactory
 import io.openapiprocessor.core.support.TestParameterAnnotationWriter
 import io.openapiprocessor.core.support.parseOptions
 import java.io.StringWriter
@@ -28,7 +28,7 @@ class MethodWriterAnnotationSpec: StringSpec ({
             options,
             JavaIdentifier(),
             TestStatusAnnotationWriter(),
-            TestMappingAnnotationWriter(),
+            TestMappingAnnotationFactory(),
             TestParameterAnnotationWriter(),
             BeanValidationFactory(options)
         )

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

@@ -15,7 +15,7 @@ import io.openapiprocessor.core.model.datatypes.ResultDataType
 import io.openapiprocessor.core.model.datatypes.StringDataType
 import io.openapiprocessor.core.parser.HttpMethod
 import io.openapiprocessor.core.support.TestStatusAnnotationWriter
-import io.openapiprocessor.core.support.TestMappingAnnotationWriter
+import io.openapiprocessor.core.support.TestMappingAnnotationFactory
 import io.openapiprocessor.core.support.TestParameterAnnotationWriter
 import io.openapiprocessor.core.support.parseOptions
 import java.io.StringWriter
@@ -27,7 +27,7 @@ class MethodWriterResponseStyleSpec: FreeSpec() {
             options,
             JavaIdentifier(),
             TestStatusAnnotationWriter(),
-            TestMappingAnnotationWriter(),
+            TestMappingAnnotationFactory(),
             TestParameterAnnotationWriter(),
             mockk<BeanValidationFactory>(),
             mockk<JavaDocFactory>()

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

@@ -15,7 +15,7 @@ import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.model.parameters.ParameterBase
 import io.openapiprocessor.core.processor.mapping.v2.ResultStyle
 import io.openapiprocessor.core.support.TestStatusAnnotationWriter
-import io.openapiprocessor.core.support.TestMappingAnnotationWriter
+import io.openapiprocessor.core.support.TestMappingAnnotationFactory
 import io.openapiprocessor.core.support.TestParameterAnnotationWriter
 import io.openapiprocessor.core.support.datatypes.CollectionDataType
 import java.io.StringWriter
@@ -30,7 +30,7 @@ class MethodWriterSpec: StringSpec({
         apiOptions,
         identifier,
         TestStatusAnnotationWriter(),
-        TestMappingAnnotationWriter(),
+        TestMappingAnnotationFactory(),
         TestParameterAnnotationWriter(),
         BeanValidationFactory(apiOptions))
 

openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/TestProcessor.kt

@@ -65,7 +65,7 @@ class TestProcessor:
                         options,
                         identifier,
                         TestProcessorStatusAnnotationWriter(),
-                        TestProcessorMappingAnnotationWriter(),
+                        TestProcessorMappingAnnotationFactory(),
                         TestProcessorParameterAnnotationWriter(),
                         beanValidation,
                         javaDocFactory

openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/TestProcessorMappingAnnotationWriter.kt renamed to openapi-processor-core/src/testInt/kotlin/io/openapiprocessor/core/TestProcessorMappingAnnotationFactory.kt

@@ -7,19 +7,12 @@ package io.openapiprocessor.core
 
 import io.openapiprocessor.core.model.Endpoint
 import io.openapiprocessor.core.model.EndpointResponse
-import io.openapiprocessor.core.writer.java.MappingAnnotationWriter
-import java.io.Writer
+import io.openapiprocessor.core.writer.java.MappingAnnotationFactory
 
 /**
- * simple [io.openapiprocessor.core.writer.java.MappingAnnotationWriter] implementation for testing.
+ * simple [io.openapiprocessor.core.writer.java.MappingAnnotationFactory] implementation for testing.
  */
-// todo rename to factory
-class TestProcessorMappingAnnotationWriter: MappingAnnotationWriter {
-
-    @Deprecated("remove, use create()")
-    override fun write(target: Writer, endpoint: Endpoint, endpointResponse: EndpointResponse) {
-        target.write ("""${MAPPING.annotationName}("${endpoint.path}")""")
-    }
+class TestProcessorMappingAnnotationFactory: MappingAnnotationFactory {
 
     override fun create(endpoint: Endpoint, endpointResponse: EndpointResponse): List<String> {
         return listOf("""${MAPPING.annotationName}("${endpoint.path}")""")