render Any type to flattened RAML

jenschude · jenschude · commit 4106a8a42c09 · 2021-07-20T11:14:03.000+02:00
diff --git a/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/CodeGenerator.kt b/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/CodeGenerator.kt
@@ -6,12 +6,12 @@ import io.vrap.rmf.codegen.io.TemplateFile
 import io.vrap.rmf.raml.model.resources.Method
 import io.vrap.rmf.raml.model.resources.Resource
 import io.vrap.rmf.raml.model.resources.Trait
+import io.vrap.rmf.raml.model.types.AnyType
 import io.vrap.rmf.raml.model.types.ObjectType
 import io.vrap.rmf.raml.model.types.StringType
 import io.vrap.rmf.raml.model.types.UnionType
 import org.reactivestreams.Publisher
 import org.slf4j.LoggerFactory
-import kotlin.concurrent.fixedRateTimer
 
 interface CodeGenerator {
     fun generate(): MutableList<Publisher<TemplateFile>>
@@ -47,7 +47,8 @@ class ObjectTypeGenerator constructor(generators: Set<ObjectTypeRenderer>, @AllO
 class StringTypeGenerator constructor(generators: Set<StringTypeRenderer>, @EnumStringTypes allTypes: List<StringType>) : CodeGeneratorImpl<StringTypeRenderer, StringType>(generators, allTypes)
 class UnionTypeGenerator constructor(generators: Set<UnionTypeRenderer>, @AllUnionTypes allTypes: List<UnionType>) : CodeGeneratorImpl<UnionTypeRenderer, UnionType>(generators, allTypes)
 class PatternStringTypeGenerator constructor(generators: Set<PatternStringTypeRenderer>, @PatternStringTypes allTypes: List<StringType>) : CodeGeneratorImpl<PatternStringTypeRenderer, StringType>(generators, allTypes)
-class NamedScalarTypeGenerator constructor(generators: Set<NamedScalarTypeRenderer>, @NamedScalarTypes allTypes: List<StringType>) : CodeGeneratorImpl<NamedScalarTypeRenderer, StringType>(generators, allTypes)
+class NamedStringTypeGenerator constructor(generators: Set<NamedStringTypeRenderer>, @NamedScalarTypes allTypes: List<StringType>) : CodeGeneratorImpl<NamedStringTypeRenderer, StringType>(generators, allTypes)
+class NamedScalarTypeGenerator<T: AnyType> constructor(generators: Set<NamedScalarTypeRenderer<T>>, @NamedScalarTypes allTypes: List<T>) : CodeGeneratorImpl<NamedScalarTypeRenderer<T>, T>(generators, allTypes)
 class ResourceGenerator constructor(generators: Set<ResourceRenderer>, @AllResources allTypes: List<Resource>) : CodeGeneratorImpl<ResourceRenderer, Resource>(generators, allTypes)
 class MethodGenerator constructor(generators: Set<MethodRenderer>, @AllResourceMethods allTypes: List<Method>) : CodeGeneratorImpl<MethodRenderer, Method>(generators, allTypes)
 class TraitGenerator constructor(generators: Set<TraitRenderer>, @AllTraits allTypes: List<Trait>) : CodeGeneratorImpl<TraitRenderer, Trait>(generators, allTypes)
diff --git a/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/NamedScalarTypeRenderer.kt b/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/NamedScalarTypeRenderer.kt
@@ -1,5 +1,5 @@
 package io.vrap.rmf.codegen.rendring
 
-import io.vrap.rmf.raml.model.types.StringType
+import io.vrap.rmf.raml.model.types.AnyType
 
-interface NamedScalarTypeRenderer : Renderer<StringType>
+interface NamedScalarTypeRenderer<T: AnyType> : Renderer<T>
diff --git a/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/NamedStringTypeRenderer.kt b/codegen-core/src/main/kotlin/io/vrap/rmf/codegen/rendring/NamedStringTypeRenderer.kt
@@ -0,0 +1,5 @@
+package io.vrap.rmf.codegen.rendring
+
+import io.vrap.rmf.raml.model.types.StringType
+
+interface NamedStringTypeRenderer : NamedScalarTypeRenderer<StringType>
diff --git a/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/RamlScalarTypeRenderer.kt b/languages/oas/src/main/kotlin/io/vrap/codegen/languages/oas/model/RamlScalarTypeRenderer.kt
@@ -6,15 +6,15 @@ import io.vrap.codegen.languages.oas.extensions.renderAnnotation
 import io.vrap.codegen.languages.oas.extensions.renderEAttributes
 import io.vrap.rmf.codegen.di.ModelPackageName
 import io.vrap.rmf.codegen.io.TemplateFile
-import io.vrap.rmf.codegen.rendring.NamedScalarTypeRenderer
+import io.vrap.rmf.codegen.rendring.NamedStringTypeRenderer
 import io.vrap.rmf.codegen.rendring.PatternStringTypeRenderer
 import io.vrap.rmf.codegen.rendring.StringTypeRenderer
 import io.vrap.rmf.codegen.rendring.utils.keepAngleIndent
 import io.vrap.rmf.codegen.types.*
 import io.vrap.rmf.raml.model.types.*
 import java.lang.Exception
 
-class RamlScalarTypeRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName val modelPackageName: String) : ExtensionsBase, StringTypeRenderer, PatternStringTypeRenderer, NamedScalarTypeRenderer {
+class RamlScalarTypeRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName val modelPackageName: String) : ExtensionsBase, StringTypeRenderer, PatternStringTypeRenderer, NamedStringTypeRenderer {
 
     override fun render(type: StringType): TemplateFile {
         return when (val vrapType = vrapTypeProvider.doSwitch(type)) {
diff --git a/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamlScalarTypeRenderer.kt b/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamlScalarTypeRenderer.kt
@@ -7,24 +7,33 @@ import io.vrap.codegen.languages.ramldoc.extensions.renderEAttributes
 import io.vrap.rmf.codegen.di.ModelPackageName
 import io.vrap.rmf.codegen.io.TemplateFile
 import io.vrap.rmf.codegen.rendring.NamedScalarTypeRenderer
+import io.vrap.rmf.codegen.rendring.NamedStringTypeRenderer
 import io.vrap.rmf.codegen.rendring.PatternStringTypeRenderer
 import io.vrap.rmf.codegen.rendring.StringTypeRenderer
 import io.vrap.rmf.codegen.rendring.utils.keepAngleIndent
 import io.vrap.rmf.codegen.types.*
 import io.vrap.rmf.raml.model.types.*
+import org.eclipse.emf.ecore.EObject
 import java.lang.Exception
 
-class RamlScalarTypeRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName val modelPackageName: String) : ExtensionsBase, StringTypeRenderer, PatternStringTypeRenderer, NamedScalarTypeRenderer {
+class RamlStringTypeRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName override val modelPackageName: String) : RamlScalarTypeRenderer<StringType>(vrapTypeProvider, modelPackageName), StringTypeRenderer, PatternStringTypeRenderer, NamedStringTypeRenderer
+class RamlAnyTypeRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName override val modelPackageName: String) : RamlScalarTypeRenderer<AnyType>(vrapTypeProvider, modelPackageName)
 
-    override fun render(type: StringType): TemplateFile {
+sealed class RamlScalarTypeRenderer<T: AnyType> constructor(override val vrapTypeProvider: VrapTypeProvider, @ModelPackageName open val modelPackageName: String) : ExtensionsBase, NamedScalarTypeRenderer<T> {
+
+
+    override fun render(type: T): TemplateFile {
         return when (val vrapType = vrapTypeProvider.doSwitch(type)) {
-            is VrapEnumType -> render(vrapType, type)
+            is VrapEnumType -> when (type) {
+                is StringType -> render(vrapType, type)
+                else -> throw Exception()
+            }
             is VrapScalarType -> render(vrapType, type)
             else -> throw Exception()
         }
     }
 
-    private fun render(vrapType: VrapEnumType, type: StringType): TemplateFile {
+    private fun render(vrapType: VrapEnumType, type: AnyType): TemplateFile {
         val postmanExampleAnno = type.getAnnotation("postman-example")
         val postmanExample = if (postmanExampleAnno != null) {
             val example = TypesFactory.eINSTANCE.createExample()
@@ -56,7 +65,7 @@ class RamlScalarTypeRenderer constructor(override val vrapTypeProvider: VrapType
         )
     }
 
-    private fun render(vrapType: VrapScalarType, type: StringType): TemplateFile {
+    private fun render(vrapType: VrapScalarType, type: AnyType): TemplateFile {
         val postmanExampleAnno = type.getAnnotation("postman-example")
         val postmanExample = if (postmanExampleAnno != null) {
             val example = TypesFactory.eINSTANCE.createExample()
diff --git a/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModelModule.kt b/languages/ramldoc/src/main/kotlin/io/vrap/codegen/languages/ramldoc/model/RamldocModelModule.kt
@@ -1,8 +1,10 @@
 package io.vrap.codegen.languages.ramldoc.model
 
+import io.vrap.codegen.languages.ramldoc.extensions.isScalar
 import io.vrap.rmf.codegen.di.GeneratorModule
 import io.vrap.rmf.codegen.di.Module
 import io.vrap.rmf.codegen.rendring.*
+import io.vrap.rmf.raml.model.types.*
 
 object RamldocModelModule : Module {
     override fun configure(generatorModule: GeneratorModule) = setOf<CodeGenerator>(
@@ -14,18 +16,22 @@ object RamldocModelModule : Module {
         ),
         StringTypeGenerator(
                 setOf(
-                        RamlScalarTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
+                        RamlStringTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
                 ),
                 generatorModule.allEnumStringTypes()
         ),
         PatternStringTypeGenerator(
                 setOf(
-                        RamlScalarTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
+                        RamlStringTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
                 ), generatorModule.allPatternStringTypes()),
-        NamedScalarTypeGenerator(
+        NamedStringTypeGenerator(
                 setOf(
-                        RamlScalarTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
+                        RamlStringTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
                 ), generatorModule.allNamedScalarTypes()),
+        NamedScalarTypeGenerator(
+                setOf(
+                        RamlAnyTypeRenderer(generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
+                ), generatorModule.allAnyTypes().namedAnyTypes()),
         ResourceGenerator(
                 setOf(
                         RamlResourceRenderer(generatorModule.provideRamlModel(), generatorModule.vrapTypeProvider())
@@ -36,4 +42,8 @@ object RamldocModelModule : Module {
                         RamlExampleRenderer(generatorModule.allResourceMethods(), generatorModule.allAnyTypes(), generatorModule.vrapTypeProvider(), generatorModule.provideModelPackageName())
                 ))
     )
+
+    fun List<AnyType>.namedAnyTypes(): List<AnyType> {
+        return this.filter { !it.isScalar() && !(it is ObjectType) && !(it is ArrayType) && !(it is UnionType) && !(it is IntersectionType) && !(it is NilType)}
+    }
 }
