Renames Kafka autoconfig types for easier conditions checks (openzipk…

…in#2087)
ihenjoy · Jun 11, 2018 · 9184816 · 9184816
1 parent 8f99f3c
commit 9184816
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/...kinKafka10CollectorAutoConfiguration.java → ...ipkinKafkaCollectorAutoConfiguration.java b/...kinKafka10CollectorAutoConfiguration.java → ...ipkinKafkaCollectorAutoConfiguration.java
@@ -31,8 +31,8 @@
  */
 @Configuration
 @EnableConfigurationProperties(ZipkinKafkaCollectorProperties.class)
-@Conditional(ZipkinKafka10CollectorAutoConfiguration.KafkaBootstrapServersSet.class)
-class ZipkinKafka10CollectorAutoConfiguration { // makes simple type name unique for /autoconfig
+@Conditional(ZipkinKafkaCollectorAutoConfiguration.KafkaBootstrapServersSet.class)
+class ZipkinKafkaCollectorAutoConfiguration { // makes simple type name unique for /actuator/conditions
 
   @Bean(initMethod = "start")
   KafkaCollector kafka(

diff --git a/zipkin-autoconfigure/collector-kafka/src/main/resources/META-INF/spring.factories b/zipkin-autoconfigure/collector-kafka/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-zipkin.autoconfigure.collector.kafka10.ZipkinKafka10CollectorAutoConfiguration
+zipkin.autoconfigure.collector.kafka10.ZipkinKafkaCollectorAutoConfiguration
diff --git a/...nKafkaCollectorAutoConfigurationTest.java → ...nKafkaCollectorAutoConfigurationTest.java b/...nKafkaCollectorAutoConfigurationTest.java → ...nKafkaCollectorAutoConfigurationTest.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package zipkin.autoconfigure.collector.kafka;
+package zipkin.autoconfigure.collector.kafka10;
 
 import org.junit.After;
 import org.junit.Rule;
@@ -22,10 +22,9 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import zipkin2.collector.Collector;
 import zipkin2.collector.CollectorMetrics;
 import zipkin2.collector.CollectorSampler;
-import zipkin2.collector.kafka08.KafkaCollector;
+import zipkin2.collector.kafka.KafkaCollector;
 import zipkin2.storage.InMemoryStorage;
 import zipkin2.storage.StorageComponent;
 
@@ -46,7 +45,7 @@ public void close() {
   }
 
   @Test
-  public void doesntProvidesCollectorComponent_whenKafkaZooKeeperUnset() {
+  public void doesNotProvideCollectorComponent_whenBootstrapServersUnset() {
     context = new AnnotationConfigApplicationContext();
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
@@ -55,37 +54,34 @@ public void doesntProvidesCollectorComponent_whenKafkaZooKeeperUnset() {
     context.refresh();
 
     thrown.expect(NoSuchBeanDefinitionException.class);
-    context.getBean(Collector.class);
+    context.getBean(KafkaCollector.class);
   }
 
   @Test
-  public void providesCollectorComponent_whenZooKeeperSet() {
+  public void providesCollectorComponent_whenBootstrapServersEmptyString() {
     context = new AnnotationConfigApplicationContext();
-    addEnvironment(context, "zipkin.collector.kafka.zookeeper:localhost");
+    addEnvironment(context, "zipkin.collector.kafka.bootstrap-servers:");
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
         ZipkinKafkaCollectorAutoConfiguration.class,
         InMemoryConfiguration.class);
     context.refresh();
 
-    assertThat(context.getBean(KafkaCollector.class)).isNotNull();
+    thrown.expect(NoSuchBeanDefinitionException.class);
+    context.getBean(KafkaCollector.class);
   }
 
   @Test
-  public void canOverrideProperty_topic() {
+  public void providesCollectorComponent_whenBootstrapServersSet() {
     context = new AnnotationConfigApplicationContext();
-    addEnvironment(
-        context,
-        "zipkin.collector.kafka.zookeeper:localhost",
-        "zipkin.collector.kafka.topic:zapkin");
+    addEnvironment(context, "zipkin.collector.kafka.bootstrap-servers:localhost:9091");
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
         ZipkinKafkaCollectorAutoConfiguration.class,
         InMemoryConfiguration.class);
     context.refresh();
 
-    assertThat(context.getBean(ZipkinKafkaCollectorProperties.class).getTopic())
-        .isEqualTo("zapkin");
+    assertThat(context.getBean(KafkaCollector.class)).isNotNull();
   }
 
   @Configuration

diff --git a/...ipkinKafkaCollectorAutoConfiguration.java → ...kinKafka08CollectorAutoConfiguration.java b/...ipkinKafkaCollectorAutoConfiguration.java → ...kinKafka08CollectorAutoConfiguration.java
@@ -29,7 +29,7 @@
 @Configuration
 @EnableConfigurationProperties(ZipkinKafkaCollectorProperties.class)
 @Conditional(KafkaZooKeeperSetCondition.class)
-class ZipkinKafkaCollectorAutoConfiguration {
+class ZipkinKafka08CollectorAutoConfiguration {
 
   /**
    * This launches a thread to run start. This prevents a several second hang, or worse crash if

diff --git a/zipkin-autoconfigure/collector-kafka08/src/main/resources/META-INF/spring.factories b/zipkin-autoconfigure/collector-kafka08/src/main/resources/META-INF/spring.factories
@@ -1,2 +1,2 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-zipkin.autoconfigure.collector.kafka.ZipkinKafkaCollectorAutoConfiguration
+zipkin.autoconfigure.collector.kafka.ZipkinKafka08CollectorAutoConfiguration
diff --git a/...afka10CollectorAutoConfigurationTest.java → ...afka08CollectorAutoConfigurationTest.java b/...afka10CollectorAutoConfigurationTest.java → ...afka08CollectorAutoConfigurationTest.java
@@ -11,7 +11,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-package zipkin.autoconfigure.collector.kafka10;
+package zipkin.autoconfigure.collector.kafka;
 
 import org.junit.After;
 import org.junit.Rule;
@@ -22,16 +22,17 @@
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import zipkin2.collector.Collector;
 import zipkin2.collector.CollectorMetrics;
 import zipkin2.collector.CollectorSampler;
-import zipkin2.collector.kafka.KafkaCollector;
+import zipkin2.collector.kafka08.KafkaCollector;
 import zipkin2.storage.InMemoryStorage;
 import zipkin2.storage.StorageComponent;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.util.EnvironmentTestUtils.addEnvironment;
 
-public class ZipkinKafka10CollectorAutoConfigurationTest {
+public class ZipkinKafka08CollectorAutoConfigurationTest {
 
   @Rule public ExpectedException thrown = ExpectedException.none();
 
@@ -45,43 +46,46 @@ public void close() {
   }
 
   @Test
-  public void doesNotProvideCollectorComponent_whenBootstrapServersUnset() {
+  public void doesntProvidesCollectorComponent_whenKafkaZooKeeperUnset() {
     context = new AnnotationConfigApplicationContext();
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
-        ZipkinKafka10CollectorAutoConfiguration.class,
+        ZipkinKafka08CollectorAutoConfiguration.class,
         InMemoryConfiguration.class);
     context.refresh();
 
     thrown.expect(NoSuchBeanDefinitionException.class);
-    context.getBean(KafkaCollector.class);
+    context.getBean(Collector.class);
   }
 
   @Test
-  public void providesCollectorComponent_whenBootstrapServersEmptyString() {
+  public void providesCollectorComponent_whenZooKeeperSet() {
     context = new AnnotationConfigApplicationContext();
-    addEnvironment(context, "zipkin.collector.kafka.bootstrap-servers:");
+    addEnvironment(context, "zipkin.collector.kafka.zookeeper:localhost");
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
-        ZipkinKafka10CollectorAutoConfiguration.class,
+        ZipkinKafka08CollectorAutoConfiguration.class,
         InMemoryConfiguration.class);
     context.refresh();
 
-    thrown.expect(NoSuchBeanDefinitionException.class);
-    context.getBean(KafkaCollector.class);
+    assertThat(context.getBean(KafkaCollector.class)).isNotNull();
   }
 
   @Test
-  public void providesCollectorComponent_whenBootstrapServersSet() {
+  public void canOverrideProperty_topic() {
     context = new AnnotationConfigApplicationContext();
-    addEnvironment(context, "zipkin.collector.kafka.bootstrap-servers:localhost:9091");
+    addEnvironment(
+        context,
+        "zipkin.collector.kafka.zookeeper:localhost",
+        "zipkin.collector.kafka.topic:zapkin");
     context.register(
         PropertyPlaceholderAutoConfiguration.class,
-        ZipkinKafka10CollectorAutoConfiguration.class,
+        ZipkinKafka08CollectorAutoConfiguration.class,
         InMemoryConfiguration.class);
     context.refresh();
 
-    assertThat(context.getBean(KafkaCollector.class)).isNotNull();
+    assertThat(context.getBean(ZipkinKafkaCollectorProperties.class).getTopic())
+        .isEqualTo("zapkin");
   }
 
   @Configuration