You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2022/02/19 00:44:07 UTC

[druid] branch kafka-3.1 created (now 18ea961)

This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a change to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git.


      at 18ea961  remove need for powermock in KafkaLookupExtractorFactoryTest

This branch includes the following new commits:

     new 40125d4  upgrade core Apache Kafka dependencies to 3.1.0
     new 04c9475  fix use of private Kafka APIs and remove deprecated test rules
     new 3ca2451  fix error class
     new 539ff04  remove mock calls that were not verified before
     new 18ea961  remove need for powermock in KafkaLookupExtractorFactoryTest

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org


[druid] 02/05: fix use of private Kafka APIs and remove deprecated test rules

Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a commit to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git

commit 04c9475748b030df5e4a2b0abc8057e25243eb72
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Wed Jan 26 15:00:22 2022 -0800

    fix use of private Kafka APIs and remove deprecated test rules
---
 .../lookup/KafkaLookupExtractorFactoryTest.java    | 46 +++++++++-------------
 .../query/lookup/TestKafkaExtractionCluster.java   |  4 +-
 .../druid/indexing/kafka/test/TestBroker.java      |  8 +---
 3 files changed, 21 insertions(+), 37 deletions(-)

diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
index b5643ce..53ce0e4 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
@@ -27,18 +27,16 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Bytes;
 import org.apache.druid.jackson.DefaultObjectMapper;
+import org.apache.druid.java.util.common.IAE;
 import org.apache.druid.server.lookup.namespace.cache.CacheHandler;
 import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.MockConsumer;
 import org.apache.kafka.clients.consumer.OffsetResetStrategy;
 import org.easymock.EasyMock;
-import org.easymock.IAnswer;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
@@ -77,10 +75,6 @@ public class KafkaLookupExtractorFactoryTest
       NamespaceExtractionCacheManager.class);
   private final CacheHandler cacheHandler = PowerMock.createStrictMock(CacheHandler.class);
 
-
-  @Rule
-  public ExpectedException expectedException = ExpectedException.none();
-
   @Before
   public void setUp()
   {
@@ -406,7 +400,6 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testStartFailsOnMissingConnect()
   {
-    expectedException.expectMessage("bootstrap.servers required property");
     EasyMock.expect(cacheManager.createCache())
             .andReturn(cacheHandler)
             .once();
@@ -418,7 +411,11 @@ public class KafkaLookupExtractorFactoryTest
         TOPIC,
         ImmutableMap.of()
     );
-    Assert.assertTrue(factory.start());
+    Assert.assertThrows(
+        "bootstrap.servers required property",
+        IAE.class,
+        () -> factory.start()
+    );
     Assert.assertTrue(factory.close());
     PowerMock.verify(cacheManager);
   }
@@ -426,8 +423,6 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testStartFailsOnGroupID()
   {
-    expectedException.expectMessage(
-        "Cannot set kafka property [group.id]. Property is randomly generated for you. Found");
     EasyMock.expect(cacheManager.createCache())
             .andReturn(cacheHandler)
             .once();
@@ -439,7 +434,11 @@ public class KafkaLookupExtractorFactoryTest
         TOPIC,
         ImmutableMap.of("group.id", "make me fail")
     );
-    Assert.assertTrue(factory.start());
+    Assert.assertThrows(
+        "Cannot set kafka property [group.id]. Property is randomly generated for you. Found",
+        IAE.class,
+        () -> factory.start()
+    );
     Assert.assertTrue(factory.close());
     PowerMock.verify(cacheManager);
   }
@@ -447,8 +446,6 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testStartFailsOnAutoOffset()
   {
-    expectedException.expectMessage(
-        "Cannot set kafka property [auto.offset.reset]. Property will be forced to [smallest]. Found ");
     EasyMock.expect(cacheManager.createCache())
             .andReturn(cacheHandler)
             .once();
@@ -461,7 +458,11 @@ public class KafkaLookupExtractorFactoryTest
         TOPIC,
         ImmutableMap.of("auto.offset.reset", "make me fail")
     );
-    Assert.assertTrue(factory.start());
+    Assert.assertThrows(
+        "Cannot set kafka property [auto.offset.reset]. Property will be forced to [smallest]. Found ",
+        IAE.class,
+        () -> factory.start()
+    );
     Assert.assertTrue(factory.close());
     PowerMock.verify(cacheManager);
   }
@@ -469,12 +470,11 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testFailsGetNotStarted()
   {
-    expectedException.expectMessage("Not started");
-    new KafkaLookupExtractorFactory(
+    Assert.assertThrows("Not started", NullPointerException.class, () -> new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
         DEFAULT_PROPERTIES
-    ).get();
+    ).get());
   }
 
   @Test
