From 570ef8beeea760052fa095e6fac4bae0319e4806 Mon Sep 17 00:00:00 2001
From: RiVogel <RiVogel@users.noreply.github.com>
Date: Mon, 6 Nov 2023 12:35:59 +0100
Subject: [PATCH 1/2] Migrate org.reflections.reflections from 0.9.12 to 0.10.2

---
 .../migration/input/MigrationScriptReaderImpl.java     | 10 +++++++---
 pom.xml                                                |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
index 1e09899f..e8855b19 100644
--- a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
+++ b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
@@ -3,8 +3,9 @@
 import com.senacor.elasticsearch.evolution.core.api.MigrationException;
 import com.senacor.elasticsearch.evolution.core.api.migration.MigrationScriptReader;
 import com.senacor.elasticsearch.evolution.core.internal.model.migration.RawMigrationScript;
+import java.util.regex.Pattern;
 import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.Scanners;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
@@ -147,10 +148,13 @@ private Stream<RawMigrationScript> readScriptsFromClassPath(String location) {
             resources = emptySet();
         } else {
             Reflections reflections = new Reflections(new ConfigurationBuilder()
-                    .setScanners(new ResourcesScanner())
+                    .setScanners(Scanners.Resources)
                     .filterInputsBy(new FilterBuilder().includePackage(locationWithoutPrefixAsPackageNotation))
                     .setUrls(urls));
-            resources = reflections.getResources(this::isValidFilename);
+            resources = reflections.getResources(Pattern.compile(esMigrationPrefix + ".*"))
+                    .stream().map(path -> Paths.get(path).getFileName().toString())
+                    .filter(this::isValidFilename)
+                    .collect(Collectors.toSet());
         }
 
         return resources.stream().flatMap(resource -> {
diff --git a/pom.xml b/pom.xml
index 2d9f82c7..15352884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -102,7 +102,7 @@
         <commons-io.version>2.15.0</commons-io.version>
         <!--when updating elasticsearch versions, also update "ElasticsearchContainer" version in EmbeddedElasticsearchExtension-->
         <elasticsearch.version>7.5.2</elasticsearch.version>
-        <reflections.version>0.9.12</reflections.version>
+        <reflections.version>0.10.2</reflections.version>
         <testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
         <lombok.version>1.18.30</lombok.version>
     </properties>

From a37619d9c4a94f693310059eac82c0325ba3f62b Mon Sep 17 00:00:00 2001
From: RiVogel <RiVogel@users.noreply.github.com>
Date: Tue, 7 Nov 2023 10:10:34 +0100
Subject: [PATCH 2/2] Fix refactoring

---
 .../internal/migration/input/MigrationScriptReaderImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
index e8855b19..acbf6e8e 100644
--- a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
+++ b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
@@ -152,8 +152,8 @@ private Stream<RawMigrationScript> readScriptsFromClassPath(String location) {
                     .filterInputsBy(new FilterBuilder().includePackage(locationWithoutPrefixAsPackageNotation))
                     .setUrls(urls));
             resources = reflections.getResources(Pattern.compile(esMigrationPrefix + ".*"))
-                    .stream().map(path -> Paths.get(path).getFileName().toString())
-                    .filter(this::isValidFilename)
+                    .stream()
+                    .filter(path -> isValidFilename(Paths.get(path).getFileName().toString()))
                     .collect(Collectors.toSet());
         }