OAK-11317 : removed usage of ImmutableSet from guava #1914
Conversation
rishabhdaim
force-pushed
the
OAK-11317
branch
from
2ad3b45 to
166fc2a
Compare
| try { | ||
| return new PrincipalImpl(idp.getIdentity(externalIdentityRef).getPrincipalName()); | ||
| } catch (ExternalIdentityException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }).collect(Collectors.toSet()); | ||
| }).collect(Collectors.toUnmodifiableSet()); | ||
| } else { |
There was a problem hiding this comment.
There seem to be two conversions to Set here (inherited from earlier).
There was a problem hiding this comment.
fixed in 412cad0
|
|
||
| ServiceReference ref3 = mock(ServiceReference.class); | ||
| when(ref3.getProperty(PARAM_SYNC_HANDLER_NAME)).thenReturn("testSH"); | ||
| when(ref3.getProperty(PARAM_IDP_NAME)).thenReturn("testIDP-3"); | ||
| tracker.addingService(ref3); | ||
|
|
||
| assertEquals(Set.of("testIDP", "testIDP-3"), ImmutableSet.copyOf(tracker.getIdpNames("testSH"))); | ||
| assertEquals(Set.of("testIDP-2"), ImmutableSet.copyOf(tracker.getIdpNames("testSH-2"))); | ||
| assertEquals(Set.of("testIDP", "testIDP-3"), Collections.unmodifiableSet(CollectionUtils.toSet(tracker.getIdpNames("testSH")))); |
There was a problem hiding this comment.
Do we need conversions to immutable when the set id only used in a subsequent use of "assert"? Maybe we can check the diff for uses of unmodifiableSet in the context of asserts?
There was a problem hiding this comment.
good catch @reschke. I would fix it.
There was a problem hiding this comment.
fixed in 412cad0 along with other uses of Collections.unmodifiableSet in test cases.
I tried to use |
That of course will be a lot of work... Maybe we could check for all uses of "::nonNull" in test cases first; but only later on. |
| @@ -17,6 +17,8 @@ | |||
| package org.apache.jackrabbit.oak.spi.security.principal; | |||
|
|
|||
| import java.security.Principal; | |||
| import java.util.ArrayList; | |||
There was a problem hiding this comment.
There was a problem hiding this comment.
thanks, fixed in 4707355
There is no usage in test files, only 3 usages in code files where we ingest data from outside. |
|
rishabhdaim
changed the title
No description provided.