generating java-server service APIs

BestSolution-at · Oct 27, 2024 · a5c7f1f · a5c7f1f
1 parent 972b2c6
commit a5c7f1f
Show file tree

Hide file tree

Showing 15 changed files with 259 additions and 58 deletions.
diff --git a/dsl/src/cli/java-client-api/base-dto.ts b/dsl/src/cli/java-client-api/base-dto.ts
@@ -1,13 +1,20 @@
 import { CompositeGeneratorNode, NL, toString } from "langium/generate";
 
 import { Artifact } from "../artifact-generator.js";
-import { JavaClientAPIGeneratorConfig, toPath } from "../java-gen-utils.js";
+import { generateCompilationUnit, JavaClientAPIGeneratorConfig, JavaImportsCollector, toPath } from "../java-gen-utils.js";
 
 export function generateBaseDTO(artifactConfig: JavaClientAPIGeneratorConfig): Artifact {
     const packageName = `${artifactConfig.rootPackageName}.dto`;
+
+    return {
+        name: 'BaseDTO.java',
+        content: toString(generateCompilationUnit(packageName, new JavaImportsCollector(packageName), generateBaseDTOContent())),
+        path: toPath(artifactConfig.targetFolder, packageName)
+    }
+}
+
+export function generateBaseDTOContent() {
     const node = new CompositeGeneratorNode()
-    node.append('// Generated by RSD - Do not modify',NL)
-    node.append(`package ${packageName};`, NL, NL)
     node.append(`public interface BaseDTO {`,NL)
     node.indent( child => {
         child.append(`public interface Builder {`, NL)
@@ -17,9 +24,5 @@ export function generateBaseDTO(artifactConfig: JavaClientAPIGeneratorConfig): A
         child.append('}',NL)
     });
     node.append('}',NL)
-    return {
-        name: 'BaseDTO.java',
-        content: toString(node),
-        path: toPath(artifactConfig.targetFolder, packageName)
-    }
-}
+    return node;
+}
diff --git a/dsl/src/cli/java-client-api/union.ts b/dsl/src/cli/java-client-api/union.ts
@@ -34,6 +34,15 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaClientA
     const importCollector = new JavaImportsCollector(packageName);
     const fqn = importCollector.importType.bind(importCollector);
 
+
+    return {
+        name: `${t.name}DTO.java`,
+        content: toString(generateCompilationUnit(packageName, importCollector, generateUnionContent(t, artifactConfig, fqn))),
+        path: toPath(artifactConfig.targetFolder, packageName)
+    };
+}
+
+export function generateUnionContent(t: MResolvedUnionType, artifactConfig: JavaClientAPIGeneratorConfig, fqn: (type: string) => string) {
     const node = new CompositeGeneratorNode();
     node.append(`public interface ${t.name}DTO extends BaseDTO {`,NL)
 
@@ -73,10 +82,5 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaClientA
     }
 
     node.append('}',NL)
-
-    return {
-        name: `${t.name}DTO.java`,
-        content: toString(generateCompilationUnit(packageName, importCollector, node)),
-        path: toPath(artifactConfig.targetFolder, packageName)
-    };
+    return node;
 }
diff --git a/dsl/src/cli/java-gen-utils.ts b/dsl/src/cli/java-gen-utils.ts
@@ -66,7 +66,13 @@ export type JavaRestClientJDKGeneratorConfig = ArtifactGenerationConfig & {
     nativeTypeSubstitues?: Record<string, string>
 }
 