@@ -501,14 +501,4 @@ public class KafkaLookupExtractorFactoryTest
     Assert.assertEquals(connectTimeout, otherFactory.getConnectTimeout());
     Assert.assertEquals(injective, otherFactory.isInjective());
   }
-
-  private IAnswer<Boolean> getBlockingAnswer()
-  {
-    return () -> {
-      Thread.sleep(60000);
-      Assert.fail("Test failed to complete within 60000ms");
-
-      return false;
-    };
-  }
 }
diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
index 318b713..1b74419 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/TestKafkaExtractionCluster.java
@@ -157,7 +157,7 @@ public class TestKafkaExtractionCluster
   private Map<String, String> getConsumerProperties()
   {
     final Map<String, String> props = new HashMap<>(KAFKA_PROPERTIES);
-    int port = kafkaServer.socketServer().config().advertisedListeners().apply(0).port();
+    int port = kafkaServer.advertisedListeners().apply(0).port();
     props.put("bootstrap.servers", StringUtils.format("127.0.0.1:%d", port));
     return props;
   }
@@ -201,7 +201,7 @@ public class TestKafkaExtractionCluster
   {
     final Properties kafkaProducerProperties = new Properties();
     kafkaProducerProperties.putAll(KAFKA_PROPERTIES);
-    int port = kafkaServer.socketServer().config().advertisedListeners().apply(0).port();
+    int port = kafkaServer.advertisedListeners().apply(0).port();
     kafkaProducerProperties.put("bootstrap.servers", StringUtils.format("127.0.0.1:%d", port));
     kafkaProducerProperties.put("key.serializer", ByteArraySerializer.class.getName());
     kafkaProducerProperties.put("value.serializer", ByteArraySerializer.class.getName());
diff --git a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java
index f028e4b..387bba8 100644
--- a/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java
+++ b/extensions-core/kafka-indexing-service/src/test/java/org/apache/druid/indexing/kafka/test/TestBroker.java
@@ -26,7 +26,6 @@ import org.apache.druid.indexing.kafka.KafkaConsumerConfigs;
 import org.apache.druid.java.util.common.FileUtils;
 import org.apache.druid.java.util.common.StringUtils;
 import org.apache.kafka.clients.admin.Admin;
-import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.clients.producer.KafkaProducer;
 import org.apache.kafka.common.serialization.ByteArraySerializer;
 import org.apache.kafka.common.utils.Time;
@@ -95,7 +94,7 @@ public class TestBroker implements Closeable
 
   public int getPort()
   {
-    return server.socketServer().config().advertisedListeners().apply(0).port();
+    return server.advertisedListeners().apply(0).port();
   }
 
   public KafkaProducer<byte[], byte[]> newProducer()
@@ -115,11 +114,6 @@ public class TestBroker implements Closeable
     return props;
   }
 
