Skip to content

refactor: Move platform detector out of frontend #23160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caalador merged 2 commits into from
Jan 9, 2026
Merged

refactor: Move platform detector out of frontend #23160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa52af6
refactor: Move platform detector out of frontend
Artur- Jan 9, 2026
54e75b7
fix test
Artur- Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...flow-dev-bundle-plugin/src/main/java/com/vaadin/flow/plugin/maven/BuildDevBundleMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import com.vaadin.flow.component.dependency.JsModule;
import com.vaadin.flow.component.dependency.NpmPackage;
import com.vaadin.flow.internal.FrontendUtils;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
import com.vaadin.flow.plugin.base.PluginAdapterBase;
import com.vaadin.flow.plugin.base.PluginAdapterBuild;
Expand All @@ -63,7 +64,6 @@
import com.vaadin.flow.server.frontend.ExecutionFailedException;
import com.vaadin.flow.server.frontend.FrontendTools;
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
import com.vaadin.flow.server.scanner.ReflectionsClassFinder;
import com.vaadin.flow.theme.Theme;
Expand Down
2 changes: 1 addition & 1 deletion ...plugins/flow-gradle-plugin/src/main/kotlin/com/vaadin/gradle/VaadinFlowPluginExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import com.vaadin.flow.server.frontend.FrontendTools
import com.vaadin.flow.server.frontend.FrontendToolsSettings
import com.vaadin.flow.internal.FrontendUtils
import com.vaadin.flow.server.frontend.installer.NodeInstaller
import com.vaadin.flow.server.frontend.installer.Platform
import com.vaadin.flow.internal.Platform
import groovy.lang.Closure
import groovy.lang.DelegatesTo
import org.gradle.api.Action
Expand Down
2 changes: 1 addition & 1 deletion ...ns/flow-maven-plugin/src/main/java/com/vaadin/flow/plugin/maven/FlowModeAbstractMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
import org.codehaus.plexus.build.BuildContext;

import com.vaadin.flow.internal.FrontendUtils;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.internal.StringUtil;
import com.vaadin.flow.plugin.base.BuildFrontendUtil;
import com.vaadin.flow.plugin.base.PluginAdapterBase;
import com.vaadin.flow.server.Constants;
import com.vaadin.flow.server.InitParameters;
import com.vaadin.flow.server.frontend.FrontendTools;
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
import com.vaadin.flow.server.scanner.ReflectionsClassFinder;

Expand Down
4 changes: 1 addition & 3 deletions ...w/server/frontend/installer/Platform.java → ...va/com/vaadin/flow/internal/Platform.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
package com.vaadin.flow.server.frontend.installer;
package com.vaadin.flow.internal;

import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;

import com.vaadin.flow.internal.FrontendVersion;

/**
* Platform contains information about system architecture and OS.
* <p>
Expand Down
2 changes: 1 addition & 1 deletion flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendTools.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
import com.vaadin.flow.internal.FrontendUtils.UnknownVersionException;
import com.vaadin.flow.internal.FrontendVersion;
import com.vaadin.flow.internal.Pair;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.server.InitParameters;
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.server.frontend.installer.ProxyConfig;
import com.vaadin.flow.server.startup.ApplicationConfiguration;

Expand Down
2 changes: 1 addition & 1 deletion flow-server/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import com.vaadin.flow.function.SerializableSupplier;
import com.vaadin.flow.internal.FrontendUtils;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.server.Constants;
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
import com.vaadin.flow.server.frontend.installer.Platform;

import static com.vaadin.flow.server.frontend.FrontendTools.DEFAULT_NODE_VERSION;

Expand Down
2 changes: 1 addition & 1 deletion flow-server/src/main/java/com/vaadin/flow/server/frontend/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
import com.vaadin.experimental.FeatureFlags;
import com.vaadin.flow.di.Lookup;
import com.vaadin.flow.internal.FrontendUtils;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.server.Constants;
import com.vaadin.flow.server.frontend.installer.NodeInstaller;
import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
import com.vaadin.flow.server.frontend.scanner.FrontendDependenciesScanner;

Expand Down
1 change: 1 addition & 0 deletions flow-server/src/main/java/com/vaadin/flow/server/frontend/installer/NodeInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import com.vaadin.flow.internal.FrontendVersion;
import com.vaadin.flow.internal.MessageDigestUtil;
import com.vaadin.flow.internal.Pair;
import com.vaadin.flow.internal.Platform;
import com.vaadin.frontendtools.installer.ArchiveExtractionException;
import com.vaadin.frontendtools.installer.ArchiveExtractor;
import com.vaadin.frontendtools.installer.DefaultArchiveExtractor;
Expand Down
2 changes: 1 addition & 1 deletion flow-server/src/test/java/com/vaadin/flow/server/frontend/FrontendToolsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
import com.vaadin.flow.function.SerializableSupplier;
import com.vaadin.flow.internal.FrontendUtils;
import com.vaadin.flow.internal.FrontendVersion;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.internal.ReflectTools;
import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.server.frontend.installer.ProxyConfig;
import com.vaadin.flow.testcategory.SlowTests;

Expand Down
3 changes: 2 additions & 1 deletion flow-server/src/test/java/com/vaadin/flow/server/frontend/installer/NodeInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,10 @@
import org.mockito.Mockito;

import com.vaadin.flow.internal.FrontendVersion;
import com.vaadin.flow.internal.Platform;
import com.vaadin.flow.server.frontend.FrontendTools;

import static com.vaadin.flow.server.frontend.installer.Platform.ALPINE_RELEASE_FILE_PATH;
import static com.vaadin.flow.internal.Platform.ALPINE_RELEASE_FILE_PATH;

public class NodeInstallerTest {

Expand Down
2 changes: 1 addition & 1 deletion flow-test-generic/src/main/java/com/vaadin/flow/testutil/ClassesSerializableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ protected Stream<String> getExcludedPatterns() {
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.FileDownloader(\\$.*)?",
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.NodeInstaller",
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.NodeInstaller\\$InstallData",
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.Platform",
"com\\.vaadin\\.flow\\.internal\\.Platform",
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.ProxyConfig\\$Proxy",
"com\\.vaadin\\.flow\\.server\\.frontend\\.installer\\.ProxyConfig",
"com\\.vaadin\\.flow\\.server\\.frontend\\.ProxyFactory",
Expand Down
2 changes: 1 addition & 1 deletion flow-test-util/src/main/java/com/vaadin/flow/testutil/net/PortProber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.vaadin.flow.server.frontend.installer.Platform;
import com.vaadin.flow.internal.Platform;

/**
* Class for determining a free localhost port that is not used by any ipv4 or
Expand Down
Loading