Skip to content

ConversionService should be configurable for BasicLookupStrategy and JdbcAclService #4819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2018
Merged

ConversionService should be configurable for BasicLookupStrategy and JdbcAclService #4819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285b5e9
AclClassIdUtils should be public
pwheel Nov 13, 2017
8efec02
Made AclClassIdUtils genuinely package level by injecting the convers…
pwheel Mar 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions acl/src/main/java/org/springframework/security/acls/jdbc/AclClassIdUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ 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.
Expand Down
5 changes: 3 additions & 2 deletions acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand Down Expand Up @@ -553,8 +554,8 @@ public final void setAclClassIdSupported(boolean aclClassIdSupported) {
}
}

public final void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
this.aclClassIdUtils = aclClassIdUtils;
public final void setConversionService(ConversionService conversionService) {
this.aclClassIdUtils = new AclClassIdUtils(conversionService);
}

// ~ Inner Classes
Expand Down
5 changes: 3 additions & 2 deletions acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

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;
Expand Down Expand Up @@ -163,8 +164,8 @@ public void setAclClassIdSupported(boolean aclClassIdSupported) {
}
}

public void setAclClassIdUtils(AclClassIdUtils aclClassIdUtils) {
this.aclClassIdUtils = aclClassIdUtils;
public void setConversionService(ConversionService conversionService) {
this.aclClassIdUtils = new AclClassIdUtils(conversionService);
}

protected boolean isAclClassIdSupported() {
Expand Down
4 changes: 1 addition & 3 deletions ...java/org/springframework/security/acls/jdbc/BasicLookupStrategyWithAclClassTypeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,11 @@ public static void dropDatabase() throws Exception {
@Before
public void initializeBeans() {
super.initializeBeans();
AclClassIdUtils aclClassIdUtils = new AclClassIdUtils();
aclClassIdUtils.setConversionService(new DefaultConversionService());
uuidEnabledStrategy = new BasicLookupStrategy(getDataSource(), aclCache(), aclAuthStrategy(),
new DefaultPermissionGrantingStrategy(new ConsoleAuditLogger()));
uuidEnabledStrategy.setPermissionFactory(new DefaultPermissionFactory());
uuidEnabledStrategy.setAclClassIdSupported(true);
uuidEnabledStrategy.setAclClassIdUtils(aclClassIdUtils);
uuidEnabledStrategy.setConversionService(new DefaultConversionService());
}

@Before
Expand Down
11 changes: 4 additions & 7 deletions acl/src/test/resources/jdbcMutableAclServiceTestsWithAclClass-context.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,16 @@

<import resource="jdbcMutableAclServiceTests-context.xml"/>

<bean id="aclClassIdUtils" class="org.springframework.security.acls.jdbc.AclClassIdUtils">
<property name="conversionService">
<bean class="org.springframework.core.convert.support.DefaultConversionService"/>
</property>
</bean>
<bean id="conversionService" class="org.springframework.core.convert.support.DefaultConversionService"/>

<!-- Overridden bean definitions -->

<bean id="aclService" class="org.springframework.security.acls.jdbc.JdbcMutableAclService">
<constructor-arg ref="dataSource"/>
<constructor-arg ref="lookupStrategy"/>
<constructor-arg ref="aclCache"/>
<property name="aclClassIdSupported" value="true"/>
<property name="aclClassIdUtils" ref="aclClassIdUtils"/>
<property name="conversionService" ref="conversionService"/>
</bean>

<bean id="lookupStrategy" class="org.springframework.security.acls.jdbc.BasicLookupStrategy">
Expand All @@ -28,6 +25,6 @@
<bean class="org.springframework.security.acls.domain.ConsoleAuditLogger"/>
</constructor-arg>
<property name="aclClassIdSupported" value="true"/>
<property name="aclClassIdUtils" ref="aclClassIdUtils"/>
<property name="conversionService" ref="conversionService"/>
</bean>
</beans>