-  public KafkaConsumer<byte[], byte[]> newConsumer()
-  {
-    return new KafkaConsumer<>(consumerProperties());
-  }
-
   public Map<String, Object> producerProperties()
   {
     final Map<String, Object> props = new HashMap<>();

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org


[druid] 01/05: upgrade core Apache Kafka dependencies to 3.1.0

Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a commit to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git

commit 40125d48a127d2addc9106a9190914c9a79bfe0c
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Wed Jan 26 08:49:16 2022 -0800

    upgrade core Apache Kafka dependencies to 3.1.0
---
 licenses.yaml | 4 ++--
 pom.xml       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/licenses.yaml b/licenses.yaml
index ba1f301..800e338 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3766,7 +3766,7 @@ libraries:
 ---
 
 name: Apache Kafka
-version: 3.0.0
+version: 3.1.0
 license_category: binary
 module: extensions/druid-kafka-indexing-service
 license_name: Apache License version 2.0
@@ -4676,7 +4676,7 @@ name: Apache Kafka
 license_category: binary
 module: extensions/kafka-extraction-namespace
 license_name: Apache License version 2.0
-version: 3.0.0
+version: 3.1.0
 libraries:
   - org.apache.kafka: kafka-clients
 notices:
diff --git a/pom.xml b/pom.xml
index bf98f4e..98d1c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,7 @@
         <aether.version>0.9.0.M2</aether.version>
         <apache.curator.version>4.3.0</apache.curator.version>
         <apache.curator.test.version>2.12.0</apache.curator.test.version>
-        <apache.kafka.version>3.0.0</apache.kafka.version>
+        <apache.kafka.version>3.1.0</apache.kafka.version>
         <apache.ranger.version>2.0.0</apache.ranger.version>
         <apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
         <avatica.version>1.17.0</avatica.version>

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org


[druid] 05/05: remove need for powermock in KafkaLookupExtractorFactoryTest

Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a commit to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git

commit 18ea96133bfc2a493d476ce86fa4e4c5b5c3c638
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Fri Jan 28 09:27:06 2022 -0800

    remove need for powermock in KafkaLookupExtractorFactoryTest
---
 extensions-core/kafka-extraction-namespace/pom.xml | 15 -----
 .../lookup/KafkaLookupExtractorFactoryTest.java    | 69 ++++------------------
 .../cache/MockNamespaceExtractionCacheManager.java | 40 +++++++++++++
 3 files changed, 51 insertions(+), 73 deletions(-)

diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml
index 7205b04..fbbce98 100644
--- a/extensions-core/kafka-extraction-namespace/pom.xml
+++ b/extensions-core/kafka-extraction-namespace/pom.xml
@@ -159,21 +159,6 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-easymock</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-library</artifactId>
       <version>2.13.3</version>
diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
index 8b0a7f1..75dba4d 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
@@ -28,7 +28,7 @@ import com.google.common.collect.Sets;
 import com.google.common.primitives.Bytes;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.apache.druid.java.util.common.IAE;
-import org.apache.druid.server.lookup.namespace.cache.CacheHandler;
+import org.apache.druid.server.lookup.namespace.cache.MockNamespaceExtractionCacheManager;
 import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager;
 import org.apache.kafka.clients.consumer.Consumer;
 import org.apache.kafka.clients.consumer.MockConsumer;
@@ -37,33 +37,13 @@ import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({
-    NamespaceExtractionCacheManager.class,
-    CacheHandler.class
-})
-@PowerMockIgnore({
-    "javax.management.*",
-    "javax.net.ssl.*",
-    "org.apache.logging.*",
-    "org.slf4j.*",
-    "com.sun.*",
-    "javax.script.*",
-    "jdk.*"
-})
 public class KafkaLookupExtractorFactoryTest
 {
   private static final String TOPIC = "some_topic";
@@ -71,9 +51,7 @@ public class KafkaLookupExtractorFactoryTest
       "some.property", "some.value"
   );
   private final ObjectMapper mapper = new DefaultObjectMapper();
-  private final NamespaceExtractionCacheManager cacheManager = PowerMock.createStrictMock(
-      NamespaceExtractionCacheManager.class);
-  private final CacheHandler cacheHandler = PowerMock.createStrictMock(CacheHandler.class);
+  private final NamespaceExtractionCacheManager cacheManager = MockNamespaceExtractionCacheManager.createMockNamespaceExtractionCacheManager();
 
   @Before
   public void setUp()
@@ -268,14 +246,7 @@ public class KafkaLookupExtractorFactoryTest
   public void testStartStop()
   {
     Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    EasyMock.expectLastCall();
-
-    PowerMock.replay(cacheManager, cacheHandler);
+    EasyMock.replay(cacheManager);
 
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
@@ -295,20 +266,14 @@ public class KafkaLookupExtractorFactoryTest
     Assert.assertTrue(factory.start());
     Assert.assertTrue(factory.close());
     Assert.assertTrue(factory.getFuture().isDone());
-    PowerMock.verify(cacheManager, cacheHandler);
+    EasyMock.verify(cacheManager);
   }
 
 
   @Test
   public void testStartFailsFromTimeout()
   {
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    EasyMock.expectLastCall();
-    PowerMock.replay(cacheManager, cacheHandler);
+    EasyMock.replay(cacheManager);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -333,20 +298,14 @@ public class KafkaLookupExtractorFactoryTest
     Assert.assertFalse(factory.start());
     Assert.assertTrue(factory.getFuture().isDone());
     Assert.assertTrue(factory.getFuture().isCancelled());
-    PowerMock.verify(cacheManager, cacheHandler);
+    EasyMock.verify(cacheManager);
   }
 
   @Test
   public void testStartStopStart()
   {
     Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    EasyMock.expectLastCall().once();
-    PowerMock.replay(cacheManager, cacheHandler);
+    EasyMock.replay(cacheManager);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -362,20 +321,14 @@ public class KafkaLookupExtractorFactoryTest
     Assert.assertTrue(factory.start());
     Assert.assertTrue(factory.close());
     Assert.assertFalse(factory.start());
-    PowerMock.verify(cacheManager, cacheHandler);
+    EasyMock.verify(cacheManager);
   }
 
   @Test
   public void testStartStartStopStop()
   {
     Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST);
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    EasyMock.expectLastCall().once();
-    PowerMock.replay(cacheManager, cacheHandler);
+    EasyMock.replay(cacheManager);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -394,7 +347,7 @@ public class KafkaLookupExtractorFactoryTest
     Assert.assertTrue(factory.start());
     Assert.assertTrue(factory.close());
     Assert.assertTrue(factory.close());
-    PowerMock.verify(cacheManager, cacheHandler);
+    EasyMock.verify(cacheManager);
   }
 
   @Test
