feat: rename dev.hilla to com.vaadin.hilla (#18337)

* Rename dev.hilla to com.vaadin.hilla * formatting
vaadin · Feb 7, 2024 · 05437f4 · 05437f4
1 parent ce3c8f4
commit 05437f4
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/...s/flow-maven-plugin/src/test/java/com/vaadin/flow/plugin/maven/BuildFrontendMojoTest.java b/...s/flow-maven-plugin/src/test/java/com/vaadin/flow/plugin/maven/BuildFrontendMojoTest.java
@@ -147,7 +147,7 @@ public void setup() throws Exception {
 
         defaultJavaSource = new File(".", "src/test/java");
         openApiJsonFile = new File(npmFolder,
-                "target/classes/dev/hilla/openapi.json");
+                "target/classes/com/vaadin/hilla/openapi.json");
         generatedTsFolder = new File(npmFolder, "frontend/generated");
 
         Assert.assertTrue("Failed to create a test project resources",

diff --git a/...n-plugin/src/test/java/com/vaadin/flow/plugin/maven/TestEndpointGeneratorTaskFactory.java b/...n-plugin/src/test/java/com/vaadin/flow/plugin/maven/TestEndpointGeneratorTaskFactory.java
@@ -119,7 +119,7 @@ public TestTaskGenerateOpenAPI(Options options) {
         @Override
         public void execute() {
             writeFile(new File(options.getBuildDirectory(),
-                    "classes/dev/hilla/openapi.json"), "{}");
+                    "classes/com/vaadin/hilla/openapi.json"), "{}");
         }
     }
 

diff --git a/...ins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java b/...ins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java
@@ -90,7 +90,7 @@ public void should_notUseHilla_inPrepareFrontend()
         setupPluginAdapterDefaults();
 
         File openApiJsonFile = new File(new File(baseDir, Constants.TARGET),
-                "classes/dev/hilla/openapi.json");
+                "classes/com/vaadin/hilla/openapi.json");
         Mockito.when(adapter.openApiJsonFile()).thenReturn(openApiJsonFile);
 
         BuildFrontendUtil.prepareFrontend(adapter);
@@ -225,7 +225,7 @@ private void setupPluginAdapterDefaults() throws URISyntaxException {
                 .thenReturn(javaResourceFolder);
         Mockito.when(adapter.openApiJsonFile())
                 .thenReturn(new File(new File(baseDir, Constants.TARGET),
-                        "classes/dev/hilla/openapi.json"));
+                        "classes/com/vaadin/hilla/openapi.json"));
         Mockito.when(adapter.getClassFinder())
                 .thenReturn(new ClassFinder.DefaultClassFinder(
                         this.getClass().getClassLoader()));

diff --git a/flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/TestUtil.java b/flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/TestUtil.java
@@ -52,7 +52,7 @@ public static void stubPluginAdapterBase(PluginAdapterBase adapter,
                 .thenReturn(new File(baseDir, "src/main/resources"));
         Mockito.when(adapter.openApiJsonFile())
                 .thenReturn(new File(new File(baseDir, Constants.TARGET),
-                        "classes/dev/hilla/openapi.json"));
+                        "classes/com/vaadin/hilla/openapi.json"));
         Mockito.when(adapter.getClassFinder())
                 .thenReturn(new ClassFinder.DefaultClassFinder(
                         TestUtil.class.getClassLoader()));

