support as a repeatable annotation

Author: antkorwin

README.adoc

@@ -1,5 +1,8 @@
 # Spring Test Elasticsearch
 
+image:https://codecov.io/gh/jupiter-tools/spring-test-elasticsearch/branch/master/graph/badge.svg["", link="https://codecov.io/gh/jupiter-tools/spring-test-elasticsearch"]
+
+
 Tools to write integration tests of Spring Framework with the Elasticsearch.
 
 ## How to write integration tests on Spring Boot with Elasticsearch in docker

src/main/java/com/jupitertools/springtestelasticsearch/ElasticsearchTestContainer.java

@@ -2,6 +2,7 @@
 
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -14,7 +15,10 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Repeatable(ElasticsearchTestContainers.class)
 public @interface ElasticsearchTestContainer {
 
+    String clusterNodesPropertyHolder() default "spring.data.elasticsearch.cluster-nodes";
 
+    String clusterNamePropertyHolder() default  "spring.data.elasticsearch.cluster-name";
 }

src/main/java/com/jupitertools/springtestelasticsearch/ElasticsearchTestContainers.java

@@ -0,0 +1,22 @@
+package com.jupitertools.springtestelasticsearch;
+
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Created on 2019-05-24
+ * <p>
+ * This annotation provide an ability to use the @{@link ElasticsearchTestContainer}
+ * annotation as a repeatable annotation.
+ *
+ * @author Korovin Anatoliy
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface ElasticsearchTestContainers {
+
+    ElasticsearchTestContainer[] value();
+}

src/main/java/com/jupitertools/springtestelasticsearch/customizer/ContainerDescription.java

@@ -0,0 +1,43 @@
+package com.jupitertools.springtestelasticsearch.customizer;
+
+import java.util.Objects;
+
+/**
+ * Created on 28/11/2019
+ * <p>
+ * TODO: replace on the JavaDoc
+ *
+ * @author Korovin Anatoliy
+ */
+public class ContainerDescription {
+
+    private final String clusterNodes;
+    private final String clusterName;
+
+    public ContainerDescription(String clusterNodes, String clusterName) {
+        this.clusterNodes = clusterNodes;
+        this.clusterName = clusterName;
+    }
+
+    public String getClusterNodes() {
+        return clusterNodes;
+    }
+
+    public String getClusterName() {
+        return clusterName;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+        ContainerDescription that = (ContainerDescription) o;
+        return Objects.equals(clusterNodes, that.clusterNodes) &&
+               Objects.equals(clusterName, that.clusterName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(clusterNodes, clusterName);
+    }
+}

src/main/java/com/jupitertools/springtestelasticsearch/customizer/ElasticsearchContextCustomizer.java

@@ -1,6 +1,9 @@
 package com.jupitertools.springtestelasticsearch.customizer;
 
 import java.time.Duration;
+import java.util.Objects;
+import java.util.Random;
+import java.util.Set;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,8 +29,15 @@
  */
 public class ElasticsearchContextCustomizer implements ContextCustomizer {
 
-    private static final Logger log = LoggerFactory.getLogger(ElasticsearchContextCustomizer.class);
     private static final String DOCKER_IMAGE_NAME = "docker.elastic.co/elasticsearch/elasticsearch:6.4.1";
+    private static final Logger log = LoggerFactory.getLogger(ElasticsearchContextCustomizer.class);
+
+    private final Set<ContainerDescription> containerDescriptions;
+
+
+    public ElasticsearchContextCustomizer(Set<ContainerDescription> descriptions) {
+        this.containerDescriptions = descriptions;
+    }
 
     @Override
     public void customizeContext(ConfigurableApplicationContext configurableApplicationContext,
@@ -39,28 +49,48 @@ public void customizeContext(ConfigurableApplicationContext configurableApplicat
                                                                          response == HTTP_UNAUTHORIZED)
                                       .withStartupTimeout(Duration.ofMinutes(2));
 
-        GenericContainer container =
-                new FixedHostPortGenericContainer<>(DOCKER_IMAGE_NAME)
-                        .withExposedPorts(9200, 9300)
-                        .withEnv("cluster.name", "test_cluster")
-                        .withEnv("discovery.type", "single-node")
-                        .waitingFor(waitStrategy);
+        for (ContainerDescription description : containerDescriptions) {
+
+            String clusterName = "test_cluster_" + new Random().nextInt(1000000);
 
-        log.debug("Starting Elasticsearch TestContainer");
-        container.start();
-        log.debug("Started Elasticsearch TestContainer at:[{}]", getHostPort(container));
+            GenericContainer container =
+                    new FixedHostPortGenericContainer<>(DOCKER_IMAGE_NAME)
+                            .withExposedPorts(9200, 9300)
+                            .withEnv("cluster.name", clusterName)
+                            .withEnv("discovery.type", "single-node")
+                            .waitingFor(waitStrategy);
 
-        TestPropertyValues testPropertyValues =
-                TestPropertyValues.of(
-                        "spring.data.elasticsearch.cluster-nodes=" + getHostPort(container),
-                        "spring.data.elasticsearch.cluster-name=" + "test_cluster");
+            log.info("Starting Elasticsearch TestContainer");
+            container.start();
+            log.info("Started Elasticsearch TestContainer at:[{}] and bind to [{}]",
+                     getHostPort(container),
+                     description.getClusterNodes());
 
-        testPropertyValues.applyTo(configurableApplicationContext);
+            TestPropertyValues testPropertyValues =
+                    TestPropertyValues.of(
+                            description.getClusterNodes() + "=" + getHostPort(container),
+                            description.getClusterName() + "=" + clusterName);
+
+            testPropertyValues.applyTo(configurableApplicationContext);
+        }
     }
 
     private String getHostPort(GenericContainer container) {
         return String.format("%s:%s",
                              container.getContainerIpAddress(),
                              container.getMappedPort(9300));
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) { return true; }
+        if (o == null || getClass() != o.getClass()) { return false; }
+        ElasticsearchContextCustomizer that = (ElasticsearchContextCustomizer) o;
+        return Objects.equals(containerDescriptions, that.containerDescriptions);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(containerDescriptions);
+    }
 }