@@ -458,7 +411,7 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testSerDe() throws Exception
   {
-    final NamespaceExtractionCacheManager cacheManager = PowerMock.createStrictMock(NamespaceExtractionCacheManager.class);
+    final NamespaceExtractionCacheManager cacheManager = EasyMock.createStrictMock(NamespaceExtractionCacheManager.class);
     final String kafkaTopic = "some_topic";
     final Map<String, String> kafkaProperties = ImmutableMap.of("some_key", "some_value");
     final long connectTimeout = 999;
diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java
new file mode 100644
index 0000000..a41a801
--- /dev/null
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.server.lookup.namespace.cache;
+
+import org.easymock.EasyMock;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+public class MockNamespaceExtractionCacheManager
+{
+  public static NamespaceExtractionCacheManager createMockNamespaceExtractionCacheManager() {
+    final NamespaceExtractionCacheManager cacheManager = EasyMock.createStrictMock(NamespaceExtractionCacheManager.class);
+    final CacheHandler cacheHandler = new CacheHandler(cacheManager, new ConcurrentHashMap<>(), "cache1");
+
+    EasyMock.expect(cacheManager.createCache())
+            .andReturn(cacheHandler)
+            .once();
+
+    cacheManager.disposeCache(cacheHandler);
+    EasyMock.expectLastCall().once();
+    return cacheManager;
+  }
+}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org


[druid] 04/05: remove mock calls that were not verified before

Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a commit to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git

commit 539ff0479442859dbfad57fffc6b456ab1e03081
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Fri Jan 28 08:24:46 2022 -0800

    remove mock calls that were not verified before
---
 .../lookup/KafkaLookupExtractorFactoryTest.java    | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
index c2aafaf..8b0a7f1 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
@@ -400,12 +400,6 @@ public class KafkaLookupExtractorFactoryTest
   @Test
   public void testStartFailsOnMissingConnect()
   {
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    PowerMock.replay(cacheManager);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -417,18 +411,11 @@ public class KafkaLookupExtractorFactoryTest
         () -> factory.start()
     );
     Assert.assertTrue(factory.close());
-    PowerMock.verify(cacheManager);
   }
 
   @Test
   public void testStartFailsOnGroupID()
   {
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>());
-    cacheHandler.close();
-    PowerMock.replay(cacheManager, cacheHandler);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -440,19 +427,11 @@ public class KafkaLookupExtractorFactoryTest
         () -> factory.start()
     );
     Assert.assertTrue(factory.close());
-    PowerMock.verify(cacheManager);
   }
 
   @Test
   public void testStartFailsOnAutoOffset()
   {
-    EasyMock.expect(cacheManager.createCache())
-            .andReturn(cacheHandler)
-            .once();
-    EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once();
-    cacheHandler.close();
-    EasyMock.expectLastCall();
-    PowerMock.replay(cacheManager);
     final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory(
         cacheManager,
         TOPIC,
@@ -464,7 +443,6 @@ public class KafkaLookupExtractorFactoryTest
         () -> factory.start()
     );
     Assert.assertTrue(factory.close());
-    PowerMock.verify(cacheManager);
   }
 
   @Test

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org


[druid] 03/05: fix error class

Posted by xv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xvrl pushed a commit to branch kafka-3.1
in repository https://gitbox.apache.org/repos/asf/druid.git

commit 3ca24519f4ff0fe3cc7ae7247590542bd16bd474
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Thu Jan 27 17:59:25 2022 -0800

    fix error class
---
 .../org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
index 53ce0e4..c2aafaf 100644
--- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
+++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java
@@ -413,7 +413,7 @@ public class KafkaLookupExtractorFactoryTest
     );
     Assert.assertThrows(
         "bootstrap.servers required property",
-        IAE.class,
+        NullPointerException.class,
         () -> factory.start()
     );
     Assert.assertTrue(factory.close());

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org