Revert "refactor!: rename Fusion to Hilla (#995)" (#996)

This reverts commit 42b2cd0.
vaadin · Jan 10, 2022 · ce23ea6 · ce23ea6
1 parent 42b2cd0
commit ce23ea6
Show file tree

Hide file tree

Showing 91 changed files with 202 additions and 371 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,6 @@
 
         <!-- 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,6 +62,11 @@
                 <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>
@@ -257,9 +262,9 @@
 
         <module>test-spring-security-flow</module>
         <module>test-spring-security-flow-contextpath</module>
-        <module>test-spring-security-hilla</module>
-        <module>test-spring-security-hilla-jwt</module>
-        <module>test-spring-security-hilla-contextpath</module>
+        <module>test-spring-security-fusion</module>
+        <module>test-spring-security-fusion-jwt</module>
+        <module>test-spring-security-fusion-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
diff --git a/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.html b/vaadin-spring-tests/test-spring-boot-contextpath/frontend/index.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
diff --git a/vaadin-spring-tests/test-spring-boot/frontend/index.html b/vaadin-spring-tests/test-spring-boot/frontend/index.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
diff --git a/vaadin-spring-tests/test-spring-security-flow/frontend/index.html b/vaadin-spring-tests/test-spring-security-flow/frontend/index.html
diff --git a/...ing-security-hilla-contextpath/.gitignore → ...ng-security-fusion-contextpath/.gitignore b/...ing-security-hilla-contextpath/.gitignore → ...ng-security-fusion-contextpath/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
+# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
 frontend/
diff --git a/...spring-security-hilla-contextpath/pom.xml → ...pring-security-fusion-contextpath/pom.xml b/...spring-security-hilla-contextpath/pom.xml → ...pring-security-fusion-contextpath/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-hilla-contextpath</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Hilla With Context Path</name>
+    <artifactId>test-spring-security-fusion-contextpath</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Fusion 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>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -46,18 +46,18 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <classifier>frontend</classifier>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</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-hilla</artifactId>
+                                    <artifactId>test-spring-security-fusion</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>frontend</classifier>
                                     <outputDirectory>${project.basedir}/frontend</outputDirectory>

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

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

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

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

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

diff --git a/...hillasecuritycontextpath/Application.java → ...usionsecuritycontextpath/Application.java b/...hillasecuritycontextpath/Application.java → ...usionsecuritycontextpath/Application.java
@@ -1,11 +1,11 @@
-package com.vaadin.flow.spring.hillasecuritycontextpath;
+package com.vaadin.flow.spring.fusionsecuritycontextpath;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class Application
-        extends com.vaadin.flow.spring.hillasecurity.Application {
+        extends com.vaadin.flow.spring.fusionsecurity.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/.../hillasecuritycontextpath/SecurityIT.java → ...fusionsecuritycontextpath/SecurityIT.java b/.../hillasecuritycontextpath/SecurityIT.java → ...fusionsecuritycontextpath/SecurityIT.java
@@ -1,7 +1,7 @@
-package com.vaadin.flow.spring.hillasecuritycontextpath;
+package com.vaadin.flow.spring.fusionsecuritycontextpath;
 
 public class SecurityIT
-        extends com.vaadin.flow.spring.hillasecurity.SecurityIT {
+        extends com.vaadin.flow.spring.fusionsecurity.SecurityIT {
 
     @Override
     protected String getRootURL() {

diff --git a/...test-spring-security-hilla-jwt/.gitignore → ...est-spring-security-fusion-jwt/.gitignore b/...test-spring-security-hilla-jwt/.gitignore → ...est-spring-security-fusion-jwt/.gitignore
@@ -1,3 +1,3 @@
 # ignore the frontend folder
-# since it's supposed to be extracted from test-spring-security-hilla:frontend jar
+# since it's supposed to be extracted from test-spring-security-fusion:frontend jar
 frontend/
diff --git a/...ts/test-spring-security-hilla-jwt/pom.xml → ...s/test-spring-security-fusion-jwt/pom.xml b/...ts/test-spring-security-hilla-jwt/pom.xml → ...s/test-spring-security-fusion-jwt/pom.xml
@@ -7,8 +7,8 @@
         <artifactId>vaadin-spring-tests</artifactId>
         <version>20.0-SNAPSHOT</version>
     </parent>
-    <artifactId>test-spring-security-hilla-jwt</artifactId>
-    <name>Integration tests for Vaadin Spring Security and Hilla With JWT</name>
+    <artifactId>test-spring-security-fusion-jwt</artifactId>
+    <name>Integration tests for Vaadin Spring Security and Fusion With JWT</name>
     <packaging>jar</packaging>
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
@@ -21,8 +21,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>dev.hilla</groupId>
-            <artifactId>hilla-endpoint</artifactId>
+            <groupId>com.vaadin</groupId>
+            <artifactId>fusion-endpoint</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,18 +38,18 @@
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <classifier>frontend</classifier>
         </dependency>
         <dependency>
             <groupId>com.vaadin</groupId>
-            <artifactId>test-spring-security-hilla</artifactId>
+            <artifactId>test-spring-security-fusion</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>
@@ -116,7 +116,7 @@
                             <artifactItems>
                                 <artifactItem>
                                     <groupId>com.vaadin</groupId>
-                                    <artifactId>test-spring-security-hilla</artifactId>
+                                    <artifactId>test-spring-security-fusion</artifactId>
                                     <version>${project.version}</version>
                                     <classifier>frontend</classifier>
                                     <outputDirectory>${project.basedir}/frontend</outputDirectory>