-export type JavaServerJakartaWSConfig = ArtifactGenerationConfig & {
+export type JavaServerJakartaWSGeneratorConfig = ArtifactGenerationConfig & {
+    targetFolder: string
+    rootPackageName: string
+    nativeTypeSubstitues?: Record<string, string>
+}
+
+export type JavaServerGeneratorConfig = ArtifactGenerationConfig & {
     targetFolder: string
     rootPackageName: string
     nativeTypeSubstitues?: Record<string, string>
@@ -82,7 +88,12 @@ export function isJavaRestClientJDKGeneratorConfig(config: ArtifactGeneratorConf
         && 'rootPackageName' in config && typeof config.rootPackageName === 'string';
 }
 
-export function isJavaServerJakartaWSConfig(config: ArtifactGeneratorConfig): config is JavaServerJakartaWSConfig {
+export function isJavaServerJakartaWSConfig(config: ArtifactGeneratorConfig): config is JavaServerJakartaWSGeneratorConfig {
+    return 'targetFolder' in config && typeof config.targetFolder === 'string'
+        && 'rootPackageName' in config && typeof config.rootPackageName === 'string';
+}
+
+export function isJavaServerConfig(config: ArtifactGeneratorConfig): config is JavaServerGeneratorConfig {
     return 'targetFolder' in config && typeof config.targetFolder === 'string'
         && 'rootPackageName' in config && typeof config.rootPackageName === 'string';
 }

diff --git a/dsl/src/cli/java-server-jakarta-ws/enum.ts b/dsl/src/cli/java-server-jakarta-ws/enum.ts
@@ -1,10 +1,10 @@
 import { CompositeGeneratorNode, NL, toString } from "langium/generate";
 
 import { Artifact } from "../artifact-generator.js";
-import { JavaServerJakartaWSConfig, toPath } from "../java-gen-utils.js";
+import { JavaServerJakartaWSGeneratorConfig, toPath } from "../java-gen-utils.js";
 import { MEnumType, MInlineEnumType } from "../model.js";
 
-export function generateEnum(t: MEnumType, artifactConfig: JavaServerJakartaWSConfig): Artifact {
+export function generateEnum(t: MEnumType, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact {
     const packageName = `${artifactConfig.rootPackageName}.rest.dto`;
 
     const node = new CompositeGeneratorNode()

diff --git a/dsl/src/cli/java-server-jakarta-ws/generator.ts b/dsl/src/cli/java-server-jakarta-ws/generator.ts
@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { isMEnumType, isMRecordType, isMUnionType, MResolvedRSDModel, MResolvedUserType } from "../model.js";
 import { Artifact, ArtifactGenerationConfig, ArtifactGeneratorConfig } from "../artifact-generator.js";
-import { isJavaServerJakartaWSConfig, JavaServerJakartaWSConfig } from "../java-gen-utils.js";
+import { isJavaServerJakartaWSConfig, JavaServerJakartaWSGeneratorConfig } from "../java-gen-utils.js";
 import { isDefined } from "../util.js";
 import { generateRecord } from "./record.js";
 import { generateUnion } from "./union.js";
@@ -21,7 +21,7 @@ export function generate(model: MResolvedRSDModel, generatorConfig: ArtifactGene
     return result;
 }
 
-function generateType(t: MResolvedUserType, artifactConfig: JavaServerJakartaWSConfig): Artifact | undefined {
+function generateType(t: MResolvedUserType, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact | undefined {
     if( isMEnumType(t) ) {
 
     } else if( isMRecordType(t) ) {

diff --git a/dsl/src/cli/java-server-jakarta-ws/record.ts b/dsl/src/cli/java-server-jakarta-ws/record.ts
@@ -1,11 +1,11 @@
 import { CompositeGeneratorNode, NL, toString } from "langium/generate";
 import { Artifact } from "../artifact-generator.js";
-import { builtinToJavaType, generateCompilationUnit, JavaImportsCollector, JavaServerJakartaWSConfig, resolveObjectType, resolveType, toPath } from "../java-gen-utils.js";
+import { builtinToJavaType, generateCompilationUnit, JavaImportsCollector, JavaServerJakartaWSGeneratorConfig, resolveObjectType, resolveType, toPath } from "../java-gen-utils.js";
 import { allRecordProperties, isMInlineEnumType, isMKeyProperty, isMProperty, isMRevisionProperty, MResolvedRecordType } from "../model.js";
 import { toFirstUpper } from "../util.js";
 import { generateInlineEnum } from "./enum.js";
 
-export function generateRecord(t: MResolvedRecordType, artifactConfig: JavaServerJakartaWSConfig): Artifact | undefined {
+export function generateRecord(t: MResolvedRecordType, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact | undefined {
     if( t.resolved.unions.length === 1 ) {
         return undefined;
     }
@@ -21,15 +21,15 @@ export function generateRecord(t: MResolvedRecordType, artifactConfig: JavaServe
     };
 }
 
-export function generateRecordContent(t: MResolvedRecordType, artifactConfig: JavaServerJakartaWSConfig, fqn: (type: string) => string): CompositeGeneratorNode {
+export function generateRecordContent(t: MResolvedRecordType, artifactConfig: JavaServerJakartaWSGeneratorConfig, fqn: (type: string) => string): CompositeGeneratorNode {
     const node = new CompositeGeneratorNode();
 
     const allProps = allRecordProperties(t);
 
     node.append(`public record ${t.name}DTO(`,NL)
     node.indent( param => {
         allProps.forEach( (property, idx, arr) => {
-            const end = idx + 1 < arr.length ? ',' : ') {'
+            const end = idx + 1 < arr.length ? ',' : `) implements ${artifactConfig.rootPackageName}.service.dto.${t.name}DTO {`
             if( isMKeyProperty(property) ) {
                 param.append(`${builtinToJavaType(property.type, fqn)} ${property.name}`, end, NL)
             } else if( isMRevisionProperty(property) ) {

diff --git a/dsl/src/cli/java-server-jakarta-ws/service.ts b/dsl/src/cli/java-server-jakarta-ws/service.ts
@@ -1,11 +1,11 @@
 import { CompositeGeneratorNode, NL, toString } from "langium/generate";
 import { Artifact } from "../artifact-generator.js";
-import { generateCompilationUnit, JavaImportsCollector, JavaRestClientJDKGeneratorConfig, toPath } from "../java-gen-utils.js";
+import { generateCompilationUnit, JavaImportsCollector, JavaServerJakartaWSGeneratorConfig, toPath } from "../java-gen-utils.js";
 import { MResolvedOperation, MResolvedService } from "../model.js";
 import { toFirstUpper } from "../util.js";
 import { toType } from "../java-client-api/shared.js";
 
-export function generateService(s: MResolvedService, artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact[] {
+export function generateService(s: MResolvedService, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact[] {
     const result : Artifact[] = []; 
     const serviceDTOs = s.operations
         .filter( o => o.parameters.filter( p => p.meta?.rest?.source === undefined).length > 1 )
@@ -15,7 +15,7 @@ export function generateService(s: MResolvedService, artifactConfig: JavaRestCli
     return result;
 }
 
-function generateServiceDTO(s: MResolvedService, o: MResolvedOperation, artifactConfig: JavaRestClientJDKGeneratorConfig): Artifact {
+function generateServiceDTO(s: MResolvedService, o: MResolvedOperation, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact {
     const packageName = `${artifactConfig.rootPackageName}.rest.dto`;
 
     const importCollector = new JavaImportsCollector(packageName);

diff --git a/dsl/src/cli/java-server-jakarta-ws/union.ts b/dsl/src/cli/java-server-jakarta-ws/union.ts
@@ -1,12 +1,11 @@
 import { CompositeGeneratorNode, IndentNode, NL, toString } from "langium/generate";
 import { Artifact } from "../artifact-generator.js";
-import { builtinToJavaType, generateCompilationUnit, JavaImportsCollector, JavaServerJakartaWSConfig, resolveObjectType, resolveType, toPath } from "../java-gen-utils.js";
-import { allRecordProperties, isMInlineEnumType, isMKeyProperty, isMProperty, isMRevisionProperty, MKeyProperty, MProperty, MResolvedRecordType, MResolvedUnionType, MRevisionProperty } from "../model.js";
-import { generateInlineEnum } from "./enum.js";
+import { builtinToJavaType, generateCompilationUnit, JavaImportsCollector, JavaServerJakartaWSGeneratorConfig, resolveObjectType, resolveType, toPath } from "../java-gen-utils.js";
+import { allRecordProperties, isMKeyProperty, isMRevisionProperty, MKeyProperty, MProperty, MResolvedRecordType, MResolvedUnionType, MRevisionProperty } from "../model.js";
 import { toFirstUpper } from "../util.js";
 
-export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJakartaWSConfig): Artifact {
-    const packageName = `${artifactConfig.rootPackageName}.rest.dto!`;
+export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJakartaWSGeneratorConfig): Artifact {
+    const packageName = `${artifactConfig.rootPackageName}.rest.dto`;
 
     const importCollector = new JavaImportsCollector(packageName);
     const fqn = importCollector.importType.bind(importCollector);
@@ -25,22 +24,16 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ
     } );
 
     node.append('})',NL)
-    node.append(`public abstract class ${t.name}DTO {`,NL)
-    t.resolved.sharedProps
-        .filter(isMProperty)
-        .filter(p => p.variant === 'inline-enum')
-        .forEach( p => {
-            const inlineEnum = p.type;
-            if( isMInlineEnumType(inlineEnum) ) {
-                generateInlineEnum(inlineEnum, toFirstUpper(p.name), node)
-            }
-        });
-
+    node.append(`public abstract class ${t.name}DTO implements ${artifactConfig.rootPackageName}.service.dto.${t.name}DTO {`,NL)
 
     node.indent( child => {
         t.resolved.sharedProps.forEach( p => generateProperty(child, p, artifactConfig, fqn) )
     })
 
+    node.indent( child => {
+        t.resolved.sharedProps.forEach( p => generatePropertyAccess(child, p, artifactConfig, fqn) )
+    })
+
 
     node.indent( child => {
         childRecords.forEach( r => {
@@ -59,31 +52,24 @@ export function generateUnion(t: MResolvedUnionType, artifactConfig: JavaServerJ
     };
 }
 
-function generateUnionRecordContent(node: IndentNode, t: MResolvedRecordType, p: MResolvedUnionType, artifactConfig: JavaServerJakartaWSConfig, fqn: (type: string) => string) {
-    node.append(`public static class ${t.name}DTO extends ${p.name}DTO {`,NL)
+function generateUnionRecordContent(node: IndentNode, t: MResolvedRecordType, p: MResolvedUnionType, artifactConfig: JavaServerJakartaWSGeneratorConfig, fqn: (type: string) => string) {
+    node.append(`public static class ${t.name}DTO extends ${p.name}DTO implements ${artifactConfig.rootPackageName}.service.dto.${p.name}DTO.${t.name}DTO {`,NL)
 
     const sharedProps = t.resolved.unions.flatMap(u => u.resolved.sharedProps);
 
     const allProps = allRecordProperties(t);
-    allProps
-        .filter(isMProperty)
-        .filter(p => p.variant === 'inline-enum')
-        .filter(p => !sharedProps.includes(p))
-        .forEach( p => {
-            const inlineEnum = p.type;
-            if( isMInlineEnumType(inlineEnum) ) {
-                generateInlineEnum(inlineEnum, toFirstUpper(p.name), node)
-            }
-        });
-
+
     node.indent( child => {
         allProps.filter(p => !sharedProps.includes(p)).forEach( p => generateProperty(child, p, artifactConfig, fqn))
     })
+    node.indent( child => {
+        allProps.filter(p => !sharedProps.includes(p)).forEach( p => generatePropertyAccess(child, p, artifactConfig, fqn))
+    })
 
     node.append('}',NL)
 }
 
-function generateProperty(node: IndentNode, property: MKeyProperty | MRevisionProperty | MProperty, artifactConfig: JavaServerJakartaWSConfig, fqn: (type: string) => string) {
+function generateProperty(node: IndentNode, property: MKeyProperty | MRevisionProperty | MProperty, artifactConfig: JavaServerJakartaWSGeneratorConfig, fqn: (type: string) => string) {
     if( isMKeyProperty(property) ) {
         node.append(`public ${builtinToJavaType(property.type, fqn)} ${property.name};`,NL)
     } else if( isMRevisionProperty(property) ) {
@@ -105,4 +91,57 @@ function generateProperty(node: IndentNode, property: MKeyProperty | MRevisionPr
             node.append(`public ${toFirstUpper(property.name)} ${property.name};`,NL)
         }
     }
+}
+
+function generatePropertyAccess(node: IndentNode, property: MKeyProperty | MRevisionProperty | MProperty, artifactConfig: JavaServerJakartaWSGeneratorConfig, fqn: (type: string) => string) {
+    node.appendNewLine();
+    if( isMKeyProperty(property) ) {
+        node.append(`public ${builtinToJavaType(property.type, fqn)} ${property.name}() {`,NL)
+        node.indent( body => {
+            body.append(`return this.${property.name};`,NL);
+        } )
+        node.append('}',NL);
+    } else if( isMRevisionProperty(property) ) {
+        node.append(`public ${builtinToJavaType(property.type, fqn)} ${property.name}() {`,NL)
+        node.indent( body => {
+            body.append(`return this.${property.name};`,NL);
+        } )
+        node.append('}', NL)
+    } else {
+        if( property.variant === 'union' || property.variant === 'record' ) {
+            if( property.array ) {
+                node.append(`public ${fqn('java.util.List')}<${property.type}DTO> ${property.name}() {`,NL)
+                node.indent( body => {
+                    body.append(`return this.${property.name};`,NL);
+                } )
+                node.append('}', NL)
+            } else {
+                node.append(`public ${property.type}DTO ${property.name}() {`,NL)
+                node.indent( body => {
+                    body.append(`return this.${property.name};`,NL);
+                } )
+                node.append('}', NL)
+            }
+        } else if( typeof property.type === 'string' ) {
+            if( property.array ) {
+                node.append(`public ${fqn('java.util.List')}<${resolveObjectType(property.type, artifactConfig.nativeTypeSubstitues, fqn)}> ${property.name}() {`,NL)
+                node.indent( body => {
+                    body.append(`return this.${property.name};`,NL);
+                } )
+                node.append('}', NL)
+            } else {
+                node.append(`public ${resolveType(property.type, artifactConfig.nativeTypeSubstitues, fqn)} ${property.name}() {`,NL)
+                node.indent( body => {
+                    body.append(`return this.${property.name};`,NL);
+                } )
+                node.append('}', NL)
+            }
+        } else {
+            node.append(`public ${toFirstUpper(property.name)} ${property.name}() {`,NL)
+            node.indent( body => {
+                body.append(`return this.${property.name};`,NL);
+            } )
+            node.append('}', NL);
+        }
+    }
 }
diff --git a/dsl/src/cli/java-server/base-dto.ts b/dsl/src/cli/java-server/base-dto.ts
@@ -0,0 +1,15 @@
+import { toString } from "langium/generate";
+
+import { Artifact } from "../artifact-generator.js";
+import { generateCompilationUnit, JavaClientAPIGeneratorConfig, JavaImportsCollector, toPath } from "../java-gen-utils.js";
+import { generateBaseDTOContent } from "../java-client-api/base-dto.js";
+
+export function generateBaseDTO(artifactConfig: JavaClientAPIGeneratorConfig): Artifact {
+    const packageName = `${artifactConfig.rootPackageName}.service.dto`;
+
+    return {
+        name: 'BaseDTO.java',
+        content: toString(generateCompilationUnit(packageName, new JavaImportsCollector(packageName), generateBaseDTOContent())),
+        path: toPath(artifactConfig.targetFolder, packageName)
+    }
+}
diff --git a/dsl/src/cli/java-server/builder-factory.ts b/dsl/src/cli/java-server/builder-factory.ts
@@ -0,0 +1,31 @@
+import { expandToString } from "langium/generate";
+
+import { Artifact } from "../artifact-generator.js";
+import { JavaClientAPIGeneratorConfig, toPath } from "../java-gen-utils.js";
+
+export function generateDTOBuilderFactory(artifactConfig: JavaClientAPIGeneratorConfig): Artifact {
+    const packageName = `${artifactConfig.rootPackageName}.service`;
+
+    return {
+        name: 'DTOBuilderFactory.java',
+        content: generateDTOBuilderFactoryContent(packageName),
+        path: toPath(artifactConfig.targetFolder, packageName)
+    }
+}
+
+function generateDTOBuilderFactoryContent(packageName: string) {
+    const content = expandToString`
+        // Generated by RSD - Do not modify
+        package ${packageName};
+
+        import ${packageName}.dto.BaseDTO;
+
+        public interface DTOBuilderFactory {
+            public interface Builder {
+                public BaseDTO build();
+            }
+
+            public <T extends BaseDTO.Builder> T builder(Class<T> type);
+        }`
+    return content;
+}
diff --git a/dsl/src/cli/java-server/enum.ts b/dsl/src/cli/java-server/enum.ts