src/main/java/com/jupitertools/springtestelasticsearch/customizer/ElasticsearchContextCustomizerFactory.java

@@ -1,8 +1,11 @@
 package com.jupitertools.springtestelasticsearch.customizer;
 
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import com.jupitertools.springtestelasticsearch.ElasticsearchTestContainer;
+import com.jupitertools.springtestelasticsearch.ElasticsearchTestContainers;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.test.context.ContextConfigurationAttributes;
@@ -23,14 +26,17 @@ public class ElasticsearchContextCustomizerFactory implements ContextCustomizerF
     public ContextCustomizer createContextCustomizer(Class<?> testClass,
                                                      List<ContextConfigurationAttributes> list) {
 
-        ElasticsearchTestContainer annotation =
-                AnnotationUtils.getAnnotation(testClass, ElasticsearchTestContainer.class);
+        Set<ElasticsearchTestContainer> annotations =
+                AnnotationUtils.getRepeatableAnnotations(testClass,
+                                                         ElasticsearchTestContainer.class,
+                                                         ElasticsearchTestContainers.class);
 
-        if (annotation != null) {
-            return new ElasticsearchContextCustomizer();
-        } else {
-            // nothing to customize
-            return null;
-        }
+        Set<ContainerDescription> descriptions =
+                annotations.stream()
+                           .map(annotation -> new ContainerDescription(annotation.clusterNodesPropertyHolder(),
+                                                                       annotation.clusterNamePropertyHolder()))
+                           .collect(Collectors.toSet());
+
+        return new ElasticsearchContextCustomizer(descriptions);
     }
 }

src/test/java/com/jupitertools/springtestelasticsearch/SecondTest.java

@@ -0,0 +1,29 @@
+package com.jupitertools.springtestelasticsearch;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * Created on 28/11/2019
+ *
+ * @author Korovin Anatoliy
+ */
+@ElasticsearchTestContainer(clusterNodesPropertyHolder = "es.nodes",
+                            clusterNamePropertyHolder = "es.name")
+@SpringBootTest
+class SecondTest {
+
+    @Value("${es.nodes}")
+    private String nodes;
+
+    @Value("${es.name}")
+    private String name;
+
+    @Test
+    void name() {
+        System.out.println("nodes: " + nodes);
+        System.out.println("name: " + name);
+    }
+}