redo RedirectLBToEmbeddedWebServer

Author: Gennady Kuzmin

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/annotation/EnableRestMvcTest.java

@@ -2,6 +2,7 @@
 
 import com.jupiter.tools.spring.test.core.annotation.EnableIntegrationTest;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -26,4 +27,5 @@
 @EnableIntegrationTest
 @AutoConfigureMockMvc
 public @interface EnableRestMvcTest {
+    SpringBootTest.WebEnvironment webEnvironment() default SpringBootTest.WebEnvironment.RANDOM_PORT;
 }

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/annotation/EnableRestTest.java

@@ -11,9 +11,8 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-@SpringBootTest
 @AutoConfigureWebTestClient
 @EnableIntegrationTest
 public @interface EnableRestTest {
-    SpringBootTest.WebEnvironment webEnvironment() default SpringBootTest.WebEnvironment.MOCK;
+    SpringBootTest.WebEnvironment webEnvironment() default SpringBootTest.WebEnvironment.RANDOM_PORT;
 }

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/JupiterToolsDiscoveryClient.java

@@ -0,0 +1,63 @@
+package com.jupiter.tools.spring.test.web.extension.ribbon;
+
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerProperties;
+import org.springframework.cloud.client.loadbalancer.reactive.ReactiveLoadBalancer;
+import org.springframework.cloud.context.named.NamedContextFactory;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClientConfiguration;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClientSpecification;
+import org.springframework.cloud.loadbalancer.core.RoundRobinLoadBalancer;
+import org.springframework.cloud.loadbalancer.support.ServiceInstanceListSuppliers;
+import org.springframework.core.env.Environment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory.NAMESPACE;
+import static org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory.PROPERTY_NAME;
+
+/**
+ * @author Gennady Kuzmin
+ */
+public class LocalHostLoadBalancerClientFactory extends NamedContextFactory<LoadBalancerClientSpecification>
+        implements ReactiveLoadBalancer.Factory<ServiceInstance> {
+
+    private final Map<String, ServiceInstance> instances = new HashMap<>();
+    private final Environment environment;
+
+    public LocalHostLoadBalancerClientFactory(Environment environment) {
+        super(LoadBalancerClientConfiguration.class, NAMESPACE, PROPERTY_NAME);
+
+        this.environment = environment;
+    }
+
+    @Override
+    public LoadBalancerProperties getProperties(String serviceId) {
+        return new LoadBalancerProperties();
+    }
+
+    @Override
+    public ReactiveLoadBalancer<ServiceInstance> getInstance(String serviceId) {
+        ServiceInstance serviceInstance = instances.isEmpty() ?
+                                          toServiceInstances(serviceId) :
+                                          instances.get(serviceId);
+
+        return new RoundRobinLoadBalancer(ServiceInstanceListSuppliers.toProvider(serviceId, serviceInstance), serviceId);
+    }
+
+    private ServiceInstance toServiceInstances(String serviceId) {
+        int port = environment.getProperty("local.server.port", Integer.class);
+        return new DefaultServiceInstance(serviceId, serviceId, "127.0.0.1", port, false);
+    }
+
+    public void clearInstances() {
+        instances.clear();
+    }
+
+    public void addInstances(String... serviceIds) {
+        for (String serviceId : serviceIds) {
+            instances.put(serviceId, toServiceInstances(serviceId));
+        }
+    }
+}

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/LocalHostLoadBalancerClientFactory.java

@@ -4,27 +4,33 @@
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Created on 05.02.2019.
  *
  * @author Korovin Anatoliy
+ * @author Gennady Kuzmin
  */
 public class RedirectLBExtension implements Extension, BeforeEachCallback, AfterAllCallback {
 
     @Override
     public void beforeEach(ExtensionContext context) throws Exception {
-        RedirectLBExtensionConfig.setClients(getClientNameFromTestClass(context));
+        getLoadBalancerClientFactory(context).addInstances(getClientNameFromTestClass(context));
     }
 
     @Override
     public void afterAll(ExtensionContext context) throws Exception {
-        RedirectLBExtensionConfig.clearClients();
+        getLoadBalancerClientFactory(context).clearInstances();
+    }
+
+    private LocalHostLoadBalancerClientFactory getLoadBalancerClientFactory(ExtensionContext context) {
+        return SpringExtension.getApplicationContext(context).getBean(LocalHostLoadBalancerClientFactory.class);
     }
 
     private String[] getClientNameFromTestClass(ExtensionContext context) {
         return context.getRequiredTestClass()
-                      .getAnnotation(RedirectLBToEmbeddedWebServer.class)
+                      .getAnnotation(RedirectLBToLocalHost.class)
                       .value();
     }
 }

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBExtension.java

