Skip to content
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

Jump to bottom

fix devloop resource changes monitoring on windows #498

Merged
merged 2 commits into from
Sep 29, 2021
Merged

fix devloop resource changes monitoring on windows #498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72223ba
Fix MavenProjectSupplier to work properly on windows.
romain-grecourt Sep 28, 2021
83d91cc
fix copyright
romain-grecourt Sep 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 22 additions & 3 deletions dev-loop/src/main/java/io/helidon/build/dev/maven/MavenProjectSupplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020 Oracle and/or its affiliates.
* Copyright (c) 2020, 2021 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,6 +16,7 @@

package io.helidon.build.dev.maven;

import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.FileTime;
Expand Down Expand Up @@ -78,6 +79,10 @@ public class MavenProjectSupplier implements ProjectSupplier {
private static final String TARGET_DIR_NAME = "target";
private static final String POM_FILE = "pom.xml";
private static final String DOT = ".";
private static final List<String> FS_ROOTS = Arrays.asList(File.listRoots())
.stream()
.map(File::getPath)
.collect(Collectors.toList());

private static final Predicate<Path> NOT_HIDDEN = file -> {
final String name = file.getFileName().toString();
Expand Down Expand Up @@ -238,11 +243,25 @@ private Project createProject(Path projectDir, BuildType buildType) {
// Add resource components

for (String resourcesDirEntry : resourcesDirs) {
String[] dir = resourcesDirEntry.split(ProjectConfig.RESOURCE_INCLUDE_EXCLUDE_SEPARATOR);
String resourcesDir = dir[0];

// capture the file system root part of the entry
// on Windows this will be the drive (E.g. C:\), on Unix, just a slash
String prefix = FS_ROOTS.stream()
.filter(fsRoot -> resourcesDirEntry.startsWith(fsRoot))
.findFirst()
.orElse("");

// split the non prefix part of the entry
String[] dir = resourcesDirEntry
.substring(prefix.length())
.split(ProjectConfig.RESOURCE_INCLUDE_EXCLUDE_SEPARATOR);

String resourcesDir = prefix + dir[0];
List<String> includes = includeExcludeList(dir, 1);
List<String> excludes = includeExcludeList(dir, 2);
BiPredicate<Path, Path> filter = filter(includes, excludes);

// resourcesDirPath may not be nested inside projectDir if resourcesDir is absolute
Path resourcesDirPath = projectDir.resolve(resourcesDir);
if (Files.isDirectory(resourcesDirPath)) {
BuildRootType buildRootType = BuildRootType.create(DirectoryType.Resources, filter);
Expand Down