From f4f8700d002e655b86c8343cde0f9a97982d3c58 Mon Sep 17 00:00:00 2001 From: Ashley Scopes <73482956+ascopes@users.noreply.github.com> Date: Sun, 12 May 2024 16:34:00 +0100 Subject: [PATCH] Don't flag on protoc if the default fallback source directory is missing --- .../mojo/AbstractGenerateMojo.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java index 883f1863..68550d80 100644 --- a/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java +++ b/protobuf-maven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/mojo/AbstractGenerateMojo.java @@ -674,6 +674,13 @@ private Collection sourceDirectories() { .stream() .flatMap(Collection::stream) .map(File::toPath) + .collect(Collectors.toList()); + + var finalDirectories = transformedSourceDirectories.isEmpty() + ? List.of(defaultSourceDirectory()) + : transformedSourceDirectories; + + return finalDirectories.stream() .filter(path -> { if (Files.notExists(path)) { log.warn("Ignoring source directory {} as it does not appear to exist", path); @@ -682,10 +689,6 @@ private Collection sourceDirectories() { return true; }) .collect(Collectors.toList()); - - return transformedSourceDirectories.isEmpty() - ? List.of(defaultSourceDirectory()) - : transformedSourceDirectories; } private String protocVersion() {