Skip to content

Migrate org.reflections.reflections from 0.9.12 to 0.10.2 #233

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

Merged
merged 2 commits into from
Nov 7, 2023
Merged

Migrate org.reflections.reflections from 0.9.12 to 0.10.2 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
570ef8b
Migrate org.reflections.reflections from 0.9.12 to 0.10.2
RiVogel Nov 6, 2023
a37619d
Fix refactoring
RiVogel Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...acor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
.filter(path -> isValidFilename(Paths.get(path).getFileName().toString()))
.collect(Collectors.toSet());
}

return resources.stream().flatMap(resource -> {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down