refactor!: rename Fusion to Hilla (#995)

* refactor: update to hilla-endpoint dependency name * refactor: update hilla-endpoint dependency groupId and version * refactor: update to hilla package name * refactor: rename FusionX classnames to HillaX * chore: rename fusionsecurity to hillasecurity * chore: rename fusionform to hillaform * chore: rename -fusion test modules to -hilla * chore: rename fusion variable names to hilla * chore: update arbitrary mentions of Fusion to Hilla
vaadin · Jan 7, 2022 · 42b2cd0 · 42b2cd0
1 parent ba2d13d
commit 42b2cd0
Show file tree

Hide file tree

Showing 91 changed files with 371 additions and 202 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,6 +44,7 @@
 
         <!-- These are typically overridden with BOMs -->
         <vaadin.flow.version>10.0-SNAPSHOT</vaadin.flow.version>
+        <hilla.version>1.0-SNAPSHOT</hilla.version>
         <spring-boot.version>2.6.2</spring-boot.version>
 
         <!-- Additional manifest fields -->

diff --git a/vaadin-spring-tests/pom.xml b/vaadin-spring-tests/pom.xml
@@ -62,11 +62,6 @@
                 <artifactId>vaadin-dialog-flow</artifactId>
                 <version>${vaadin.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.vaadin</groupId>
-                <artifactId>vaadin-notification-flow</artifactId>
-                <version>${vaadin.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-ordered-layout-flow</artifactId>
@@ -262,9 +257,9 @@
 
         <module>test-spring-security-flow</module>
         <module>test-spring-security-flow-contextpath</module>
-        <module>test-spring-security-fusion</module>
-        <module>test-spring-security-fusion-jwt</module>
-        <module>test-spring-security-fusion-contextpath</module>
+        <module>test-spring-security-hilla</module>
+        <module>test-spring-security-hilla-jwt</module>
+        <module>test-spring-security-hilla-contextpath</module>
 
         <!-- nexus-staging-maven-plugin requires the last module to be not skipped for deployment -->
         <module>dummy-module</module>

diff --git a/vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html b/vaadin-spring-tests/test-mvc-without-endpoints/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html b/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-boot-scan/frontend/index.html b/vaadin-spring-tests/test-spring-boot-scan/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-boot/frontend/index.html b/vaadin-spring-tests/test-spring-boot/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html b/vaadin-spring-tests/test-spring-security-flow-contextpath/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-security-flow/frontend/index.html b/vaadin-spring-tests/test-spring-security-flow/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <style>
+    body, #outlet {
+      height: 100vh;
+      width: 100%;
+      margin: 0;
+    }
+  </style>
+  <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+  <!-- This outlet div is where the views are rendered -->
+  <div id="outlet"></div>
+</body>
+</html>
diff --git a/vaadin-spring-tests/test-spring-security-fusion/tsconfig.json b/vaadin-spring-tests/test-spring-security-fusion/tsconfig.json
diff --git a/...ng-security-fusion-contextpath/.gitignore → ...ing-security-hilla-contextpath/.gitignore b/...ng-security-fusion-contextpath/.gitignore → ...ing-security-hilla-contextpath/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
+# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
 frontend/
diff --git a/...pring-security-fusion-contextpath/pom.xml → ...spring-security-hilla-contextpath/pom.xml b/...pring-security-fusion-contextpath/pom.xml → ...spring-security-hilla-contextpath/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-fusion-contextpath</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Fusion With Context Path</name>
+    <artifactId>test-spring-security-hilla-contextpath</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Hilla With Context Path</name>
     <packaging>jar</packaging>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -21,8 +21,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.vaadin</groupId>
-            <artifactId>fusion-endpoint</artifactId>
+            <groupId>dev.hilla</groupId>
+            <artifactId>hilla-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,18 +46,18 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-fusion</artifactId>
+            <artifactId>test-spring-security-hilla</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-fusion</artifactId>
+            <artifactId>test-spring-security-hilla</artifactId>
             <version>${project.version}</version>
             <classifier>frontend</classifier>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-fusion</artifactId>
+            <artifactId>test-spring-security-hilla</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -113,7 +113,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>com.vaadin</groupId>
-                                    <artifactId>test-spring-security-fusion</artifactId>
+                                    <artifactId>test-spring-security-hilla</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>frontend</classifier>
                                     <outputDirectory>${project.basedir}/frontend</outputDirectory>

diff --git a/...onsecurity/endpoints/BalanceEndpoint.java → ...lasecurity/endpoints/BalanceEndpoint.java b/...onsecurity/endpoints/BalanceEndpoint.java → ...lasecurity/endpoints/BalanceEndpoint.java
@@ -1,14 +1,13 @@
-package com.vaadin.flow.spring.fusionsecurity.endpoints;
-
-import java.math.BigDecimal;
+package com.vaadin.flow.spring.hillasecurity.endpoints;
 
 import javax.annotation.security.PermitAll;
-
-import com.vaadin.fusion.Endpoint;
-import com.vaadin.flow.spring.fusionsecurity.service.BankService;
+import java.math.BigDecimal;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.vaadin.flow.spring.hillasecurity.service.BankService;
+import dev.hilla.Endpoint;
+
 @Endpoint
 @PermitAll
 public class BalanceEndpoint {

diff --git a/...nsecurity/endpoints/ElementsEndpoint.java → ...asecurity/endpoints/ElementsEndpoint.java b/...nsecurity/endpoints/ElementsEndpoint.java → ...asecurity/endpoints/ElementsEndpoint.java
@@ -1,12 +1,12 @@
-package com.vaadin.flow.spring.fusionsecurity.endpoints;
+package com.vaadin.flow.spring.hillasecurity.endpoints;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import com.vaadin.fusion.Endpoint;
-import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements;
-import com.vaadin.flow.spring.fusionsecurity.fusionform.Elements.Options;
+import dev.hilla.Endpoint;
+import com.vaadin.flow.spring.hillasecurity.hillaform.Elements;
+import com.vaadin.flow.spring.hillasecurity.hillaform.Elements.Options;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint

diff --git a/...ionsecurity/endpoints/PublicEndpoint.java → ...llasecurity/endpoints/PublicEndpoint.java b/...ionsecurity/endpoints/PublicEndpoint.java → ...llasecurity/endpoints/PublicEndpoint.java
@@ -1,8 +1,8 @@
-package com.vaadin.flow.spring.fusionsecurity.endpoints;
+package com.vaadin.flow.spring.hillasecurity.endpoints;
 
 import java.time.LocalDateTime;
 
-import com.vaadin.fusion.Endpoint;
+import dev.hilla.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
 @Endpoint

diff --git a/...onsecurity/endpoints/SessionEndpoint.java → ...lasecurity/endpoints/SessionEndpoint.java b/...onsecurity/endpoints/SessionEndpoint.java → ...lasecurity/endpoints/SessionEndpoint.java
@@ -1,9 +1,9 @@
-package com.vaadin.flow.spring.fusionsecurity.endpoints;
+package com.vaadin.flow.spring.hillasecurity.endpoints;
 
 import com.vaadin.flow.server.VaadinRequest;
 import com.vaadin.flow.server.WrappedSession;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.fusion.Endpoint;
+import dev.hilla.Endpoint;
 
 @Endpoint
 @AnonymousAllowed

diff --git a/...nsecurity/endpoints/UserInfoEndpoint.java → ...asecurity/endpoints/UserInfoEndpoint.java b/...nsecurity/endpoints/UserInfoEndpoint.java → ...asecurity/endpoints/UserInfoEndpoint.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.fusionsecurity.endpoints;
+package com.vaadin.flow.spring.hillasecurity.endpoints;
 
 import javax.annotation.Nullable;
 
-import com.vaadin.fusion.Endpoint;
+import dev.hilla.Endpoint;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
-import com.vaadin.flow.spring.fusionsecurity.SecurityUtils;
-import com.vaadin.flow.spring.fusionsecurity.data.UserInfo;
+import com.vaadin.flow.spring.hillasecurity.SecurityUtils;
+import com.vaadin.flow.spring.hillasecurity.data.UserInfo;
 
 import org.springframework.beans.factory.annotation.Autowired;
 

diff --git a/...usionsecuritycontextpath/Application.java → ...hillasecuritycontextpath/Application.java b/...usionsecuritycontextpath/Application.java → ...hillasecuritycontextpath/Application.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.fusionsecuritycontextpath;
+package com.vaadin.flow.spring.hillasecuritycontextpath;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class Application
-        extends com.vaadin.flow.spring.fusionsecurity.Application {
+        extends com.vaadin.flow.spring.hillasecurity.Application {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...fusionsecuritycontextpath/SecurityIT.java → .../hillasecuritycontextpath/SecurityIT.java b/...fusionsecuritycontextpath/SecurityIT.java → .../hillasecuritycontextpath/SecurityIT.java
@@ -1,7 +1,7 @@
-package com.vaadin.flow.spring.fusionsecuritycontextpath;
+package com.vaadin.flow.spring.hillasecuritycontextpath;
 
 public class SecurityIT
-        extends com.vaadin.flow.spring.fusionsecurity.SecurityIT {
+        extends com.vaadin.flow.spring.hillasecurity.SecurityIT {
 
     @Override
     protected String getRootURL() {

diff --git a/...est-spring-security-fusion-jwt/.gitignore → ...test-spring-security-hilla-jwt/.gitignore b/...est-spring-security-fusion-jwt/.gitignore → ...test-spring-security-hilla-jwt/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
+# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
 frontend/