From 2aa2c70c3960d1089a819570a0e8176fc77b393f Mon Sep 17 00:00:00 2001 From: Qiang Zhao <74767115+mattisonchao@users.noreply.github.com> Date: Fri, 18 Jun 2021 13:40:24 +0800 Subject: [PATCH] Refactor Refactor some method to java8 (#10879) --- .../namespace/NamespaceServiceTest.java | 19 +++++-------------- .../broker/service/BrokerServiceTest.java | 8 +------- .../persistent/MessageDuplicationTest.java | 16 +++++----------- .../client/api/KeySharedSubscriptionTest.java | 13 +++++-------- 4 files changed, 16 insertions(+), 40 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java index eeedef570eb3f6..8001f4d8ac0563 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/namespace/NamespaceServiceTest.java @@ -76,7 +76,6 @@ import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.Stat; -import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -281,13 +280,10 @@ public void testUnloadNamespaceBundleFailure() throws Exception { CompletableFuture> topicFuture = CompletableFuture.completedFuture(Optional.of(spyTopic)); // add mock topic topics.put(topicName, topicFuture); - doAnswer(new Answer>() { - @Override - public CompletableFuture answer(InvocationOnMock invocation) { - CompletableFuture result = new CompletableFuture<>(); - result.completeExceptionally(new RuntimeException("first time failed")); - return result; - } + doAnswer((Answer>) invocation -> { + CompletableFuture result = new CompletableFuture<>(); + result.completeExceptionally(new RuntimeException("first time failed")); + return result; }).when(spyTopic).close(false); NamespaceBundle bundle = pulsar.getNamespaceService().getBundle(TopicName.get(topicName)); @@ -319,12 +315,7 @@ public void testUnloadNamespaceBundleWithStuckTopic() throws Exception { // add mock topic topics.put(topicName, topicFuture); // return uncompleted future as close-topic result. - doAnswer(new Answer>() { - @Override - public CompletableFuture answer(InvocationOnMock invocation) throws Throwable { - return new CompletableFuture(); - } - }).when(spyTopic).close(false); + doAnswer((Answer>) invocation -> new CompletableFuture()).when(spyTopic).close(false); NamespaceBundle bundle = pulsar.getNamespaceService().getBundle(TopicName.get(topicName)); // try to unload bundle whose topic will be stuck diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java index a0e3a9ef0d39b5..3465dc401318a2 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerServiceTest.java @@ -82,7 +82,6 @@ import org.apache.pulsar.common.policies.data.LocalPolicies; import org.apache.pulsar.common.policies.data.SubscriptionStats; import org.apache.pulsar.common.policies.data.TopicStats; -import org.apache.pulsar.common.util.SimpleTextOutputStream; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; @@ -1001,12 +1000,7 @@ public void testStuckTopicUnloading() throws Exception { @Test public void testMetricsProvider() throws IOException { - PrometheusRawMetricsProvider rawMetricsProvider = new PrometheusRawMetricsProvider() { - @Override - public void generate(SimpleTextOutputStream stream) { - stream.write("test_metrics{label1=\"xyz\"} 10 \n"); - } - }; + PrometheusRawMetricsProvider rawMetricsProvider = stream -> stream.write("test_metrics{label1=\"xyz\"} 10 \n"); getPulsar().addPrometheusRawMetricsProvider(rawMetricsProvider); HttpClient httpClient = HttpClientBuilder.create().build(); final String metricsEndPoint = getPulsar().getWebServiceAddress() + "/metrics"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java index ed3e2bb09ce40e..bfef2b705d4bab 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/MessageDuplicationTest.java @@ -30,8 +30,6 @@ import org.apache.pulsar.broker.service.Topic; import org.apache.pulsar.common.api.proto.MessageMetadata; import org.apache.pulsar.common.protocol.Commands; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.testng.annotations.Test; import static org.apache.pulsar.common.protocol.Commands.serializeMetadataAndPayload; import static org.mockito.ArgumentMatchers.any; @@ -44,7 +42,6 @@ import static org.mockito.Mockito.verify; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; @Slf4j @Test(groups = "broker") @@ -163,14 +160,11 @@ public void testIsDuplicateWithFailure() { EventLoopGroup eventLoopGroup = mock(EventLoopGroup.class); - doAnswer(new Answer() { - @Override - public Object answer(InvocationOnMock invocationOnMock) { - Object[] args = invocationOnMock.getArguments(); - Runnable test = (Runnable) args[0]; - test.run(); - return null; - } + doAnswer(invocationOnMock -> { + Object[] args = invocationOnMock.getArguments(); + Runnable test = (Runnable) args[0]; + test.run(); + return null; }).when(eventLoopGroup).submit(any(Runnable.class)); BrokerService brokerService = mock(BrokerService.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java index e998a02afbc39c..4142edb00c034a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/KeySharedSubscriptionTest.java @@ -906,14 +906,11 @@ public void testOrderingWithConsumerListener(boolean partitioned) throws Excepti .topic(topic) .subscriptionName(subName) .subscriptionType(SubscriptionType.Key_Shared) - .messageListener(new MessageListener() { - @Override - public void received(Consumer consumer, Message msg) { - try { - Thread.sleep(random.nextInt(5)); - received.add(msg); - } catch (InterruptedException ignore) { - } + .messageListener((MessageListener) (consumer1, msg) -> { + try { + Thread.sleep(random.nextInt(5)); + received.add(msg); + } catch (InterruptedException ignore) { } }) .subscribe();