From aa5d407ffa79d49ca15d0be25ecc7fe8cf1d84c9 Mon Sep 17 00:00:00 2001
From: Lars Kristian Roland <lars@roland.bz>
Date: Mon, 21 Mar 2016 08:00:15 +0100
Subject: [PATCH] Changed from SimpleGrantedAuthority to GrantedAuthority.
Suggested fix to #1040
---
.../convert/SimpleGrantedAuthorityStringConverter.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/convert/SimpleGrantedAuthorityStringConverter.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/convert/SimpleGrantedAuthorityStringConverter.java
index f6bef5945..7148de693 100644
--- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/convert/SimpleGrantedAuthorityStringConverter.java
+++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/convert/SimpleGrantedAuthorityStringConverter.java
@@ -20,17 +20,21 @@ package org.mitre.oauth2.model.convert;
import javax.persistence.AttributeConverter;
import javax.persistence.Converter;
+import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* @author jricher
*
*/
@Converter
-public class SimpleGrantedAuthorityStringConverter implements AttributeConverter<SimpleGrantedAuthority, String> {
+public class SimpleGrantedAuthorityStringConverter implements AttributeConverter<GrantedAuthority, String> {
@Override
- public String convertToDatabaseColumn(SimpleGrantedAuthority attribute) {
+ public String convertToDatabaseColumn(GrantedAuthority attribute) {
if (attribute != null) {
return attribute.getAuthority();
} else {
@@ -39,7 +43,7 @@ public class SimpleGrantedAuthorityStringConverter implements AttributeConverter
}
@Override
- public SimpleGrantedAuthority convertToEntityAttribute(String dbData) {
+ public GrantedAuthority convertToEntityAttribute(String dbData) {
if (dbData != null) {
return new SimpleGrantedAuthority(dbData);
} else {