DATAREST-1198 - Add Converter to convert String to javax.naming.ldap.LdapName.
We now provide and configure a converter for String to LdapName conversion so Spring Data LDAP can be used with Spring Data REST without further configuration. Original pull request: #290.
This commit is contained in:
committed by
Oliver Gierke
parent
843540b746
commit
65ad7cd3e1
@@ -15,6 +15,7 @@
|
||||
*/
|
||||
package org.springframework.data.rest.webmvc.config;
|
||||
|
||||
import javax.naming.Name;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
@@ -43,6 +44,7 @@ import org.springframework.context.support.MessageSourceAccessor;
|
||||
import org.springframework.context.support.ReloadableResourceBundleMessageSource;
|
||||
import org.springframework.core.Ordered;
|
||||
import org.springframework.core.convert.ConversionService;
|
||||
import org.springframework.core.convert.converter.Converter;
|
||||
import org.springframework.core.io.ClassPathResource;
|
||||
import org.springframework.data.auditing.AuditableBeanWrapperFactory;
|
||||
import org.springframework.data.auditing.MappingAuditableBeanWrapperFactory;
|
||||
@@ -57,6 +59,7 @@ import org.springframework.data.querydsl.binding.QuerydslPredicateBuilder;
|
||||
import org.springframework.data.repository.support.DefaultRepositoryInvokerFactory;
|
||||
import org.springframework.data.repository.support.Repositories;
|
||||
import org.springframework.data.repository.support.RepositoryInvokerFactory;
|
||||
import org.springframework.data.rest.core.StringToLdapNameConverter;
|
||||
import org.springframework.data.rest.core.UriToEntityConverter;
|
||||
import org.springframework.data.rest.core.config.MetadataConfiguration;
|
||||
import org.springframework.data.rest.core.config.Projection;
|
||||
@@ -247,6 +250,7 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
|
||||
DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
|
||||
// Add Spring Data Commons formatters
|
||||
conversionService.addConverter(uriToEntityConverter(conversionService));
|
||||
conversionService.addConverter(stringToNameConverter());
|
||||
addFormatters(conversionService);
|
||||
|
||||
configurerDelegate.configureConversionService(conversionService);
|
||||
@@ -673,6 +677,10 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
|
||||
return new UriToEntityConverter(persistentEntities(), repositoryInvokerFactory(conversionService), repositories());
|
||||
}
|
||||
|
||||
protected Converter<String, ? extends Name> stringToNameConverter() {
|
||||
return StringToLdapNameConverter.INSTANCE;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ExcerptProjector excerptProjector() {
|
||||
|
||||
|
||||
@@ -17,6 +17,8 @@ package org.springframework.data.rest.webmvc.config;
|
||||
|
||||
import static org.assertj.core.api.Assertions.*;
|
||||
|
||||
import javax.naming.Name;
|
||||
import javax.naming.ldap.LdapName;
|
||||
import java.util.Collection;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
@@ -63,6 +65,7 @@ import com.jayway.jsonpath.JsonPath;
|
||||
* Integration tests for basic application bootstrapping (general configuration related checks).
|
||||
*
|
||||
* @author Oliver Gierke
|
||||
* @author Mark Paluch
|
||||
*/
|
||||
public class RepositoryRestMvConfigurationIntegrationTests {
|
||||
|
||||
@@ -184,6 +187,15 @@ public class RepositoryRestMvConfigurationIntegrationTests {
|
||||
assertThat(service.canConvert(Distance.class, String.class)).isTrue();
|
||||
}
|
||||
|
||||
@Test // DATAREST-1198
|
||||
public void hasConvertersForNamAndLdapName() {
|
||||
|
||||
ConversionService service = context.getBean("defaultConversionService", ConversionService.class);
|
||||
|
||||
assertThat(service.canConvert(String.class, Name.class)).isTrue();
|
||||
assertThat(service.canConvert(String.class, LdapName.class)).isTrue();
|
||||
}
|
||||
|
||||
@Test // DATAREST-686
|
||||
public void defaultsEncodingForMessageSourceToUtfEight() {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user