id/type split (mapped collection & validation), #65

Author: hauner

src/main/kotlin/io/openapiprocessor/core/writer/java/BeanValidationFactory.kt

@@ -15,7 +15,7 @@ open class BeanValidationFactory {
 
     fun validate(dataType: DataType, required: Boolean = false): BeanValidationInfo {
         return BeanValidationInfo(
-            annotateGenericItem(dataType),
+            dataType,
             collectImports(dataType, required),
             collectAnnotations(dataType, required)
         )
@@ -81,13 +81,6 @@ open class BeanValidationFactory {
         return annotations
     }
 
-    private fun annotateGenericItem(dataType: DataType): String {
-        if (!dataType.isCollectionOfModel())
-            return dataType.getName()
-
-        return (dataType as MappedCollectionDataType).getName(BeanValidation.VALID.annotation)
-    }
-
     private fun requiresValidImport(dataType: DataType): Boolean {
         if (dataType.isModel())
             return true
@@ -156,13 +149,6 @@ private fun DataType.isArrayOfModel(): Boolean {
     return item.isModel()
 }
 
-private fun DataType.isCollectionOfModel(): Boolean {
-    if (this !is MappedCollectionDataType)
-        return false
-
-    return item.isModel()
-}
-
 private fun DataType.isString(): Boolean = this is StringDataType
 
 private fun DataType.isCollection(): Boolean =

src/main/kotlin/io/openapiprocessor/core/writer/java/BeanValidationInfo.kt

@@ -5,11 +5,28 @@
 
 package io.openapiprocessor.core.writer.java
 
+import io.openapiprocessor.core.model.datatypes.DataType
+import io.openapiprocessor.core.model.datatypes.MappedCollectionDataType
+import io.openapiprocessor.core.model.datatypes.ModelDataType
+
 class BeanValidationInfo(
-    val typeName: String,
+    val dataType: DataType,
     val imports: Set<String>,
     val annotations: List<String>
 ) {
+    val typeName: String
+        get() {
+            // no collection or array
+            if (dataType !is MappedCollectionDataType)
+                return dataType.getTypeName()
+
+            if (dataType.item !is ModelDataType)
+                return dataType.getTypeName()
+
+            return dataType.getTypeNameWithAnnotatedItem(BeanValidation.VALID.annotation)
+        }
+
     val hasAnnotations
         get() = annotations.isNotEmpty()
+
 }