kotlin:S6515

Author: hauner

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/converter/ApiConverter.kt

@@ -14,7 +14,7 @@ import io.openapiprocessor.core.model.*
 import io.openapiprocessor.core.model.datatypes.*
 import io.openapiprocessor.core.parser.*
 import io.openapiprocessor.core.parser.HttpMethod
-import io.openapiprocessor.core.parser.NullSchema.Companion.nullSchema
+import io.openapiprocessor.core.parser.NullSchema
 import io.openapiprocessor.core.parser.RequestBody
 import io.openapiprocessor.core.parser.Response
 import io.openapiprocessor.core.writer.Identifier
@@ -335,7 +335,7 @@ class  ApiConverter(
                 SchemaInfo.Endpoint(ctx.path, operation.getMethod()),
                 "",
                 "",
-                nullSchema,
+                NullSchema,
                 ctx.resolver)
 
             val dataType = NoneDataType()

openapi-processor-core/src/main/kotlin/io/openapiprocessor/core/parser/NullSchema.kt

@@ -5,11 +5,7 @@
 
 package io.openapiprocessor.core.parser
 
-
-class NullSchema private constructor(): Schema {
-    companion object {
-        val nullSchema: NullSchema = NullSchema()
-    }
+object NullSchema: Schema {
 
     override fun getType(): String? {
         return null

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/converter/wrapper/NullDataTypeWrapperSpec.kt

@@ -14,7 +14,7 @@ import io.openapiprocessor.core.converter.MappingFinder
 import io.openapiprocessor.core.converter.SchemaInfo
 import io.openapiprocessor.core.model.datatypes.StringDataType
 import io.openapiprocessor.core.parser.HttpMethod
-import io.openapiprocessor.core.parser.NullSchema.Companion.nullSchema
+import io.openapiprocessor.core.parser.NullSchema
 import io.openapiprocessor.core.parser.RefResolver
 import io.openapiprocessor.core.support.parseOptions
 
@@ -28,7 +28,7 @@ class NullDataTypeWrapperSpec : StringSpec({
         val wrapper = NullDataTypeWrapper(options, MappingFinder(options))
 
         val info = SchemaInfo(
-            SchemaInfo.Endpoint("/any", HttpMethod.GET), "", "", nullSchema, resolver
+            SchemaInfo.Endpoint("/any", HttpMethod.GET), "", "", NullSchema, resolver
         )
         val dataType = StringDataType()
 
@@ -47,7 +47,7 @@ class NullDataTypeWrapperSpec : StringSpec({
         val wrapper = NullDataTypeWrapper(options, MappingFinder(options))
 
         val info = SchemaInfo(
-            SchemaInfo.Endpoint("/any", HttpMethod.GET), "", "", nullSchema, resolver
+            SchemaInfo.Endpoint("/any", HttpMethod.GET), "", "", NullSchema, resolver
         )
         val dataType = StringDataType()
 
@@ -69,7 +69,7 @@ class NullDataTypeWrapperSpec : StringSpec({
         val wrapper = NullDataTypeWrapper(options, MappingFinder(options))
 
         val info = SchemaInfo(
-            SchemaInfo.Endpoint("/any", HttpMethod.PATCH), "", "", nullSchema, resolver
+            SchemaInfo.Endpoint("/any", HttpMethod.PATCH), "", "", NullSchema, resolver
         )
         val dataType = StringDataType()
 

openapi-processor-core/src/test/kotlin/io/openapiprocessor/core/model/datatypes/LazyDataTypeSpec.kt

@@ -13,7 +13,7 @@ import io.mockk.mockk
 import io.openapiprocessor.core.converter.SchemaInfo
 import io.openapiprocessor.core.model.DataTypes
 import io.openapiprocessor.core.parser.HttpMethod
-import io.openapiprocessor.core.parser.NullSchema.Companion.nullSchema
+import io.openapiprocessor.core.parser.NullSchema
 import io.openapiprocessor.core.parser.RefResolver
 
 class LazyDataTypeSpec : StringSpec({
@@ -26,7 +26,7 @@ class LazyDataTypeSpec : StringSpec({
             ObjectDataType(DataTypeName("Foo", "FooX"), "pkg", linkedMapOf())
         )
 
-        val info = SchemaInfo(any, "Foo", "", nullSchema, resolver)
+        val info = SchemaInfo(any, "Foo", "", NullSchema, resolver)
         val dt = dataTypes.lazy(info.getName())
 
         dt.getName() shouldBe "Foo"
@@ -41,7 +41,7 @@ class LazyDataTypeSpec : StringSpec({
                 ObjectDataType(DataTypeName(id, type), "pkg", linkedMapOf())
             )
 
-            val info = SchemaInfo(any, id, "", nullSchema, resolver)
+            val info = SchemaInfo(any, id, "", NullSchema, resolver)
             val dt = dataTypes.lazy(info.getName())
 
             dt.getImports() shouldBe setOf(