fix: use uri for the file path of generated fusion code (#11872) (#11916

) Fixes broken link of file path in the generated Fusion code caused by white space. Co-authored-by: Haijian Wang <30408303+haijian-vaadin@users.noreply.github.com>
vaadin · Sep 23, 2021 · f8353ed · f8353ed
1 parent cd17bfe
commit f8353ed
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/fusion-endpoint/src/main/java/com/vaadin/fusion/generator/OpenApiObjectGenerator.java b/fusion-endpoint/src/main/java/com/vaadin/fusion/generator/OpenApiObjectGenerator.java
@@ -370,7 +370,7 @@ private void parseClass(TypeDeclaration<?> typeDeclaration,
                 String className = enumDeclaration.getFullyQualifiedName()
                         .orElse(enumDeclaration.getNameAsString());
                 qualifiedNameToPath.put(className,
-                        storage.getPath().toString());
+                        storage.getPath().toUri().toString());
             });
             nonEndpointMap.put(enumDeclaration.resolve().getQualifiedName(),
                     enumDeclaration);
@@ -384,7 +384,8 @@ private void parseClass(ClassOrInterfaceDeclaration classDeclaration,
         compilationUnit.getStorage().ifPresent(storage -> {
             String className = classDeclaration.getFullyQualifiedName()
                     .orElse(classDeclaration.getNameAsString());
-            qualifiedNameToPath.put(className, storage.getPath().toString());
+            qualifiedNameToPath.put(className,
+                    storage.getPath().toUri().toString());
         });
         if (!GeneratorUtils.hasAnnotation(classDeclaration, compilationUnit,
                 Endpoint.class)) {

diff --git a/fusion-endpoint/src/main/resources/com/vaadin/fusion/generator/EntityModelTemplate.mustache b/fusion-endpoint/src/main/resources/com/vaadin/fusion/generator/EntityModelTemplate.mustache
@@ -17,7 +17,7 @@ import {Email,Null,NotNull,NotEmpty,NotBlank,AssertTrue,AssertFalse,Negative,Neg
  * This module is generated from {{classname}}.
  * All changes to this file are overridden. Please consider to make changes in the corresponding Java file if necessary.{{!
  }}{{#vendorExtensions.x-vaadin-file-path}}
- * @see {@link file://{{vendorExtensions.x-vaadin-file-path}}{{!}}}{{!
+ * @see {@link {{vendorExtensions.x-vaadin-file-path}}{{!}}}{{!
  }}{{/vendorExtensions.x-vaadin-file-path}}
  */
 export default class {{{getClassNameFromImports classname ../../imports}}}Model<T extends {{{getClassNameFromImports classname ../../imports}}} = {{{getClassNameFromImports classname ../../imports}}}>

diff --git a/fusion-endpoint/src/main/resources/com/vaadin/fusion/generator/EntityTemplate.mustache b/fusion-endpoint/src/main/resources/com/vaadin/fusion/generator/EntityTemplate.mustache
@@ -13,7 +13,7 @@ import {{~#importAs}} {{importAs}}{{/importAs}}{{~^importAs}} {{className}}{{/im
  * This module is generated from {{classname}}.
  * All changes to this file are overridden. Please consider to make changes in the corresponding Java file if necessary.{{!
  }}{{#vendorExtensions.x-vaadin-file-path}}
- * @see {@link file://{{vendorExtensions.x-vaadin-file-path}}{{!}}}{{!
+ * @see {@link {{vendorExtensions.x-vaadin-file-path}}{{!}}}{{!
  }}{{/vendorExtensions.x-vaadin-file-path}}
  */
 {{#if vendorExtensions.x-is-enum}}

diff --git a/...on-endpoint/src/main/resources/com/vaadin/fusion/generator/TypeScriptApiTemplate.mustache b/...on-endpoint/src/main/resources/com/vaadin/fusion/generator/TypeScriptApiTemplate.mustache
@@ -9,7 +9,7 @@
  * This module is generated from {{classname}}.java
  * All changes to this file are overridden. Please consider to make changes in the corresponding Java file if necessary.{{!
  }}{{#vaadinFilePath}}
- * @see {@link file://{{vaadinFilePath}}{{!}}}{{/vaadinFilePath}}
+ * @see {@link {{vaadinFilePath}}{{!}}}{{/vaadinFilePath}}
  * @module {{classname}}
  */