GH-438: Rename attributes within SourceListing to remove attachment t…

…o file type
ascopes · Nov 9, 2024 · 9cc3fe6 · 9cc3fe6
1 parent b5eef47
commit 9cc3fe6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...main/java/io/github/ascopes/protobufmavenplugin/generation/ProtobufBuildOrchestrator.java b/...main/java/io/github/ascopes/protobufmavenplugin/generation/ProtobufBuildOrchestrator.java
@@ -120,7 +120,7 @@ public boolean generate(GenerationRequest request) throws ResolutionException, I
         .fatalWarnings(request.isFatalWarnings())
         .importPaths(
             importPaths.stream()
-                .map(SourceListing::getProtoFilesRoot)
+                .map(SourceListing::getSourceRoot)
                 .collect(Collectors.toCollection(LinkedHashSet::new))
         );
 
@@ -136,7 +136,7 @@ public boolean generate(GenerationRequest request) throws ResolutionException, I
 
     var sourceFiles = sourcePaths
         .stream()
-        .map(SourceListing::getProtoFiles)
+        .map(SourceListing::getSourceProtoFiles)
         .flatMap(Collection::stream)
         .collect(Collectors.toCollection(LinkedHashSet::new));
 
@@ -236,7 +236,7 @@ private Collection<SourceListing> discoverCompilableSources(
     var sourcePaths = concat(sourcePathsListings, sourceDependencyListings);
 
     var sourceFileCount = sourcePaths.stream()
-        .mapToInt(sourcePath -> sourcePath.getProtoFiles().size())
+        .mapToInt(sourcePath -> sourcePath.getSourceProtoFiles().size())
         .sum();
 
     log.info(
@@ -294,7 +294,7 @@ private void embedSourcesInClassOutputs(
         registrar.embedListing(mavenSession, listing);
       } catch (IOException ex) {
         throw new ResolutionException(
-            "Failed to embed " + listing.getProtoFilesRoot() 
+            "Failed to embed " + listing.getSourceRoot()
                 + " into the class outputs directory",
             ex
         );

diff --git a/...n/src/main/java/io/github/ascopes/protobufmavenplugin/generation/SourceRootRegistrar.java b/...n/src/main/java/io/github/ascopes/protobufmavenplugin/generation/SourceRootRegistrar.java
@@ -72,14 +72,14 @@ public void registerSourceRoot(MavenSession session, Path path) {
   }
 
   public void embedListing(MavenSession session, SourceListing listing) throws IOException {
-    log.info("Embedding sources from {} in {} class outputs", listing.getProtoFilesRoot(), this);
+    log.info("Embedding sources from {} in {} class outputs", listing.getSourceRoot(), this);
     var targetDirectory = classOutputDirectoryGetter.andThen(Path::of)
         .apply(session.getCurrentProject().getBuild());
 
     FileUtils.rebaseFileTree(
-        listing.getProtoFilesRoot(),
+        listing.getSourceRoot(),
         targetDirectory,
-        listing.getProtoFiles().stream()
+        listing.getSourceProtoFiles().stream()
     );
   }
 

diff --git a/...ven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceListing.java b/...ven-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceListing.java
@@ -28,7 +28,7 @@
 @Immutable
 public interface SourceListing {
 
-  Path getProtoFilesRoot();
+  Path getSourceRoot();
 
-  Set<Path> getProtoFiles();
+  Set<Path> getSourceProtoFiles();
 }
diff --git a/...en-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceResolver.java b/...en-plugin/src/main/java/io/github/ascopes/protobufmavenplugin/sources/SourceResolver.java
@@ -137,7 +137,7 @@ private Optional<SourceListing> createProtoFileListingForArchive(
       var targetFiles = FileUtils.rebaseFileTree(
           vfsRoot,
           extractionRoot,
-          sourceFiles.get().getProtoFiles().stream()
+          sourceFiles.get().getSourceProtoFiles().stream()
       );
 
       var listing = ImmutableSourceListing