id/type split (result wrapper), #65

Author: hauner

src/main/kotlin/io/openapiprocessor/core/model/datatypes/ResultDataType.kt

@@ -1,45 +1,33 @@
 /*
- * Copyright 2020 the original authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2020 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
  */
 
 package io.openapiprocessor.core.model.datatypes
 
 /**
  * Result data type wrapper. Assumes a single generic parameter.
- *
- * @author Martin Hauner
  */
 class ResultDataType(
-
-    private val type: String,
+    private val name: String,
     private val pkg: String,
     private val dataType: DataType
-
 ): DataType {
 
-    // todo multi check inside?
     override fun getName(): String {
-        return "$type<${dataType.getName()}>"
+        return "$name<${dataType.getName()}>"
+    }
+
+    override fun getTypeName(): String {
+        return "$name<${dataType.getTypeName()}>"
     }
 
     override fun getPackageName(): String {
         return pkg
     }
 
     override fun getImports(): Set<String> {
-        return setOf("${getPackageName()}.$type") + dataType.getImports()
+        return setOf("${getPackageName()}.$name") + dataType.getImports()
     }
 
     /**
@@ -48,11 +36,11 @@ class ResultDataType(
      * @return type with ? as the generic parameter
      */
     fun getNameMulti(): String {
-        return "$type<?>"
+        return "$name<?>"
     }
 
     fun getImportsMulti(): Set<String> {
-        return setOf("${getPackageName()}.$type")
+        return setOf("${getPackageName()}.$name")
     }
 
 }

src/test/kotlin/io/openapiprocessor/core/model/datatypes/ResultDataTypeSpec.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2021 https://github.com/openapi-processor/openapi-processor-core
+ * PDX-License-Identifier: Apache-2.0
+ */
+
+package io.openapiprocessor.core.model.datatypes
+
+import io.kotest.core.spec.style.StringSpec
+import io.kotest.data.blocking.forAll
+import io.kotest.data.row
+import io.kotest.matchers.shouldBe
+
+class ResultDataTypeSpec : StringSpec({
+
+    "uses id name and type name of item" {
+        val ndt = ResultDataType("Result", "wrap",
+            ObjectDataType(DataTypeName("Foo", "FooX"), "pkg", linkedMapOf())
+        )
+
+        ndt.getName() shouldBe "Result<Foo>"
+        ndt.getTypeName() shouldBe "Result<FooX>"
+    }
+
+    "should create import with type name" {
+        forAll(row("Foo", "Foo"), row("Fooo", "FoooX")) { id, type ->
+            val ndt = ResultDataType("Result", "wrap",
+                ObjectDataType(DataTypeName(id, type), "pkg")
+            )
+            ndt.getImports() shouldBe setOf(
+                "wrap.Result",
+                "pkg.$type"
+            )
+        }
+    }
+
+})