Skip to content

Devx 867 render body fix #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenschude merged 2 commits into from
Sep 9, 2026
Merged

Devx 867 render body fix #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1553c27
DEVX-867: fixing code generation for java (exception for File type)
ShipilA Sep 8, 2026
392ee3c
DEVX-867: fixing code generation for dotnet (exception for streams)
ShipilA Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...src/main/kotlin/io/vrap/codegen/languages/csharp/extensions/CsharpObjectTypeExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ interface CsharpObjectTypeExtensions : ExtensionsBase {
if (props.any { it.simpleName() == "Date" || (it is VrapArrayType && (it.itemType.simpleName() == "Date")) }) {
usings = usings.plus("commercetools.Base.Models")
}
if (props.any { it.simpleName() == "Stream" || it is VrapArrayType && it.itemType.simpleName() == "Stream" }) {
usings = usings.plus("System.IO")
}
if (isInterface || this.discriminator.isNullOrEmpty().not() || (this.isInlineType && (this.type as ObjectType).discriminator.isNullOrEmpty().not())) {
usings = usings.plus("commercetools.Base.CustomAttributes")
.plus("System")
Expand Down
2 changes: 1 addition & 1 deletion ...sharp/src/main/kotlin/io/vrap/codegen/languages/csharp/extensions/CsharpVrapExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ fun VrapType.simpleName(): String {
is VrapScalarType -> this.scalarType
is VrapDateTimeType -> this.simpleClassName
is VrapEnumType -> "I"+this.simpleClassName
is VrapObjectType -> if(this.simpleClassName == "Date" || this.simpleClassName == "DateTime" || this.simpleClassName == "TimeSpan" || this.simpleClassName == "Object") this.simpleClassName else "I${this.simpleClassName}"
is VrapObjectType -> if(this.simpleClassName == "Date" || this.simpleClassName == "DateTime" || this.simpleClassName == "TimeSpan" || this.simpleClassName == "Object" || this.simpleClassName == "Stream") this.simpleClassName else "I${this.simpleClassName}"
is VrapAnyType -> this.baseType
is VrapArrayType -> """IList\<${this.itemType.simpleName()}\>"""
is VrapNilType -> throw IllegalStateException("$this has no simple class name.")
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/kotlin/io/vrap/codegen/languages/csharp/predicates/CsharpQueryPredicateRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class CsharpQueryPredicateRenderer constructor(val basePackage: String, override
private fun VrapType.toBuilderDsl(propertyName: String, propertyType: AnyType, vrapType: VrapObjectType, isItemType: Boolean = false) : String {
val methodName = propertyName.upperCamelCase()

if (this.simpleName() == "DateTime" || this.simpleName() == "Date" || this.simpleName() == "TimeSpan" || this.simpleName() == Object::class.java.simpleName) {
if (this.simpleName() == "DateTime" || this.simpleName() == "Date" || this.simpleName() == "TimeSpan" || this.simpleName() == "Stream" || this.simpleName() == Object::class.java.simpleName) {
return """
|public IComparisonPredicateBuilder<${vrapType.builderDslName()}, ${propertyType.comparisonValue()}> $methodName()
|{
Expand Down
4 changes: 3 additions & 1 deletion ...o/vrap/codegen/languages/javalang/client/builder/predicates/JavaQueryPredicateRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ class JavaQueryPredicateRenderer constructor(val basePackage: String, override v
methodName = "_$methodName"
}

if (this.simpleName() == ZonedDateTime::class.simpleName || this.simpleName() == LocalTime::class.simpleName || this.simpleName() == LocalDate::class.simpleName || this.simpleName() == Object::class.java.simpleName) {
if (this.simpleName() == ZonedDateTime::class.simpleName || this.simpleName() == LocalTime::class.simpleName
|| this.simpleName() == LocalDate::class.simpleName || this.simpleName() == Object::class.java.simpleName
|| this.simpleName() == java.io.File::class.simpleName) {
return """
|public ${propertyType.comparisonPredicate()}<${vrapType.builderDslName()}> $methodName() {
| return new ${propertyType.comparisonPredicate()}<>(BinaryQueryPredicate.of().left(new ConstantQueryPredicate("${propertyName}")),
Expand Down
3 changes: 2 additions & 1 deletion .../kotlin/io/vrap/codegen/languages/javalang/client/builder/test/JavaBuilderTestRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ class JavaBuilderTestRenderer constructor(override val vrapTypeProvider: VrapTyp
fun render(type: ObjectType): TemplateFile {
val vrapType = vrapTypeProvider.doSwitch(type).toJavaVType() as VrapObjectType

val properties = type.properties.filterNot { it.deprecated() || it.isPatternProperty() || it.name == type.discriminator() }
val properties = type.properties.filterNot { it.deprecated() || it.isPatternProperty() || it.name == type.discriminator() || it.type.isFile()
|| (it.type is ArrayType && (it.type as ArrayType).items.isFile()) }
val content = """
|package ${vrapType.`package`};
|
Expand Down
Loading