Skip to content
Snippets Groups Projects
Commit 9782d9e2 authored by Evgeny Bardin's avatar Evgeny Bardin
Browse files

OZG-7092 adjust method name

parent 4a9d61c3
No related branches found
No related tags found
1 merge request!1OZG-7092 Anpassung TokenChecker
...@@ -151,7 +151,7 @@ public class SamlAttributeService { ...@@ -151,7 +151,7 @@ public class SamlAttributeService {
TokenAttributes buildTokenAttributes(Map<String, String> tokenAttributes, Response token) { TokenAttributes buildTokenAttributes(Map<String, String> tokenAttributes, Response token) {
var tokenAttributesBuilder = TokenAttributes.builder().postfachId(getPostfachId(tokenAttributes, token)) var tokenAttributesBuilder = TokenAttributes.builder().postfachId(getPostfachId(tokenAttributes, token))
.trustLevel(getTrustLevel(tokenAttributes)); .trustLevel(getTrustLevel(tokenAttributes));
tokenAttributes.entrySet().stream().filter(this::isNotMappedField).map(this::buildTokenAttribute) tokenAttributes.entrySet().stream().filter(this::isNotNamedField).map(this::buildTokenAttribute)
.forEach(tokenAttributesBuilder::otherAttribute); .forEach(tokenAttributesBuilder::otherAttribute);
return tokenAttributesBuilder.build(); return tokenAttributesBuilder.build();
} }
...@@ -169,7 +169,7 @@ public class SamlAttributeService { ...@@ -169,7 +169,7 @@ public class SamlAttributeService {
return tokenAttributes.get(mappedKey); return tokenAttributes.get(mappedKey);
} }
boolean isNotMappedField(Map.Entry<String, String> attributeEntry) { boolean isNotNamedField(Map.Entry<String, String> attributeEntry) {
var mappedKey = tokenValidationProperty.getMappings().get(attributeEntry.getKey()); var mappedKey = tokenValidationProperty.getMappings().get(attributeEntry.getKey());
return !StringUtils.equalsAny(mappedKey, TokenAttributes.POSTFACH_ID_KEY, TokenAttributes.TRUST_LEVEL_KEY); return !StringUtils.equalsAny(mappedKey, TokenAttributes.POSTFACH_ID_KEY, TokenAttributes.TRUST_LEVEL_KEY);
} }
......
...@@ -563,7 +563,7 @@ class SamlAttributeServiceTest { ...@@ -563,7 +563,7 @@ class SamlAttributeServiceTest {
@BeforeEach @BeforeEach
void init() { void init() {
doReturn(true).when(service).isNotMappedField(any()); doReturn(true).when(service).isNotNamedField(any());
doReturn(TokenAttributesTestFactory.OTHER_ATTRIBUTE).when(service).buildTokenAttribute(any()); doReturn(TokenAttributesTestFactory.OTHER_ATTRIBUTE).when(service).buildTokenAttribute(any());
} }
...@@ -603,7 +603,7 @@ class SamlAttributeServiceTest { ...@@ -603,7 +603,7 @@ class SamlAttributeServiceTest {
void shouldCallIsNotMappedField() { void shouldCallIsNotMappedField() {
buildTokenAttributes(); buildTokenAttributes();
verify(service).isNotMappedField(Map.entry(TokenAttributeTestFactory.NAME, TokenAttributeTestFactory.VALUE)); verify(service).isNotNamedField(Map.entry(TokenAttributeTestFactory.NAME, TokenAttributeTestFactory.VALUE));
} }
@Test @Test
...@@ -736,7 +736,7 @@ class SamlAttributeServiceTest { ...@@ -736,7 +736,7 @@ class SamlAttributeServiceTest {
} }
@Nested @Nested
class TestIsNotMappedField { class TestIsNotNamedField {
private static final String KEY = UUID.randomUUID().toString(); private static final String KEY = UUID.randomUUID().toString();
...@@ -759,7 +759,7 @@ class SamlAttributeServiceTest { ...@@ -759,7 +759,7 @@ class SamlAttributeServiceTest {
} }
private boolean isNotMappedField() { private boolean isNotMappedField() {
return service.isNotMappedField(Map.entry(KEY, TokenAttributeTestFactory.VALUE)); return service.isNotNamedField(Map.entry(KEY, TokenAttributeTestFactory.VALUE));
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment