Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Made AclClassIdUtils genuinely package level by injecting the conversionService instead of AclClassIdUtils

Browse Source 
Fixes gh-4814
This commit is contained in:
Paul Wheeler
2018-03-25 22:57:48 +01:00
committed by Rob Winch
parent 2c362456fd
commit ccc4e1c876
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java
View File

@@ -29,7 +29,7 @@ import org.springframework.security.acls.model.ObjectIdentity;
* the correct Java type as specified by <code>acl_class.class_id_type</code>.
* @author paulwheeler
*/
public class AclClassIdUtils {
class AclClassIdUtils {
private static final String DEFAULT_CLASS_ID_TYPE_COLUMN_NAME = "class_id_type";
private static final Log log = LogFactory.getLog(AclClassIdUtils.class);
@@ -38,6 +38,10 @@ public class AclClassIdUtils {
public AclClassIdUtils() {
}
public AclClassIdUtils(ConversionService conversionService) {
this.conversionService = conversionService;
}
/**
* Converts the raw type from the database into the right Java type. For most applications the 'raw type' will be Long, for some applications
* it could be String.

5
acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
View File

@@ -31,6 +31,7 @@ import java.util.Set;
import javax.sql.DataSource;
import org.springframework.core.convert.ConversionException;
import org.springframework.core.convert.ConversionService;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.PreparedStatementSetter;
import org.springframework.jdbc.core.ResultSetExtractor;
@@ -553,8 +554,8 @@ public class BasicLookupStrategy implements LookupStrategy {
}
}
public final void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
this.aclClassIdUtils = aclClassIdUtils;
public final void setConversionService(ConversionService conversionService) {
this.aclClassIdUtils = new AclClassIdUtils(conversionService);
}
// ~ Inner Classes

5
acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
View File

@@ -26,6 +26,7 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.convert.ConversionService;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.security.acls.domain.ObjectIdentityImpl;
@@ -163,8 +164,8 @@ public class JdbcAclService implements AclService {
}
}
public void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
this.aclClassIdUtils = aclClassIdUtils;
public void setConversionService(ConversionService conversionService) {
this.aclClassIdUtils = new AclClassIdUtils(conversionService);
}
protected boolean isAclClassIdSupported() {