Skip to content

Commit 63a6949

Browse files
committed
DEVX-796: fixing ExtensionsBase and children, no need to add a Config parameter for the interface
1 parent 3aa62c7 commit 63a6949

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/model/JavaModelInterfaceRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.vrap.rmf.raml.model.types.util.TypesSwitch
2121
import org.eclipse.emf.ecore.EObject
2222
import javax.lang.model.SourceVersion
2323

24-
class JavaModelInterfaceRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, override val generatorConfig: CodeGeneratorConfig) : JavaObjectTypeExtensions, JavaEObjectTypeExtensions, ObjectTypeRenderer {
24+
class JavaModelInterfaceRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, val generatorConfig: CodeGeneratorConfig) : JavaObjectTypeExtensions, JavaEObjectTypeExtensions, ObjectTypeRenderer {
2525

2626
val jacksonVersion = if (generatorConfig.jacksonV3) "tools" else "com.fasterxml"
2727
override fun render(type: ObjectType): TemplateFile {

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/module/JavaCompleteModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object JavaCompleteModule: Module {
2525
JavaStringTypeRenderer(generatorModule.vrapTypeProvider())
2626
), generatorModule.allEnumStringTypes()),
2727
FileGenerator(setOf(
28-
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes()),
28+
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes(), generatorModule.generatorConfig),
2929
JavaModelDraftBuilderFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes()),
3030
JavaApiRootFileProducer(generatorModule.provideClientPackageName(), generatorModule.provideRamlModel())
3131
)),

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/module/JavaInterfaceModelModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ object JavaInterfaceModelModule : Module {
1212

1313
override fun configure(generatorModule: RamlGeneratorModule) = setOf<CodeGenerator> (
1414
ObjectTypeGenerator(setOf(
15-
JavaModelInterfaceRenderer(generatorModule.vrapTypeProvider())
15+
JavaModelInterfaceRenderer(generatorModule.vrapTypeProvider(), generatorModule.generatorConfig)
1616
), generatorModule.allObjectTypes()),
1717
StringTypeGenerator(setOf(
1818
JavaStringTypeRenderer(generatorModule.vrapTypeProvider())
1919
), generatorModule.allEnumStringTypes()),
2020
FileGenerator(setOf(
21-
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes()),
21+
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes(), generatorModule.generatorConfig),
2222
JavaModelDraftBuilderFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes())
2323
))
2424
)

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/module/JavaModelModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ object JavaModelModule: Module {
1414

1515
override fun configure(generatorModule: RamlGeneratorModule) = setOf<CodeGenerator> (
1616
ObjectTypeGenerator(setOf(
17-
JavaModelInterfaceRenderer(generatorModule.vrapTypeProvider())
17+
JavaModelInterfaceRenderer(generatorModule.vrapTypeProvider(), generatorModule.generatorConfig)
1818
), generatorModule.allObjectTypes()),
1919
StringTypeGenerator(setOf(
2020
JavaStringTypeRenderer(generatorModule.vrapTypeProvider())
2121
), generatorModule.allEnumStringTypes()),
2222
FileGenerator(setOf(
23-
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes()),
23+
JavaModelClassFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes(), generatorModule.generatorConfig),
2424
JavaModelDraftBuilderFileProducer(generatorModule.vrapTypeProvider(), generatorModule.allObjectTypes()),
2525
))
2626
)

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/producers/JavaModelClassFileProducer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import io.vrap.rmf.raml.model.types.Annotation
1919
import javax.lang.model.SourceVersion
2020

2121

22-
class JavaModelClassFileProducer constructor(override val vrapTypeProvider: VrapTypeProvider, override val generatorConfig: CodeGeneratorConfig, @AllObjectTypes private val allObjectTypes: List<ObjectType>) : JavaObjectTypeExtensions, JavaEObjectTypeExtensions, FileProducer {
22+
class JavaModelClassFileProducer constructor(override val vrapTypeProvider: VrapTypeProvider, @AllObjectTypes private val allObjectTypes: List<ObjectType>, val generatorConfig: CodeGeneratorConfig) : JavaObjectTypeExtensions, JavaEObjectTypeExtensions, FileProducer {
2323

2424
val jacksonVersion = if (generatorConfig.jacksonV3) "tools" else "com.fasterxml"
2525
val jacksonExcVersion = if (generatorConfig.jacksonV3) "exc.JacksonException" else "JsonProcessingException"

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/requests/JavaHttpRequestRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import org.eclipse.emf.ecore.EObject
2828
*/
2929
const val PLACEHOLDER_PARAM_ANNOTATION = "placeholderParam"
3030

31-
class JavaHttpRequestRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, override val generatorConfig: CodeGeneratorConfig) : MethodRenderer, JavaObjectTypeExtensions, JavaEObjectTypeExtensions {
31+
class JavaHttpRequestRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, val generatorConfig: CodeGeneratorConfig) : MethodRenderer, JavaObjectTypeExtensions, JavaEObjectTypeExtensions {
3232

3333
val jacksonVersion = if (generatorConfig.jacksonV3) "tools" else "com.fasterxml"
3434
override fun render(type: Method): TemplateFile {

languages/javalang/builder-renderer/java-builder-client/src/main/kotlin/io/vrap/codegen/languages/javalang/client/builder/requests/JavaStringHttpRequestRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.EObject
2727
* Query parameters with this annotation should be ignored by JVM sdk.
2828
*/
2929

30-
class JavaStringHttpRequestRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, override val generatorConfig: CodeGeneratorConfig) : MethodRenderer, JavaObjectTypeExtensions, JavaEObjectTypeExtensions {
30+
class JavaStringHttpRequestRenderer constructor(override val vrapTypeProvider: VrapTypeProvider, val generatorConfig: CodeGeneratorConfig) : MethodRenderer, JavaObjectTypeExtensions, JavaEObjectTypeExtensions {
3131

3232
val jacksonVersion = if (generatorConfig.jacksonV3) "tools" else "com.fasterxml"
3333
override fun render(type: Method): TemplateFile {

0 commit comments

Comments
 (0)