Skip to content

Commit 28198d5

Browse files
authored
fix: src/main/something should be relative to project root (#18922)
1 parent 8ba6102 commit 28198d5

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,12 @@ default File getProjectFolder() {
255255
* {@code src/main/resources}.
256256
*/
257257
default File getJavaResourceFolder() {
258-
return new File(getStringProperty(Constants.JAVA_RESOURCE_FOLDER_TOKEN,
259-
"src/main/resources"));
258+
File folder = new File(getStringProperty(
259+
Constants.JAVA_RESOURCE_FOLDER_TOKEN, "src/main/resources"));
260+
if (!folder.isAbsolute()) {
261+
folder = new File(getProjectFolder(), folder.getPath());
262+
}
263+
return folder.getAbsoluteFile();
260264
}
261265

262266
/**
@@ -268,8 +272,11 @@ default File getJavaResourceFolder() {
268272
* {@code src/main/java}.
269273
*/
270274
default File getJavaSourceFolder() {
271-
return new File(getStringProperty(
272-
Constants.CONNECT_JAVA_SOURCE_FOLDER_TOKEN, "src/main/java"))
273-
.getAbsoluteFile();
275+
File folder = new File(getStringProperty(
276+
Constants.CONNECT_JAVA_SOURCE_FOLDER_TOKEN, "src/main/java"));
277+
if (!folder.isAbsolute()) {
278+
folder = new File(getProjectFolder(), folder.getPath());
279+
}
280+
return folder.getAbsoluteFile();
274281
}
275282
}

0 commit comments

Comments
 (0)