update to changes in core

Author: hauner

gradle/libs.versions.toml

@@ -8,8 +8,8 @@ jacoco = "0.8.7"
 
 [libraries]
 openapi-processor-api = "io.openapiprocessor:openapi-processor-api:2021.1"
-openapi-processor-test = "io.openapiprocessor:openapi-processor-test:2022.4"
-openapi-processor-core = "io.openapiprocessor:openapi-processor-core:2022.6"
+openapi-processor-test = "io.openapiprocessor:openapi-processor-test:2022.7-SNAPSHOT"
+openapi-processor-core = "io.openapiprocessor:openapi-processor-core:2022.7-SNAPSHOT"
 
 jackson-bom = "com.fasterxml.jackson:jackson-bom:2.13.4"
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }

src/main/kotlin/io/openapiprocessor/spring/processor/SpringProcessor.kt

@@ -3,15 +3,14 @@
  * PDX-License-Identifier: Apache-2.0
  */
 
-@file:Suppress("DEPRECATION")
-
 package io.openapiprocessor.spring.processor
 
-import io.openapiprocessor.api.OpenApiProcessor
 import io.openapiprocessor.core.converter.ApiConverter
 import io.openapiprocessor.core.converter.ApiOptions
 import io.openapiprocessor.core.converter.OptionsConverter
 import io.openapiprocessor.core.parser.Parser
+import io.openapiprocessor.core.writer.ProcessingException
+import io.openapiprocessor.core.writer.WriterFactory
 import io.openapiprocessor.core.writer.java.*
 import io.openapiprocessor.spring.Version
 import io.openapiprocessor.spring.writer.java.MappingAnnotationWriter
@@ -21,17 +20,13 @@ import org.slf4j.LoggerFactory
 import java.time.OffsetDateTime
 
 /**
- *  Entry point of openapi-processor-spring.
+ *  openapi-processor-spring.
  */
-class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProcessor {
+class SpringProcessor(private val writerFactory: WriterFactory) {
     private val log: Logger = LoggerFactory.getLogger(this.javaClass.name)
     private var testMode = false
 
-    override fun getName(): String {
-        return "spring"
-    }
-
-    override fun run(processorOptions: MutableMap<String, *>) {
+    fun run(processorOptions: MutableMap<String, *>) {
         try {
             val parser = Parser()
             val openapi = parser.parse(processorOptions)
@@ -77,13 +72,15 @@ class SpringProcessor: OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProce
                     options,
                     generatedWriter,
                     javaDocWriter
-                )
+                ),
+                GoogleFormatter(),
+                writerFactory
             )
 
             writer.write (api)
-        } catch (e: Exception) {
-            log.error("processing failed!", e)
-            throw e
+        } catch (ex: Exception) {
+            log.error("processing failed!", ex)
+            throw ProcessingException(ex)
         }
     }
 

src/main/kotlin/io/openapiprocessor/spring/processor/SpringService.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 https://github.com/openapi-processor/openapi-processor-spring
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+@file:Suppress("DEPRECATION")
+
+package io.openapiprocessor.spring.processor
+
+import io.openapiprocessor.api.OpenApiProcessor
+import io.openapiprocessor.core.writer.DefaultWriterFactory
+
+/**
+ *  Entry point of openapi-processor-spring loaded via [java.util.ServiceLoader].
+ */
+class SpringService(private val testMode: Boolean = false)
+    : OpenApiProcessor, io.openapiprocessor.api.v1.OpenApiProcessor {
+
+    override fun getName(): String {
+        return "spring"
+    }
+
+    override fun run(processorOptions: MutableMap<String, *>) {
+        try {
+            val processor = SpringProcessor(DefaultWriterFactory())
+            if (testMode) {
+                processor.enableTestMode()
+            }
+            processor.run(processorOptions)
+
+        } catch (ex: Exception) {
+            throw ex
+        }
+    }
+}

src/main/resources/META-INF/services/com.github.hauner.openapi.api.OpenApiProcessor

@@ -1 +1,2 @@
-io.openapiprocessor.spring.processor.SpringProcessor
+io.openapiprocessor.spring.processor.SpringService
+

src/main/resources/META-INF/services/io.openapiprocessor.api.OpenApiProcessor

@@ -1 +1,2 @@
-io.openapiprocessor.spring.processor.SpringProcessor
+io.openapiprocessor.spring.processor.SpringService
+

src/main/resources/META-INF/services/io.openapiprocessor.api.v1.OpenApiProcessor

@@ -1 +1 @@
-io.openapiprocessor.spring.processor.SpringProcessor
+io.openapiprocessor.spring.processor.SpringService

src/testInt/kotlin/io/openapiprocessor/spring/ProcessorTestSetsSupport.kt

@@ -6,7 +6,7 @@
 package io.openapiprocessor.spring
 
 import io.openapiprocessor.core.parser.ParserType
-import io.openapiprocessor.spring.processor.SpringProcessor
+import io.openapiprocessor.spring.processor.SpringService
 import io.openapiprocessor.test.TestSet
 
 
@@ -22,8 +22,7 @@ fun testSet(
     inputs: String = "inputs.yaml",
     generated: String = "generated.yaml"): TestSet {
 
-    val processor = SpringProcessor()
-    processor.enableTestMode()
+    val processor = SpringService(true)
 
     val testSet = TestSet()
     testSet.name = name