added null safety

BestSolution-at · Nov 29, 2024 · 1b733c8 · 1b733c8
1 parent d43265c
commit 1b733c8
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/dsl/src/cli/java-server-jakarta-ws/record.ts b/dsl/src/cli/java-server-jakarta-ws/record.ts
@@ -39,7 +39,12 @@ export function generateRecordContent(t: MResolvedRecordType, artifactConfig: Ja
     node.indent( body => {
         body.append(`public static ${t.name}DTOImpl of(${dtoInterface} source) {`,NL)
         body.indent( mBody => {
-            mBody.append(`if(source instanceof ${t.name}DTOImpl) {`,NL)
+            mBody.append('if(source == null) {', NL)
+            mBody.indent( inner => {
+                inner.append('return null;', NL)
+            } )
+            mBody.append('}',NL)
+            mBody.append(`else if(source instanceof ${t.name}DTOImpl) {`,NL)
             mBody.indent(inner => {
                 inner.append(`return (${t.name}DTOImpl)source;`,NL)
             })

diff --git a/dsl/src/cli/java-server-jakarta-ws/union.ts b/dsl/src/cli/java-server-jakarta-ws/union.ts
@@ -50,7 +50,12 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ
     node.indent( body => {
         body.append(`public static ${t.name}DTOImpl of(${artifactConfig.rootPackageName}.service.dto.${t.name}DTO source) {`, NL)
         body.indent( mBody => {
-            mBody.append(`if(source instanceof ${t.name}DTOImpl) {`,NL)
+            mBody.append('if(source == null) {', NL)
+            mBody.indent( inner => {
+                inner.append('return null;', NL)
+            } )
+            mBody.append('}',NL)
+            mBody.append(`else if(source instanceof ${t.name}DTOImpl) {`,NL)
             mBody.indent(inner => {
                 inner.append(`return (${t.name}DTOImpl)source;`,NL)
             })
@@ -62,7 +67,7 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ
                 })
                 mBody.append('}',NL)
             })
-            mBody.append('throw new IllegalStateException();',NL);
+            mBody.append('throw new IllegalStateException("Unsupported type \'%s\'".formatted(source));',NL);
         } )
         body.append('}',NL)
         body.appendNewLine();
@@ -124,7 +129,12 @@ function generateUnionRecordContent(node: IndentNode, t: MResolvedRecordType, p:
     node.indent(body => {
         body.append(`public static ${t.name}DTOImpl of(${t.name}DTO source) {`,NL)
         body.indent( mbody => {
-            mbody.append(`if(source instanceof ${t.name}DTOImpl) {`,NL)
+            mbody.append('if(source == null) {', NL)
+            mbody.indent( inner => {
+                inner.append('return null;', NL)
+            } )
+            mbody.append('}',NL)
+            mbody.append(`else if(source instanceof ${t.name}DTOImpl) {`,NL)
             mbody.indent(inner => {
                 inner.append(`return (${t.name}DTOImpl)source;`,NL)
             })