refactor: Move ThemeUtils and CSSBundler to internal package (#22983)

They are not related the the frontend build

Author: Artur-

flow-server/src/main/java/com/vaadin/flow/component/internal/StyleSheetHotswapper.java

@@ -46,11 +46,11 @@
 import com.vaadin.flow.hotswap.VaadinHotswapper;
 import com.vaadin.flow.internal.ActiveStyleSheetTracker;
 import com.vaadin.flow.internal.AnnotationReader;
+import com.vaadin.flow.internal.CssBundler;
 import com.vaadin.flow.internal.FrontendUtils;
 import com.vaadin.flow.server.AppShellRegistry;
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.VaadinSession;
-import com.vaadin.flow.server.frontend.CssBundler;
 import com.vaadin.flow.server.startup.ApplicationConfiguration;
 import com.vaadin.flow.shared.ApplicationConstants;
 import com.vaadin.flow.shared.ui.Dependency;

…din/flow/server/frontend/CssBundler.java …com/vaadin/flow/internal/CssBundler.javaflow-server/src/main/java/com/vaadin/flow/server/frontend/CssBundler.java renamed to flow-server/src/main/java/com/vaadin/flow/internal/CssBundler.java flow-server/src/main/java/com/vaadin/flow/server/frontend/CssBundler.java renamed to flow-server/src/main/java/com/vaadin/flow/internal/CssBundler.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.flow.server.frontend;
+package com.vaadin.flow.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -31,9 +31,6 @@
 import org.slf4j.LoggerFactory;
 import tools.jackson.databind.JsonNode;
 
-import com.vaadin.flow.internal.JacksonUtils;
-import com.vaadin.flow.internal.StringUtil;
-
 /**
  * Utility methods to handle application theme CSS content.
  * <p>

…din/flow/server/frontend/ThemeUtils.java …com/vaadin/flow/internal/ThemeUtils.javaflow-server/src/main/java/com/vaadin/flow/server/frontend/ThemeUtils.java renamed to flow-server/src/main/java/com/vaadin/flow/internal/ThemeUtils.java flow-server/src/main/java/com/vaadin/flow/server/frontend/ThemeUtils.java renamed to flow-server/src/main/java/com/vaadin/flow/internal/ThemeUtils.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.flow.server.frontend;
+package com.vaadin.flow.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,9 +33,6 @@
 import tools.jackson.databind.JsonNode;
 
 import com.vaadin.flow.component.page.AppShellConfigurator;
-import com.vaadin.flow.internal.FileIOUtils;
-import com.vaadin.flow.internal.FrontendUtils;
-import com.vaadin.flow.internal.JacksonUtils;
 import com.vaadin.flow.server.AbstractConfiguration;
 import com.vaadin.flow.server.AppShellRegistry;
 import com.vaadin.flow.server.Constants;

flow-server/src/main/java/com/vaadin/flow/server/BootstrapHandler.java

@@ -67,9 +67,11 @@
 import com.vaadin.flow.function.DeploymentConfiguration;
 import com.vaadin.flow.internal.AnnotationReader;
 import com.vaadin.flow.internal.BootstrapHandlerHelper;
+import com.vaadin.flow.internal.CssBundler;
 import com.vaadin.flow.internal.FrontendUtils;
 import com.vaadin.flow.internal.JacksonUtils;
 import com.vaadin.flow.internal.ReflectTools;
+import com.vaadin.flow.internal.ThemeUtils;
 import com.vaadin.flow.internal.UsageStatisticsExporter;
 import com.vaadin.flow.router.InvalidLocationException;
 import com.vaadin.flow.router.Location;
@@ -79,9 +81,7 @@
 import com.vaadin.flow.server.communication.IndexHtmlRequestHandler;
 import com.vaadin.flow.server.communication.PushConnectionFactory;
 import com.vaadin.flow.server.communication.UidlWriter;
-import com.vaadin.flow.server.frontend.CssBundler;
 import com.vaadin.flow.server.frontend.DevBundleUtils;
-import com.vaadin.flow.server.frontend.ThemeUtils;
 import com.vaadin.flow.server.startup.ApplicationConfiguration;
 import com.vaadin.flow.shared.ApplicationConstants;
 import com.vaadin.flow.shared.VaadinUriResolver;

flow-server/src/main/java/com/vaadin/flow/server/StaticFileServer.java

@@ -48,8 +48,8 @@
 import com.vaadin.flow.internal.DevModeHandlerManager;
 import com.vaadin.flow.internal.FrontendUtils;
 import com.vaadin.flow.internal.ResponseWriter;
+import com.vaadin.flow.internal.ThemeUtils;
 import com.vaadin.flow.server.frontend.DevBundleUtils;
-import com.vaadin.flow.server.frontend.ThemeUtils;
 
 import static com.vaadin.flow.server.Constants.VAADIN_MAPPING;
 import static com.vaadin.flow.server.Constants.VAADIN_WEBAPP_RESOURCES;

flow-server/src/main/java/com/vaadin/flow/server/communication/IndexHtmlRequestHandler.java

@@ -53,6 +53,7 @@
 import com.vaadin.flow.internal.FrontendUtils;
 import com.vaadin.flow.internal.JacksonUtils;
 import com.vaadin.flow.internal.LocaleUtil;
+import com.vaadin.flow.internal.ThemeUtils;
 import com.vaadin.flow.internal.UsageStatisticsExporter;
 import com.vaadin.flow.internal.springcsrf.SpringCsrfTokenUtil;
 import com.vaadin.flow.server.AbstractConfiguration;
@@ -67,7 +68,6 @@
 import com.vaadin.flow.server.VaadinService;
 import com.vaadin.flow.server.VaadinServletContext;
 import com.vaadin.flow.server.VaadinSession;
-import com.vaadin.flow.server.frontend.ThemeUtils;
 import com.vaadin.flow.server.startup.ApplicationConfiguration;
 import com.vaadin.flow.shared.ApplicationConstants;
 

flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskProcessStylesheetCss.java

@@ -25,6 +25,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.vaadin.flow.component.dependency.StyleSheet;
+import com.vaadin.flow.internal.CssBundler;
 import com.vaadin.flow.server.frontend.scanner.ClassFinder;
 
 /**

flow-server/src/main/java/com/vaadin/flow/server/frontend/ThemeValidationUtil.java

@@ -42,6 +42,7 @@
 import com.vaadin.flow.internal.FileIOUtils;
 import com.vaadin.flow.internal.JacksonUtils;
 import com.vaadin.flow.internal.StringUtil;
+import com.vaadin.flow.internal.ThemeUtils;
 import com.vaadin.flow.server.Constants;
 import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner;
 import com.vaadin.flow.theme.ThemeDefinition;

…flow/server/frontend/CssBundlerTest.java …vaadin/flow/internal/CssBundlerTest.javaflow-server/src/test/java/com/vaadin/flow/server/frontend/CssBundlerTest.java renamed to flow-server/src/test/java/com/vaadin/flow/internal/CssBundlerTest.java flow-server/src/test/java/com/vaadin/flow/server/frontend/CssBundlerTest.java renamed to flow-server/src/test/java/com/vaadin/flow/internal/CssBundlerTest.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.vaadin.flow.server.frontend;
+package com.vaadin.flow.internal;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,8 +27,6 @@
 import tools.jackson.databind.JsonNode;
 import tools.jackson.databind.ObjectMapper;
 
-import com.vaadin.flow.internal.JacksonUtils;
-
 public class CssBundlerTest {
 
     private static final String TEST_CSS = "body {background: blue};";

flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java

@@ -240,7 +240,7 @@ protected Stream<String> getExcludedPatterns() {
                 // Frontend tasks classes which are not stored anywhere but used
                 // only once
                 "com\\.vaadin\\.flow\\.server\\.frontend\\.scanner\\..*",
-                "com\\.vaadin\\.flow\\.server\\.frontend\\.CssBundler",
+                "com\\.vaadin\\.flow\\.internal\\.CssBundler",
                 "com\\.vaadin\\.flow\\.server\\.frontend\\.FrontendTools",
                 "com\\.vaadin\\.flow\\.server\\.frontend\\.JarContentsManager",
                 "com\\.vaadin\\.flow\\.server\\.frontend\\.VersionsJsonConverter",