@@ -1,28 +1,29 @@
 package com.jupiter.tools.spring.test.web.extension.ribbon;
 
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.loadbalancer.blocking.client.BlockingLoadBalancerClient;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.env.Environment;
 
 /**
  * Created on 06.02.2019.
  *
  * @author Korovin Anatoliy
+ * @author Gennady Kuzmin
  */
+@Configuration
 public class RedirectLBExtensionConfig {
 
-    private final static JupiterToolsDiscoveryClient JUPITER_TOOLS_DISCOVERY_CLIENT = new JupiterToolsDiscoveryClient();
-
     @Bean
-    public JupiterToolsDiscoveryClient customDiscoveryClient() {
-        return JUPITER_TOOLS_DISCOVERY_CLIENT;
-    }
-
-    public static void clearClients() {
-        JUPITER_TOOLS_DISCOVERY_CLIENT.clearInstances();
+    @Primary
+    public LocalHostLoadBalancerClientFactory jupiterToolsLoadBalancerClientFactory(Environment environment) {
+        return new LocalHostLoadBalancerClientFactory(environment);
     }
 
-    public static void setClients(String... clients) {
-        for (String client : clients) {
-            JUPITER_TOOLS_DISCOVERY_CLIENT.addInstances(client);
-        }
+    @Bean
+    public LoadBalancerClient blockingLoadBalancerClient(LocalHostLoadBalancerClientFactory loadBalancerClientFactory) {
+        return new BlockingLoadBalancerClient(loadBalancerClientFactory);
     }
 }

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBExtensionConfig.java

@@ -17,7 +17,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @ExtendWith(RedirectLBExtension.class)
 @Import(RedirectLBExtensionConfig.class)
-public @interface RedirectLBToEmbeddedWebServer {
+public @interface RedirectLBToLocalHost {
 
     /**
      * @return List of client names which should be redirected to the embedded web server

spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBToEmbeddedWebServer.java renamed to spring-test-web/src/main/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBToLocalHost.java

@@ -1,10 +1,10 @@
 package com.jupiter.tools.spring.test.web.extension.ribbon;
 
-import com.jupiter.tools.spring.test.web.annotation.EnableEmbeddedWebServerTest;
 import feign.Client;
 import feign.Feign;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cloud.openfeign.support.SpringMvcContract;
 import org.springframework.context.annotation.Bean;
@@ -19,8 +19,8 @@
  *
  * @author Korovin Anatoliy
  */
-@EnableEmbeddedWebServerTest
-@RedirectLBToEmbeddedWebServer("test-service")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@RedirectLBToLocalHost("test-service")
 class RedirectLBExtensionByFeignTest {
 
     @Autowired

spring-test-web/src/test/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBExtensionByFeignTest.java

@@ -1,9 +1,9 @@
 package com.jupiter.tools.spring.test.web.extension.ribbon;
 
-import com.jupiter.tools.spring.test.web.annotation.EnableEmbeddedWebServerTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -23,8 +23,8 @@
  *
  * @author Korovin Anatoliy
  */
-@EnableEmbeddedWebServerTest
-@RedirectLBToEmbeddedWebServer("test-service")
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@RedirectLBToLocalHost("test-service")
 class RedirectLBExtensionTest {
 
     @Autowired

spring-test-web/src/test/java/com/jupiter/tools/spring/test/web/extension/ribbon/RedirectLBExtensionTest.java

@@ -1,8 +1,8 @@
 package com.jupiter.tools.spring.test.web.extension.ribbon;
 
-import com.jupiter.tools.spring.test.web.annotation.EnableEmbeddedWebServerTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.annotation.Bean;
@@ -22,9 +22,9 @@
  *
  * @author Korovin Anatoliy
  */
-@EnableEmbeddedWebServerTest
-@RedirectLBToEmbeddedWebServer
-class RedirectLBToEmbeddedWebServerTest {
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@RedirectLBToLocalHost
+class RedirectLBToLocalHostTest {
 
     @Autowired
     private RestTemplate restTemplate;