Skip to content

Commit 0d19eb1

Browse files
committed
feat: exec Hilla tasks whenever Hilla is available. Hilla will decide what to do.
1 parent 248bbd3 commit 0d19eb1

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

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

3838
import com.vaadin.flow.di.Lookup;
3939
import com.vaadin.flow.internal.UsageStatistics;
40+
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
4041
import com.vaadin.flow.server.Constants;
4142
import com.vaadin.flow.server.ExecutionFailedException;
4243
import com.vaadin.flow.server.Mode;
@@ -315,8 +316,7 @@ private void addGenerateServiceWorkerTask(Options options,
315316
}
316317

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

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

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

3333
import com.vaadin.flow.di.Lookup;
34+
import com.vaadin.flow.internal.hilla.EndpointRequestUtil;
3435
import com.vaadin.flow.server.ExecutionFailedException;
3536
import com.vaadin.flow.server.frontend.scanner.ClassFinder;
3637
import com.vaadin.flow.server.frontend.scanner.ClassFinder.DefaultClassFinder;
@@ -117,10 +118,10 @@ public void should_useHillaEngine_whenEnabled()
117118
Mockito.doReturn(endpointGeneratorTaskFactory).when(options.getLookup())
118119
.lookup(EndpointGeneratorTaskFactory.class);
119120

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);
121+
try (MockedStatic<EndpointRequestUtil> util = Mockito.mockStatic(
122+
EndpointRequestUtil.class, Mockito.CALLS_REAL_METHODS)) {
123+
util.when(() -> EndpointRequestUtil.isHillaAvailable(Mockito.any()))
124+
.thenReturn(true);
124125

125126
new NodeTasks(options).execute();
126127
}

0 commit comments

Comments
 (0)