OAK-11311: Remove usage of Guava ImmutableList #1909
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fabriziofortino
approved these changes
Dec 17, 2024
rishabhdaim
requested changes
Dec 18, 2024
.../main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/SimpleFlatFileUtil.java
Show resolved
Hide resolved
oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/Aggregate.java
Show resolved
Hide resolved
oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/PropertyDefinition.java
Show resolved
Hide resolved
...ecurity-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Outdated
Show resolved
Hide resolved
...ecurity-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Outdated
Show resolved
Hide resolved
...ecurity-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Outdated
Show resolved
Hide resolved
...ecurity-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Outdated
Show resolved
Hide resolved
| @@ -86,7 +86,7 @@ public static Set<String> getChildNodeNames(Collection<String> keys, Matcher mat | |||
| int expectedDepth = matcher.depth() + 1; | |||
|
|
|||
| for (String key : keys){ | |||
| List<String> elements = ImmutableList.copyOf(PathUtils.elements(key)); | |||
| List<String> elements = CollectionUtils.toList(PathUtils.elements(key)); | |||
There was a problem hiding this comment.
Collections.unmodifiableList miss or intended ?
...store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/bundlor/Include.java
Show resolved
Hide resolved
mbaedke
reviewed
Dec 18, 2024
oak-search/src/test/java/org/apache/jackrabbit/oak/plugins/index/search/AggregateTest.java
Show resolved
Hide resolved
|
I will review all of these once I'm done with the next module - FWIW, none of these changes cause tests to fail. |
mbaedke
reviewed
Dec 18, 2024
...rc/main/java/org/apache/jackrabbit/oak/plugins/document/secondary/SecondaryStoreBuilder.java
Outdated
Show resolved
Hide resolved
mbaedke
approved these changes
Dec 18, 2024
rishabhdaim
approved these changes
Dec 19, 2024
…duplicate import
… remove unused imports
…ake a few lists unmodifiable
|
rishabhdaim
requested changes
Dec 21, 2024
| List<String> builder = new ArrayList<>(); | ||
| builder.add(MongoUtils.URL); | ||
| builder.addAll(Arrays.asList(args)); | ||
| this.args = Collections.unmodifiableList(builder); |
There was a problem hiding this comment.
no need for Collections.unmodifiableList in test class.
| @@ -161,7 +159,8 @@ public void orToUnions() throws RepositoryException, CommitFailedException { | |||
| statement = String.format( | |||
| "SELECT * FROM [%s] WHERE (p = 'a' AND p1 = 'a1') OR (p = 'b' AND p1 = 'b1')", | |||
| NT_OAK_UNSTRUCTURED); | |||
| expected = of("/test/a", "/test/b"); | |||
| expected = List.of("/test/a", "/test/b"); | |||
| expected = List.of("/test/a", "/test/b"); | |||
| @@ -239,14 +239,13 @@ boolean reverseOrder() { | |||
| List<AggregatedPermissionProvider> getAggregatedProviders(@NotNull String workspaceName, | |||
| @NotNull AuthorizationConfiguration config, | |||
| @NotNull Set<Principal> principals) { | |||
| ImmutableList<AggregatedPermissionProvider> l = ImmutableList.of( | |||
| List<AggregatedPermissionProvider> l = new ArrayList<>(List.of( | |||
There was a problem hiding this comment.
Suggested change
| List<AggregatedPermissionProvider> l = new ArrayList<>(List.of( | |
| List<AggregatedPermissionProvider> l = Stream.of((AggregatedPermissionProvider) config.getPermissionProvider(root, workspaceName, principals), | |
| getTestPermissionProvider()).collect(Collectors.toList()); |
| @@ -36,6 +37,7 @@ | |||
| import org.jetbrains.annotations.Nullable; | |||
| import org.junit.Test; | |||
|
|
|||
|
|
|||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ready for review.