From cbbf21fcefcee01d848547bceca34ba2f13df5b8 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <ogierke@pivotal.io>
Date: Fri, 24 Jun 2016 14:35:28 +0200
Subject: [PATCH] DATAREST-849 - Remove obsolete reference to ConversionService
 from RepositoryEntityController.

---
 .../data/rest/webmvc/RepositoryEntityController.java       | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java
index c14af59c0..51860b0d8 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryEntityController.java
@@ -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");
  * 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 org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.core.convert.ConversionService;
@@ -90,7 +89,6 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem
 
 	private final RepositoryEntityLinks entityLinks;
 	private final RepositoryRestConfiguration config;
-	private final ConversionService conversionService;
 	private final HttpHeadersPreparer headersPreparer;
 
 	private ApplicationEventPublisher publisher;
@@ -104,20 +102,17 @@ class RepositoryEntityController extends AbstractRepositoryRestController implem
 	 * @param config must not be {@literal null}.
 	 * @param entityLinks 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}.
 	 */
 	@Autowired
 	public RepositoryEntityController(Repositories repositories, RepositoryRestConfiguration config,
 			RepositoryEntityLinks entityLinks, PagedResourcesAssembler<Object> assembler,
-			@Qualifier("defaultConversionService") ConversionService conversionService,
 			AuditableBeanWrapperFactory auditableBeanWrapperFactory) {
 
 		super(assembler);
 
 		this.entityLinks = entityLinks;
 		this.config = config;
-		this.conversionService = conversionService;
 		this.headersPreparer = new HttpHeadersPreparer(auditableBeanWrapperFactory);
 	}