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

DATAREST-849 - Remove obsolete reference to ConversionService from RepositoryEntityController.

Browse Source
This commit is contained in:
Oliver Gierke
2016-06-24 14:35:28 +02:00
parent 9d7e63edc0
commit cbbf21fcef
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2015 the original author or authors. * Copyright 2013-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.ConversionService;
@@ -90,7 +89,6 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem
private final RepositoryEntityLinks entityLinks; private final RepositoryEntityLinks entityLinks;
private final RepositoryRestConfiguration config; private final RepositoryRestConfiguration config;
private final ConversionService conversionService;
private final HttpHeadersPreparer headersPreparer; private final HttpHeadersPreparer headersPreparer;
private ApplicationEventPublisher publisher; private ApplicationEventPublisher publisher;
@@ -104,20 +102,17 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem
* @param config must not be {@literal null}. * @param config must not be {@literal null}.
* @param entityLinks must not be {@literal null}. * @param entityLinks must not be {@literal null}.
* @param assembler must not be {@literal null}. * @param assembler must not be {@literal null}.
* @param conversionService must not be {@literal null}.
* @param auditableBeanWrapperFactory must not be {@literal null}. * @param auditableBeanWrapperFactory must not be {@literal null}.
*/ */
@Autowired @Autowired
public RepositoryEntityController(Repositories repositories, RepositoryRestConfiguration config, public RepositoryEntityController(Repositories repositories, RepositoryRestConfiguration config,
RepositoryEntityLinks entityLinks, PagedResourcesAssembler<Object> assembler, RepositoryEntityLinks entityLinks, PagedResourcesAssembler<Object> assembler,
@Qualifier("defaultConversionService") ConversionService conversionService,
AuditableBeanWrapperFactory auditableBeanWrapperFactory) { AuditableBeanWrapperFactory auditableBeanWrapperFactory) {
super(assembler); super(assembler);
this.entityLinks = entityLinks; this.entityLinks = entityLinks;
this.config = config; this.config = config;
this.conversionService = conversionService;
this.headersPreparer = new HttpHeadersPreparer(auditableBeanWrapperFactory); this.headersPreparer = new HttpHeadersPreparer(auditableBeanWrapperFactory);
} }