diff --git a/flow-server/src/main/java/com/vaadin/flow/internal/hilla/EndpointRequestUtil.java b/flow-server/src/main/java/com/vaadin/flow/internal/hilla/EndpointRequestUtil.java
@@ -59,7 +59,7 @@ public interface EndpointRequestUtil extends Serializable {
      */
     static boolean isHillaAvailable() {
         try {
-            Class.forName("dev.hilla.EndpointController");
+            Class.forName("com.vaadin.hilla.EndpointController");
             return true;
         } catch (ClassNotFoundException e) {
             return false;

diff --git a/flow-server/src/main/java/com/vaadin/flow/server/Platform.java b/flow-server/src/main/java/com/vaadin/flow/server/Platform.java
@@ -91,14 +91,14 @@ public static Optional<String> getHillaVersion() {
         if (hillaVersion == null) {
             try (final InputStream hillaPomProperties = Thread.currentThread()
                     .getContextClassLoader().getResourceAsStream(
-                            "META-INF/maven/dev.hilla/hilla/pom.properties")) {
+                            "META-INF/maven/com.vaadin.hilla/hilla/pom.properties")) {
                 if (hillaPomProperties != null) {
                     final Properties properties = new Properties();
                     properties.load(hillaPomProperties);
                     hillaVersion = properties.getProperty("version", "");
                 } else {
                     LOGGER.info("Unable to determine Hilla version. "
-                            + "No META-INF/maven/dev.hilla/hilla/pom.properties found");
+                            + "No META-INF/maven/com.vaadin.hilla/hilla/pom.properties found");
                     hillaVersion = "";
                 }
             } catch (Exception e) {

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/PlatformTest.java b/flow-server/src/test/java/com/vaadin/flow/server/PlatformTest.java
@@ -64,8 +64,8 @@ private void fakeVaadinHilla(String vaadinVersion, String hillaVersion)
 
         if (hillaVersion != null) {
             final Path hillaJar = temporary.newFolder().toPath();
-            final Path pomProperties = hillaJar
-                    .resolve("META-INF/maven/dev.hilla/hilla/pom.properties");
+            final Path pomProperties = hillaJar.resolve(
+                    "META-INF/maven/com.vaadin.hilla/hilla/pom.properties");
             Files.createDirectories(pomProperties.getParent());
             Files.writeString(pomProperties, "version=" + hillaVersion);
             classPath.add(hillaJar.toUri().toURL());

diff --git a/vaadin-dev-server/src/test/java/com/vaadin/base/devserver/DevModeEndpointTest.java b/vaadin-dev-server/src/test/java/com/vaadin/base/devserver/DevModeEndpointTest.java
@@ -101,7 +101,7 @@ public void setup() throws Exception {
     @Test
     public void should_generateOpenApi() throws Exception {
         File generatedOpenApiJson = Paths
-                .get(baseDir, TARGET, "classes/dev/hilla/openapi.json")
+                .get(baseDir, TARGET, "classes/com/vaadin/hilla/openapi.json")
                 .toFile();
 
         Assert.assertFalse(generatedOpenApiJson.exists());

diff --git a/...-dev-server/src/test/java/com/vaadin/base/devserver/TestEndpointGeneratorTaskFactory.java b/...-dev-server/src/test/java/com/vaadin/base/devserver/TestEndpointGeneratorTaskFactory.java
@@ -119,7 +119,7 @@ public TestTaskGenerateOpenAPI(Options options) {
         @Override
         public void execute() {
             writeFile(new File(options.getBuildDirectory(),
-                    "classes/dev/hilla/openapi.json"), "{}");
+                    "classes/com/vaadin/hilla/openapi.json"), "{}");
         }
     }
 

diff --git a/...in-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeInitializerTest.java b/...in-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeInitializerTest.java
@@ -338,7 +338,7 @@ public void should_generateOpenApi_when_EndpointPresents()
             throws Exception {
         String originalJavaSourceFolder = null;
         File generatedOpenApiJson = Paths
-                .get(baseDir, TARGET, "classes/dev/hilla/openapi.json")
+                .get(baseDir, TARGET, "classes/com/vaadin/hilla/openapi.json")
                 .toFile();
         try {
             originalJavaSourceFolder = System
@@ -374,7 +374,7 @@ public void should_notGenerateOpenApi_when_EndpointIsNotUsed()
             throws Exception {
         String originalJavaSourceFolder = null;
         File generatedOpenApiJson = Paths
-                .get(baseDir, TARGET, "classes/dev/hilla/openapi.json")
+                .get(baseDir, TARGET, "classes/com/vaadin/hilla/openapi.json")
                 .toFile();
         try {
             originalJavaSourceFolder = System

diff --git a/vaadin-dev-server/src/test/resources/java/MyEndpoint.java b/vaadin-dev-server/src/test/resources/java/MyEndpoint.java
@@ -1,4 +1,4 @@
-import dev.hilla.Endpoint;
+import com.vaadin.hilla.Endpoint;
 
 /**
  * A test class.

diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/VaadinServletContextInitializer.java
@@ -142,7 +142,7 @@ public class VaadinServletContextInitializer
                     Theme.class.getPackage().getName(),
                     // LitRenderer uses script annotation
                     "com.vaadin.flow.data.renderer", "com.vaadin.shrinkwrap",
-                    "dev.hilla")
+                    "com.vaadin.hilla")
             .collect(Collectors.toList());
 
     /**
@@ -892,7 +892,7 @@ List<String> getDefaultPackages() {
     private List<String> getLookupPackages() {
         return Stream
                 .concat(getDefaultPackages().stream(),
-                        Stream.of("dev.hilla.frontend",
+                        Stream.of("com.vaadin.hilla.frontend",
                                 "com.vaadin.flow.component.polymertemplate.rpc",
                                 "com.vaadin.base.devserver"))
                 .collect(Collectors.toList());