refactor: add type for Claim

Author: nigel.zheng

build.gradle

@@ -25,6 +25,7 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-test:${springBootVersion}"
     implementation "org.springframework.security.oauth:spring-security-oauth2:2.2.1.RELEASE"
     implementation "org.springframework.security:spring-security-test:5.0.6.RELEASE"
+    implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3'
 }
 
 repositories {

src/main/java/com/github/ahunigel/test/security/AttachClaimsTestExecutionListener.java

@@ -1,5 +1,6 @@
 package com.github.ahunigel.test.security;
 
+import com.github.ahunigel.test.security.util.ClaimUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.AnnotationUtils;
@@ -10,10 +11,8 @@
 import org.springframework.test.context.support.AbstractTestExecutionListener;
 
 import java.lang.reflect.AnnotatedElement;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Created by Nigel.Zheng on 8/3/2018.
@@ -46,7 +45,7 @@ private AttachClaims findAnnotation(AnnotatedElement annotated) {
   public void attachClaimsToAuthentication(AttachClaims annotation) {
     Authentication authentication = TestSecurityContextHolder.getContext().getAuthentication();
     if (authentication != null && authentication instanceof AbstractAuthenticationToken) {
-      Map<String, String> claims = Arrays.stream(annotation.value()).collect(Collectors.toMap(Claim::name, Claim::value));
+      Map<String, Object> claims = ClaimUtils.getClaims(annotation.value());
       Map<String, String> stringMap = toMap(annotation.claims());
       stringMap.entrySet().stream().forEach(entry -> claims.putIfAbsent(entry.getKey(), entry.getValue()));
       if (!claims.isEmpty()) {

src/main/java/com/github/ahunigel/test/security/Claim.java

@@ -14,4 +14,6 @@
   String name();
 
   String value();
+
+  Class<?> type() default String.class;
 }

src/main/java/com/github/ahunigel/test/security/WithMockUserAndClaims.java

@@ -1,5 +1,6 @@
 package com.github.ahunigel.test.security;
 
+import com.github.ahunigel.test.security.util.ClaimUtils;
 import com.github.ahunigel.test.security.util.MockUserUtils;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.security.authentication.AbstractAuthenticationToken;
@@ -10,9 +11,7 @@
 import org.springframework.security.test.context.support.WithSecurityContextFactory;
 
 import java.lang.annotation.*;
-import java.util.Arrays;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Created by Nigel Zheng on 8/3/2018.
@@ -44,7 +43,7 @@ class WithMockUserWithClaimsSecurityContextFactory implements WithSecurityContex
     public SecurityContext createSecurityContext(WithMockUserAndClaims annotation) {
       SecurityContext context = MockUserUtils.getSecurityContext(annotation.user());
       Authentication authentication = context.getAuthentication();
-      Map<String, String> claims = Arrays.stream(annotation.value()).collect(Collectors.toMap(Claim::name, Claim::value));
+      Map<String, Object> claims = ClaimUtils.getClaims(annotation.value());
       if (!claims.isEmpty() && authentication instanceof AbstractAuthenticationToken) {
         ((AbstractAuthenticationToken) authentication).setDetails(claims);
       }

src/main/java/com/github/ahunigel/test/security/oauth2/WithMockOAuth2User.java

@@ -1,6 +1,7 @@
 package com.github.ahunigel.test.security.oauth2;
 
 import com.github.ahunigel.test.security.Claim;
+import com.github.ahunigel.test.security.util.ClaimUtils;
 import com.github.ahunigel.test.security.util.MockUserUtils;
 import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -11,9 +12,7 @@
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.util.Arrays;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Created by Nigel Zheng on 8/3/2018.
@@ -43,7 +42,7 @@ public SecurityContext createSecurityContext(final WithMockOAuth2User annotation
       OAuth2Authentication oAuth2Authentication = new OAuth2Authentication(
           WithMockOAuth2Client.WithMockOAuth2ClientSecurityContextFactory.getOAuth2Request(annotation.client()),
           MockUserUtils.getAuthentication(annotation.user()));
-      Map<String, String> claims = Arrays.stream(annotation.claims()).collect(Collectors.toMap(Claim::name, Claim::value));
+      Map<String, Object> claims = ClaimUtils.getClaims(annotation.claims());
       if (!claims.isEmpty()) {
         oAuth2Authentication.setDetails(claims);
       }

src/main/java/com/github/ahunigel/test/security/util/ClaimUtils.java

@@ -0,0 +1,24 @@
+package com.github.ahunigel.test.security.util;
+
+import com.github.ahunigel.test.security.Claim;
+import org.apache.commons.beanutils.ConvertUtils;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Created by Nigel.Zheng on 8/3/2018.
+ */
+public class ClaimUtils {
+  private ClaimUtils() {
+    throw new InstantiationError();
+  }
+
+  public static Map<String, Object> getClaims(Claim[] claims) {
+    return Arrays.stream(claims)
+        .collect(Collectors.toMap(Claim::name, claim ->
+            ConvertUtils.convert(claim.value(), claim.type())
+        ));
+  }
+}

src/main/java/com/github/ahunigel/test/security/util/MockUserUtils.java

@@ -21,6 +21,10 @@
  * Created by Nigel Zheng on 8/3/2018.
  */
 public class MockUserUtils {
+  private MockUserUtils() {
+    throw new InstantiationError();
+  }
+
   public static SecurityContext getSecurityContext(WithMockUser withMockUser) {
     WithSecurityContext withSecurityContext = AnnotationUtils
         .findAnnotation(withMockUser.getClass(), WithSecurityContext.class);