registers PageJacksonModule in FeignClientConfiguration

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EnableFeignClientsTests.java

@@ -17,19 +17,20 @@
 
 package org.springframework.cloud.openfeign;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
 import org.springframework.cloud.openfeign.support.SpringEncoder;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
+import org.springframework.cloud.test.ClassPathExclusions;
+import org.springframework.cloud.test.ModifiedClassPathRunner;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import feign.Contract;
 import feign.Feign;
@@ -42,46 +43,57 @@ import feign.slf4j.Slf4jLogger;
 /**
  * @author Spencer Gibb
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = EnableFeignClientsTests.PlainConfiguration.class)
-@DirtiesContext
-@Category({NonSpringDataTest.class})
+@RunWith(ModifiedClassPathRunner.class)
+@ClassPathExclusions({"spring-data-commons-*.jar"})
 public class EnableFeignClientsTests {
 
-	@Autowired
-	private FeignContext feignContext;
+	private ConfigurableApplicationContext context;
+
+	@Before
+	public void setUp() {
+		context = new SpringApplicationBuilder().web(WebApplicationType.NONE)
+				.properties("debug=true", "feign.httpclient.enabled=false")
+				.sources(EnableFeignClientsTests.PlainConfiguration.class).run();
+	}
+
+	@After
+	public void tearDown() {
+		if(context != null) {
+			context.close();
+		}
+	}
+
 
 	@Test
 	public void decoderDefaultCorrect() {
 		OptionalDecoder.class
-				.cast(this.feignContext.getInstance("foo", Decoder.class));
+				.cast(this.context.getBeansOfType(Decoder.class).get(0));
 	}
 
 	@Test
 	public void encoderDefaultCorrect() {
-
-		SpringEncoder.class.cast(this.feignContext.getInstance("foo", Encoder.class));
+		SpringEncoder.class.cast(this.context.getBeansOfType(Encoder.class).get(0));
 	}
 
 	@Test
 	public void loggerDefaultCorrect() {
-		Slf4jLogger.class.cast(this.feignContext.getInstance("foo", Logger.class));
+		Slf4jLogger.class.cast(this.context.getBeansOfType( Logger.class).get(0));
 	}
 
 	@Test
 	public void contractDefaultCorrect() {
 		SpringMvcContract.class
-				.cast(this.feignContext.getInstance("foo", Contract.class));
+				.cast(this.context.getBeansOfType(Contract.class).get(0));
 	}
 
 	@Test
 	public void builderDefaultCorrect() {
 		Feign.Builder.class
-				.cast(this.feignContext.getInstance("foo", Feign.Builder.class));
+				.cast(this.context.getBeansOfType(Feign.Builder.class).get(0));
 	}
 
 	@Configuration
-	@Import({ PropertyPlaceholderAutoConfiguration.class, ArchaiusAutoConfiguration.class,
+	@Import({ ArchaiusAutoConfiguration.class,
 			FeignAutoConfiguration.class })
 	protected static class PlainConfiguration {
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/NonSpringDataTest.java

@@ -1,4 +0,0 @@
-package org.springframework.cloud.openfeign;
-
-public interface NonSpringDataTest {
-}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignContentEncodingTests.java

@@ -23,7 +23,6 @@ import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
-import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -31,7 +30,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.NonSpringDataTest;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
@@ -39,11 +37,6 @@ import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -62,7 +55,6 @@ import com.netflix.loadbalancer.Server;
 		"hystrix.command.default.execution.isolation.strategy=SEMAPHORE",
 		"ribbon.OkToRetryOnAllOperations=false" })
 @RunWith(SpringJUnit4ClassRunner.class)
-@Category({NonSpringDataTest.class})
 public class FeignContentEncodingTests {
 
 	@Autowired

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/encoding/FeignPageableEncodingTests.java

@@ -28,6 +28,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.cloud.netflix.ribbon.RibbonClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClientsConfiguration;
 import org.springframework.cloud.openfeign.encoding.app.client.InvoiceClient;
 import org.springframework.cloud.openfeign.encoding.app.domain.Invoice;
 import org.springframework.cloud.openfeign.test.NoSecurityConfiguration;
@@ -85,7 +86,7 @@ public class FeignPageableEncodingTests {
 	@RibbonClient(name = "local", configuration = LocalRibbonClientConfiguration.class)
 	@SpringBootApplication(scanBasePackages = "org.springframework.cloud.openfeign.encoding.app")
 	@EnableSpringDataWebSupport
-	@Import(NoSecurityConfiguration.class)
+	@Import({NoSecurityConfiguration.class, FeignClientsConfiguration.class})
 	public static class Application {
 	}