From 4c90bac18e1cb56143fe41c627a37a9f8580f90b Mon Sep 17 00:00:00 2001
From: Christos Malliaridis <c.malliaridis@gmail.com>
Date: Tue, 19 Nov 2024 19:53:00 +0100
Subject: [PATCH] Revert unrelated changes

---
 solr/core/src/java/org/apache/solr/cli/StreamTool.java    | 2 +-
 solr/core/src/java/org/apache/solr/handler/CatStream.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/StreamTool.java b/solr/core/src/java/org/apache/solr/cli/StreamTool.java
index 8d6f9bd75d5..65832ce4b9d 100644
--- a/solr/core/src/java/org/apache/solr/cli/StreamTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StreamTool.java
@@ -440,7 +440,7 @@ public void setStreamContext(StreamContext context) {
     }
 
     @Override
-    protected List<CrawlFile> validateAndSetFilepathsInSandbox() {
+    protected List<CrawlFile> validateAndSetFilepathsInSandbox(String commaDelimitedFilepaths) {
       final List<CrawlFile> crawlSeeds = new ArrayList<>();
       for (String crawlRootStr : commaDelimitedFilepaths.split(",")) {
         Path crawlRootPath = Paths.get(crawlRootStr).normalize();
diff --git a/solr/core/src/java/org/apache/solr/handler/CatStream.java b/solr/core/src/java/org/apache/solr/handler/CatStream.java
index fdffe29e6c0..f2515f9b38b 100644
--- a/solr/core/src/java/org/apache/solr/handler/CatStream.java
+++ b/solr/core/src/java/org/apache/solr/handler/CatStream.java
@@ -49,7 +49,7 @@
 public class CatStream extends TupleStream implements Expressible {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  protected final String commaDelimitedFilepaths;
+  private final String commaDelimitedFilepaths;
   private final int maxLines; // -1 for no max
 
   private StreamContext context;
@@ -113,7 +113,8 @@ public List<TupleStream> children() {
 
   @Override
   public void open() throws IOException {
-    final List<CrawlFile> initialCrawlSeeds = validateAndSetFilepathsInSandbox();
+    final List<CrawlFile> initialCrawlSeeds =
+        validateAndSetFilepathsInSandbox(this.commaDelimitedFilepaths);
 
     final List<CrawlFile> filesToCrawl = new ArrayList<>();
     for (CrawlFile crawlSeed : initialCrawlSeeds) {
@@ -163,7 +164,7 @@ public Explanation toExplanation(StreamFactory factory) throws IOException {
         .withExpression(toExpression(factory).toString());
   }
 
-  protected List<CrawlFile> validateAndSetFilepathsInSandbox() {
+  protected List<CrawlFile> validateAndSetFilepathsInSandbox(String commaDelimitedFilepaths) {
     final List<CrawlFile> crawlSeeds = new ArrayList<>();
     for (String crawlRootStr : commaDelimitedFilepaths.split(",")) {
       Path crawlRootPath = chroot.resolve(crawlRootStr).normalize();