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

DATAREST-1198 - Polishing.

Browse Source 
Fixed @since tag in new converter implementation as we're going to backport the fix to Kay. Simplified converter setup in RepositoryRestMvcConfiguration to expose less API until someone actually requests access.

Original pull request: #290.
This commit is contained in:
Oliver Gierke
2018-06-13 10:13:56 +02:00
parent 65ad7cd3e1
commit 7323b950b6
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-rest-core/src/main/java/org/springframework/data/rest/core/StringToLdapNameConverter.java
View File

@@ -25,7 +25,7 @@ import org.springframework.core.convert.converter.Converter;
* {@link Converter} to convert a {@link String} to a {@link LdapName}.
*
* @author Mark Paluch
* @since 3.1
* @since 3.0.8
*/
public enum StringToLdapNameConverter implements Converter<String, Name> {

8
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/RepositoryRestMvcConfiguration.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.rest.webmvc.config;
import javax.naming.Name;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -44,7 +43,6 @@ 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;
@@ -250,7 +248,7 @@ public class RepositoryRestMvcConfiguration extends HateoasAwareSpringDataWebCon
DefaultFormattingConversionService conversionService = new DefaultFormattingConversionService();
// Add Spring Data Commons formatters
conversionService.addConverter(uriToEntityConverter(conversionService));
conversionService.addConverter(stringToNameConverter());
conversionService.addConverter(StringToLdapNameConverter.INSTANCE);
addFormatters(conversionService);
configurerDelegate.configureConversionService(conversionService);
@@ -677,10 +675,6 @@ 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() {