Skip to content

Commit e736cc8

Browse files
mshabarovmshabarov
authored
Revert "feat: execute Hilla tasks whenever Hilla is available (#20567)" (#21048)
This reverts commit 21a4145.
1 parent 0afeb5f commit e736cc8

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

‎flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
import com.vaadin.experimental.FeatureFlags;
3737
import com.vaadin.flow.di.Lookup;
38-
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
3938
import com.vaadin.flow.server.Constants;
4039
import com.vaadin.flow.server.ExecutionFailedException;
4140
import com.vaadin.flow.server.InitParameters;
@@ -152,10 +151,10 @@ public void should_useHillaEngine_withNodeUpdater()
152151
.when(endpointGeneratorTaskFactory)
153152
.createTaskGenerateEndpoint(Mockito.any());
154153

155-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
156-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
157-
util.when(() -> EndpointRequestUtil.isHillaAvailable(Mockito.any()))
158-
.thenReturn(true);
154+
try (MockedStatic<FrontendUtils> util = Mockito
155+
.mockStatic(FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
156+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
157+
Mockito.any())).thenReturn(true);
159158
BuildFrontendUtil.runNodeUpdater(adapter);
160159
}
161160

‎flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeTasks.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737

3838
import com.vaadin.flow.di.Lookup;
3939
import com.vaadin.flow.internal.UsageStatistics;
40-
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
4140
import com.vaadin.flow.server.Constants;
4241
import com.vaadin.flow.server.ExecutionFailedException;
4342
import com.vaadin.flow.server.Mode;
@@ -316,7 +315,8 @@ private void addGenerateServiceWorkerTask(Options options,
316315
}
317316

318317
private void addEndpointServicesTasks(Options options) {
319-
if (!EndpointRequestUtil.isHillaAvailable(options.getClassFinder())) {
318+
if (!FrontendUtils.isHillaUsed(options.getFrontendDirectory(),
319+
options.getClassFinder())) {
320320
return;
321321
}
322322
Lookup lookup = options.getLookup();

‎flow-server/src/test/java/com/vaadin/flow/server/frontend/NodeTasksHillaTest.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.mockito.junit.MockitoRule;
3232

3333
import com.vaadin.flow.di.Lookup;
34-
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
3534
import com.vaadin.flow.server.ExecutionFailedException;
3635
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
3736
import com.vaadin.flow.server.frontend.scanner.ClassFinder.DefaultClassFinder;
@@ -118,10 +117,10 @@ public void should_useHillaEngine_whenEnabled()
118117
Mockito.doReturn(endpointGeneratorTaskFactory).when(options.getLookup())
119118
.lookup(EndpointGeneratorTaskFactory.class);
120119

121-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
122-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
123-
util.when(() -> EndpointRequestUtil.isHillaAvailable(Mockito.any()))
124-
.thenReturn(true);
120+
try (MockedStatic<FrontendUtils> util = Mockito
121+
.mockStatic(FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
122+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
123+
Mockito.any())).thenReturn(true);
125124

126125
new NodeTasks(options).execute();
127126
}

‎vaadin-dev-server/src/test/java/com/vaadin/base/devserver/DevModeEndpointTest.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.vaadin.base.devserver.startup.DevModeStartupListener;
2323
import com.vaadin.flow.di.ResourceProvider;
2424
import com.vaadin.flow.internal.DevModeHandlerManager;
25-
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
2625
import com.vaadin.flow.server.VaadinServlet;
2726
import com.vaadin.flow.server.VaadinServletContext;
2827
import com.vaadin.flow.server.frontend.EndpointGeneratorTaskFactory;
@@ -108,10 +107,10 @@ public void should_generateOpenApi() throws Exception {
108107
.toFile();
109108

110109
Assert.assertFalse(generatedOpenApiJson.exists());
111-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
112-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
113-
util.when(() -> EndpointRequestUtil.isHillaAvailable(Mockito.any()))
114-
.thenReturn(true);
110+
try (MockedStatic<FrontendUtils> util = Mockito
111+
.mockStatic(FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
112+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
113+
Mockito.any())).thenReturn(true);
115114
devModeStartupListener.onStartup(classes, servletContext);
116115
handler = getDevModeHandler();
117116
waitForDevServer();
@@ -140,10 +139,10 @@ public void should_generateTs_files() throws Exception {
140139

141140
assertFalse(ts1.exists());
142141
assertFalse(ts2.exists());
143-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
144-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
145-
util.when(() -> EndpointRequestUtil.isHillaAvailable(Mockito.any()))
146-
.thenReturn(true);
142+
try (MockedStatic<FrontendUtils> util = Mockito
143+
.mockStatic(FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
144+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
145+
Mockito.any())).thenReturn(true);
147146
devModeStartupListener.onStartup(classes, servletContext);
148147
handler = getDevModeHandler();
149148
waitForDevServer();

‎vaadin-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeInitializerTest.java

+8-9
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import com.vaadin.flow.component.dependency.JsModule;
3737
import com.vaadin.flow.component.page.AppShellConfigurator;
3838
import com.vaadin.flow.di.Lookup;
39-
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
4039
import com.vaadin.flow.router.Route;
4140
import com.vaadin.flow.server.InitParameters;
4241
import com.vaadin.flow.server.LoadDependenciesOnStartup;
@@ -353,10 +352,10 @@ public void should_generateOpenApi_when_EndpointPresents()
353352
javaSourceFolder.getRoot().getAbsolutePath());
354353

355354
Assert.assertFalse(generatedOpenApiJson.exists());
356-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
357-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
358-
util.when(() -> EndpointRequestUtil
359-
.isHillaAvailable(Mockito.any())).thenReturn(true);
355+
try (MockedStatic<FrontendUtils> util = Mockito.mockStatic(
356+
FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
357+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
358+
Mockito.any())).thenReturn(true);
360359
devModeStartupListener.onStartup(classes, servletContext);
361360
handler = getDevModeHandler();
362361
waitForDevServer();
@@ -421,10 +420,10 @@ public void should_generateTs_files() throws Exception {
421420
System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
422421
javaSourceFolder.getRoot().getAbsolutePath());
423422

424-
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
425-
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
426-
util.when(() -> EndpointRequestUtil
427-
.isHillaAvailable(Mockito.any())).thenReturn(true);
423+
try (MockedStatic<FrontendUtils> util = Mockito.mockStatic(
424+
FrontendUtils.class, Mockito.CALLS_REAL_METHODS)) {
425+
util.when(() -> FrontendUtils.isHillaUsed(Mockito.any(),
426+
Mockito.any())).thenReturn(true);
428427
devModeStartupListener.onStartup(classes, servletContext);
429428
handler = getDevModeHandler();
430429
waitForDevServer();

0 commit comments

Comments
 (0)