fix dependencies, test and more

autoconfigure/build.gradle

@@ -9,7 +9,7 @@ dependencies {
     compileOnly "org.springframework.boot:spring-boot-starter-web", optional
     compileOnly "org.springframework.boot:spring-boot-starter-actuator", optional
     compileOnly "org.springframework.cloud:spring-cloud-starter-loadbalancer", optional
-    compileOnly "org.springframework.cloud:spring-cloud-sleuth-zipkin", optional
+    compileOnly "org.springframework.cloud:spring-cloud-starter-sleuth", optional
 
     compileOnly 'org.apache.commons:commons-pool2', optional
     compileOnly 'org.apache.commons:commons-lang3', optional

autoconfigure/src/main/java/info/developerblog/spring/thrift/client/PoolConfiguration.java

@@ -10,10 +10,10 @@
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.sleuth.Tracer;
+import org.springframework.cloud.sleuth.propagation.Propagator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.PropertyResolver;
@@ -23,7 +23,6 @@
  *         Created on 2016-06-14
  */
 @Configuration
-@ConditionalOnBean(Tracer.class)
 public class PoolConfiguration {
 
     @Autowired
@@ -47,6 +46,9 @@ public class PoolConfiguration {
     @Autowired
     private Tracer tracer;
 
+    @Autowired
+    private Propagator propagator;
+
     @Bean
     @ConditionalOnMissingBean(name = "thriftClientsPool")
     public KeyedObjectPool<ThriftClientKey, TServiceClient> thriftClientsPool() {
@@ -65,6 +67,7 @@ private KeyedPooledObjectFactory<ThriftClientKey, TServiceClient> thriftClientPo
                 .propertyResolver(propertyResolver)
                 .loadBalancerClient(loadBalancerClient)
                 .tracer(tracer)
+                .propagator(propagator)
                 .build();
     }
 

autoconfigure/src/main/java/info/developerblog/spring/thrift/transport/TLoadBalancerClient.java

@@ -125,21 +125,6 @@ public void flush() throws TTransportException {
         }
     }
 
-    @Override
-    public TConfiguration getConfiguration() {
-        return null;
-    }
-
-    @Override
-    public void updateKnownMessageSize(long size) throws TTransportException {
-
-    }
-
-    @Override
-    public void checkReadBytesAvailable(long numBytes) throws TTransportException {
-
-    }
-
     private void doFlush(byte[] data) throws TTransportException, IOException {
         ServiceInstance serviceInstance = this.loadBalancerClient.choose(serviceName);
 

build.gradle

@@ -44,6 +44,7 @@ allprojects {
 subprojects {
     apply plugin: 'java'
 
+
     sourceCompatibility = 1.8
     targetCompatibility = 1.8
 
@@ -52,6 +53,8 @@ subprojects {
             junitXml.enabled = true
             html.enabled = true
         }
+
+        useJUnitPlatform()
     }
 
     dependencies {

examples/simple-client/src/main/java/info/developerblog/examples/thirft/simpleclient/DiscoveryClientAutoConfiguration.java

@@ -0,0 +1,29 @@
+package info.developerblog.examples.thirft.simpleclient;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@AutoConfigureAfter({ SimpleDiscoveryClientAutoConfiguration.class })
+public class DiscoveryClientAutoConfiguration implements ApplicationListener<WebServerInitializedEvent> {
+
+    @Autowired
+    private DiscoveryClient simpleDiscoveryClient;
+
+    @Override
+    public void onApplicationEvent(WebServerInitializedEvent webServerInitializedEvent) {
+        int port = webServerInitializedEvent.getWebServer().getPort();
+        for (String serviceId : simpleDiscoveryClient.getServices()) {
+            for (ServiceInstance instance : simpleDiscoveryClient.getInstances(serviceId)) {
+                ((DefaultServiceInstance) instance).setPort(port);
+            }
+        }
+    }
+}

examples/simple-client/src/main/java/info/developerblog/examples/thirft/simpleclient/SimpleClientApplication.java

@@ -4,6 +4,13 @@
 import info.developerblog.spring.thrift.annotation.ThriftClient;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient;
+import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.annotation.Order;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 /**

examples/simple-client/src/test/java/info/developerblog/examples/thirft/poolfactory/PoolFactoryTests.java

@@ -13,6 +13,7 @@
 
 import javax.annotation.PostConstruct;
 
+import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.DEFINED_PORT;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
 
 /**

examples/simple-client/src/test/resources/application.yml

@@ -1,21 +1,38 @@
-greeting-service:
-  ribbon:
-      listOfServers: localhost:${local.server.port}
+spring:
+  cloud:
+    discovery:
+      client:
+        simple:
+          instances:
+            greeting-service:
+              - instanceId: server1
+                serviceId: greeting-service
+                host: localhost
+                port: 0
+            greeting-service-with-timeouts:
+              - instanceId: server1
+                serviceId: greeting-service-with-timeouts
+                host: localhost
+                port: 0
+            greeting-service-with-timeouts-oneoff:
+              - instanceId: server1
+                serviceId: greeting-service-with-timeouts-oneoff
+                host: localhost
+                port: 0
+            greeting-service-with-timeouts-retriable:
+              - instanceId: server1
+                serviceId: greeting-service-with-timeouts-retriable
+                host: localhost
+                port: 0
 greeting-service-with-timeouts:
   connectTimeout: 10
   readTimeout: 100
-  ribbon:
-      listOfServers: localhost:${local.server.port}
 greeting-service-with-timeouts-oneoff:
   connectTimeout: 10
   readTimeout: 100
-  ribbon:
-      listOfServers: localhost:${local.server.port}
 greeting-service-with-timeouts-retriable:
   connectTimeout: 10
   readTimeout: 100
   maxRetries: 3
-  ribbon:
-      listOfServers: localhost:${local.server.port}
 
 thrift.client.max.threads: 10

examples/simple-handler/src/test/java/info/developerblog/examples/thirft/simpleclient/TGreetingServiceHandlerTests.java

@@ -7,8 +7,7 @@
 import org.apache.thrift.protocol.TProtocolFactory;
 import org.apache.thrift.transport.THttpClient;
 import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -26,7 +25,6 @@
         webEnvironment = RANDOM_PORT
 )
 public class TGreetingServiceHandlerTests {
-
     @LocalServerPort
     int port;
 
@@ -38,7 +36,7 @@ public class TGreetingServiceHandlerTests {
 
     TGreetingService.Iface client;
 
-    @BeforeAll
+    @BeforeEach
     public void setUp() throws Exception {
         TTransport transport = new THttpClient("http://localhost:" + port + "/api");
 

starter/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     compileApi 'org.springframework.boot:spring-boot-starter-web'
     compileApi 'org.springframework.boot:spring-boot-starter-actuator'
     compileApi 'org.springframework.cloud:spring-cloud-starter-loadbalancer'
-    compileApi 'org.springframework.cloud:spring-cloud-sleuth-zipkin'
+    compileApi 'org.springframework.cloud:spring-cloud-starter-sleuth'
 
     compileApi 'org.apache.commons:commons-pool2'
     compileApi 'org.apache.commons:commons-lang3'