Merge pull request #81 from onewelcome/fix-amr-comparison

Fix amrs comparison

Author: czarnecki-piotr

src/main/java/com/onegini/examples/resourcegateway/service/TokenTypeValidationService.java

@@ -2,12 +2,10 @@
 
 import static com.onegini.examples.resourcegateway.model.TokenType.IMPLICIT_AUTHENTICATION;
 
-import java.util.Collection;
-
+import com.onegini.examples.resourcegateway.model.exception.InvalidAccessTokenException;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import com.onegini.examples.resourcegateway.model.exception.InvalidAccessTokenException;
+import java.util.Collection;
 
 @Service
 public class TokenTypeValidationService {
@@ -25,7 +23,7 @@ public void validateNoImplicitAuthenticationToken(final Collection<String> amrs)
   }
 
   private boolean isImplicitAuthenticationToken(final Collection<String> amrs) {
-    return CollectionUtils.containsInstance(amrs, IMPLICIT_AUTHENTICATION.name());
+    return amrs != null && amrs.contains(IMPLICIT_AUTHENTICATION.name());
   }
 
   private boolean isNoImplicitAuthenticationToken(final Collection<String> tokenTypes) {

src/test/java/com/onegini/examples/resourcegateway/service/TokenTypeValidationServiceTest.java

@@ -13,7 +13,7 @@
 
 class TokenTypeValidationServiceTest {
 
-  private static final String TYPE_IMPLICIT_AUTHENTICATION = "IMPLICIT_AUTHENTICATION";
+  private static final String NOT_IMPLICIT_TYPE = "DEFAULT_TOKEN";
 
   private final TokenTypeValidationService service = new TokenTypeValidationService();
 
@@ -30,7 +30,7 @@ void should_validate_null_or_empty_as_no_implicit_authentication_token(final Set
     service.validateNoImplicitAuthenticationToken(tokenTypes);
   }
 
-  @ValueSource(strings = TYPE_IMPLICIT_AUTHENTICATION)
+  @ValueSource(strings = NOT_IMPLICIT_TYPE)
   @ParameterizedTest
   void should_validate_as_no_implicit_authentication_token(final String tokenTypes) {
     service.validateNoImplicitAuthenticationToken(Set.of(tokenTypes));
@@ -43,7 +43,7 @@ void should_throw_exception_when_validating_null_or_empty_as_implicit_authentica
         .isInstanceOf(InvalidAccessTokenException.class);
   }
 
-  @ValueSource(strings = TYPE_IMPLICIT_AUTHENTICATION)
+  @ValueSource(strings = NOT_IMPLICIT_TYPE)
   @ParameterizedTest
   void should_throw_exception_when_validating_other_input_as_implicit_authentication_token(final String tokenType) {
     final Set<String> tokenTypes = Set.of(tokenType);