From c8b79eb4902ea0684e507afa63fae47ffefb7de8 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Tue, 22 Jan 2019 16:13:01 +0100
Subject: [PATCH] GH-1448 Fixed ServerController override

Resolves #1448
---
 .../schema/server/config/SchemaServerConfiguration.java   | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/config/SchemaServerConfiguration.java b/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/config/SchemaServerConfiguration.java
index 6e82ff191..8532583bd 100644
--- a/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/config/SchemaServerConfiguration.java
+++ b/spring-cloud-stream-schema-server/src/main/java/org/springframework/cloud/stream/schema/server/config/SchemaServerConfiguration.java
@@ -33,6 +33,7 @@ import org.springframework.cloud.stream.schema.server.support.AvroSchemaValidato
 import org.springframework.cloud.stream.schema.server.support.SchemaValidator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 /**
@@ -42,6 +43,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @Configuration
 @EnableJpaRepositories(basePackageClasses = SchemaRepository.class)
 @EnableConfigurationProperties(SchemaServerProperties.class)
+@Import(ServerController.class)
 public class SchemaServerConfiguration {
 
 	@Bean
@@ -58,12 +60,6 @@ public class SchemaServerConfiguration {
 		};
 	}
 
-	@Bean
-	public ServerController serverController(SchemaRepository repository,
-											SchemaServerProperties schemeServerProperties) {
-		return new ServerController(repository, schemaValidators(), schemeServerProperties);
-	}
-
 	@Bean
 	public Map<String, SchemaValidator> schemaValidators() {
 		Map<String, SchemaValidator> validatorMap = new HashMap<>();