From b375e0a2853d70db23ba3296f3eb105cb47b9f96 Mon Sep 17 00:00:00 2001 From: Tomi Virtanen Date: Fri, 4 Oct 2024 14:02:18 +0300 Subject: [PATCH] chore: update imports to MenuRegistry RelatedTo: vaadin/flow/issues/20063 --- .../hilla/route/RouteUnifyingIndexHtmlRequestListener.java | 2 +- .../src/main/java/com/vaadin/hilla/route/RouteUtil.java | 2 +- .../vaadin/hilla/route/ServerAndClientViewsProvider.java | 2 +- .../hilla/startup/RouteUnifyingServiceInitListener.java | 2 +- .../route/RouteUnifyingIndexHtmlRequestListenerTest.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListener.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListener.java index 228617b5fd..e01945b147 100644 --- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListener.java +++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListener.java @@ -32,7 +32,7 @@ import com.vaadin.flow.server.auth.NavigationAccessControl; import com.vaadin.flow.server.auth.ViewAccessChecker; import com.vaadin.flow.server.menu.AvailableViewInfo; -import com.vaadin.flow.server.menu.MenuRegistry; +import com.vaadin.flow.internal.menu.MenuRegistry; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUtil.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUtil.java index 64e68739d1..1db3302c3f 100644 --- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUtil.java +++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/RouteUtil.java @@ -5,7 +5,7 @@ import com.vaadin.flow.server.VaadinRequest; import com.vaadin.flow.server.VaadinServletContext; import com.vaadin.flow.server.menu.AvailableViewInfo; -import com.vaadin.flow.server.menu.MenuRegistry; +import com.vaadin.flow.internal.menu.MenuRegistry; import com.vaadin.flow.server.startup.ApplicationConfiguration; import jakarta.servlet.http.HttpServletRequest; diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/ServerAndClientViewsProvider.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/ServerAndClientViewsProvider.java index 73cbb1e7ac..5f478373b9 100644 --- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/ServerAndClientViewsProvider.java +++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/route/ServerAndClientViewsProvider.java @@ -28,7 +28,7 @@ import com.vaadin.flow.server.auth.ViewAccessChecker; import com.vaadin.flow.server.communication.IndexHtmlResponse; import com.vaadin.flow.server.menu.AvailableViewInfo; -import com.vaadin.flow.server.menu.MenuRegistry; +import com.vaadin.flow.internal.menu.MenuRegistry; import com.vaadin.flow.server.menu.RouteParamType; public class ServerAndClientViewsProvider { diff --git a/packages/java/endpoint/src/main/java/com/vaadin/hilla/startup/RouteUnifyingServiceInitListener.java b/packages/java/endpoint/src/main/java/com/vaadin/hilla/startup/RouteUnifyingServiceInitListener.java index ad790ab9be..6d751f9818 100644 --- a/packages/java/endpoint/src/main/java/com/vaadin/hilla/startup/RouteUnifyingServiceInitListener.java +++ b/packages/java/endpoint/src/main/java/com/vaadin/hilla/startup/RouteUnifyingServiceInitListener.java @@ -26,7 +26,7 @@ import com.vaadin.flow.server.auth.NavigationAccessControl; import com.vaadin.flow.server.auth.ViewAccessChecker; import com.vaadin.flow.server.menu.AvailableViewInfo; -import com.vaadin.flow.server.menu.MenuRegistry; +import com.vaadin.flow.internal.menu.MenuRegistry; import com.vaadin.flow.shared.ApplicationConstants; import com.vaadin.flow.shared.JsonConstants; import com.vaadin.hilla.HillaStats; diff --git a/packages/java/endpoint/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java b/packages/java/endpoint/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java index 87fe4036e4..da864fb791 100644 --- a/packages/java/endpoint/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java +++ b/packages/java/endpoint/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java @@ -42,10 +42,10 @@ import com.vaadin.flow.server.auth.MenuAccessControl; import com.vaadin.flow.server.communication.IndexHtmlResponse; import com.vaadin.flow.server.menu.AvailableViewInfo; -import com.vaadin.flow.server.menu.MenuRegistry; +import com.vaadin.flow.internal.menu.MenuRegistry; -import static com.vaadin.flow.server.menu.MenuRegistry.FILE_ROUTES_JSON_NAME; -import static com.vaadin.flow.server.menu.MenuRegistry.FILE_ROUTES_JSON_PROD_PATH; +import static com.vaadin.flow.internal.menu.MenuRegistry.FILE_ROUTES_JSON_NAME; +import static com.vaadin.flow.internal.menu.MenuRegistry.FILE_ROUTES_JSON_PROD_PATH; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.CALLS_REAL_METHODS;