This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 53c7bdf Cleanup code issues in test srcs (#9908)
53c7bdf is described below
commit 53c7bdfc4e691cf4e24b1817a7cdad924dc975a6
Author: Ali Ahmed <[email protected]>
AuthorDate: Tue Mar 16 19:08:38 2021 -0700
Cleanup code issues in test srcs (#9908)
Co-authored-by: Ali Ahmed <[email protected]>
---
.../apache/pulsar/tests/AnnotationListener.java | 6 ++--
.../org/apache/pulsar/tests/RetryAnalyzer.java | 2 +-
.../org/apache/pulsar/tests/TestRetrySupport.java | 4 +--
.../bookkeeper/mledger/impl/ManagedLedgerImpl.java | 2 --
.../bookkeeper/test/MockedBookKeeperTestCase.java | 22 +++++++------
.../pulsar/admin/cli/PulsarAdminToolTest.java | 3 +-
.../apache/pulsar/admin/cli/TestCmdPackages.java | 1 +
.../pulsar/client/api/AuthenticationTest.java | 23 ++++++++++---
.../apache/pulsar/client/api/ConsumerIdTest.java | 26 +++++++--------
.../impl/AcknowledgementsGroupingTrackerTest.java | 2 +-
.../impl/ClientCnxRequestTimeoutQueueTest.java | 4 ++-
.../client/impl/MultiTopicsConsumerImplTest.java | 3 +-
.../client/impl/PulsarServiceNameResolverTest.java | 2 +-
.../client/impl/UnAckedMessageTrackerTest.java | 2 +-
...efaultCryptoKeyReaderConfigurationDataTest.java | 2 +-
.../client/impl/schema/DoubleSchemaTest.java | 4 +--
.../pulsar/client/impl/schema/FloatSchemaTest.java | 4 +--
.../impl/schema/ProtobufNativeSchemaUtilsTest.java | 4 +--
.../client/tutorial/ContinuousAsyncProducer.java | 2 +-
.../pulsar/client/tutorial/ContinuousProducer.java | 2 +-
.../client/tutorial/SampleAsyncProducer.java | 2 +-
.../client/tutorial/SampleConsumerListener.java | 2 +-
.../client/tutorial/SampleCryptoProducer.java | 2 +-
.../pulsar/client/tutorial/SampleProducer.java | 2 +-
.../pulsar/common/policies/data/ClusterData.java | 10 ++++--
.../pulsar/common/api/raw/RawMessageImplTest.java | 8 +++--
.../common/policies/data/BacklogQuotaTest.java | 1 -
.../common/policies/data/OffloadPoliciesTest.java | 2 +-
.../common/policies/data/PoliciesDataTest.java | 3 +-
.../common/policies/data/ReplicatorStatsTest.java | 1 -
.../common/policies/data/ResourceQuotaTest.java | 5 ++-
.../apache/pulsar/common/util/RateLimiterTest.java | 2 +-
.../collections/ConcurrentOpenHashMapTest.java | 4 +--
.../common/util/collections/FieldParserTest.java | 5 ++-
.../GrowableArrayBlockingQueueTest.java | 2 +-
.../collections/TripleLongPriorityQueueTest.java | 2 +-
.../common/util/netty/ChannelFuturesTest.java | 4 ++-
.../pulsar/functions/worker/WorkerUtilsTest.java | 24 +++++++-------
.../TestPollingZooKeeperConfigurationProvider.java | 2 +-
.../TestPropertiesFileConfigurationProvider.java | 6 ++--
.../pulsar/io/flume/sink/StringSinkTests.java | 10 +++---
.../pulsar/io/flume/source/StringSourceTests.java | 2 +-
.../resources/flume-conf-with-envvars.properties | 1 -
.../bookkeeper/BookKeeperPackagesStorageTest.java | 2 +-
.../websocket/AbstractWebSocketHandlerTest.java | 7 ++--
.../jcloud/impl/BufferedOffloadStreamTest.java | 38 +++++++++++-----------
.../offload/jcloud/impl/DataBlockHeaderTest.java | 2 +-
.../offload/jcloud/impl/DataBlockHeaderV2Test.java | 2 +-
.../offload/jcloud/impl/MockManagedLedger.java | 6 ++--
.../provider/TieredStorageConfigurationTests.java | 10 +++---
50 files changed, 156 insertions(+), 133 deletions(-)
diff --git
a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java
b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java
index e1e84fa..7a62fa9 100644
--- a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java
+++ b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java
@@ -25,7 +25,6 @@ import java.util.concurrent.TimeUnit;
import org.testng.IAnnotationTransformer;
import org.testng.annotations.ITestAnnotation;
-@SuppressWarnings("rawtypes")
public class AnnotationListener implements IAnnotationTransformer {
private static final long DEFAULT_TEST_TIMEOUT_MILLIS =
TimeUnit.MINUTES.toMillis(5);
@@ -35,7 +34,10 @@ public class AnnotationListener implements
IAnnotationTransformer {
}
@Override
- public void transform(ITestAnnotation annotation, Class testClass,
Constructor testConstructor, Method testMethod) {
+ public void transform(ITestAnnotation annotation,
+ Class testClass,
+ Constructor testConstructor,
+ Method testMethod) {
annotation.setRetryAnalyzer(RetryAnalyzer.class);
// Enforce default test timeout
diff --git
a/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java
b/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java
index d94e1e2..c5a145f 100644
--- a/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java
+++ b/buildtools/src/main/java/org/apache/pulsar/tests/RetryAnalyzer.java
@@ -26,7 +26,7 @@ public class RetryAnalyzer implements IRetryAnalyzer {
private int count = 0;
// Only try again once
- private static final int MAX_RETRIES =
Integer.valueOf(System.getProperty("testRetryCount", "1"));
+ private static final int MAX_RETRIES =
Integer.parseInt(System.getProperty("testRetryCount", "1"));
@Override
public boolean retry(ITestResult result) {
diff --git
a/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java
b/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java
index 181bc9b..6a00087 100644
--- a/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java
+++ b/buildtools/src/main/java/org/apache/pulsar/tests/TestRetrySupport.java
@@ -40,7 +40,7 @@ public abstract class TestRetrySupport {
private int failedSetupNumber = -1;
private int cleanedUpSetupNumber;
- @BeforeMethod(groups = "setup")
+ @BeforeMethod(groups = { "setup", "flaky", "extra" })
public final void stateCheck(Method method) throws Exception {
// run cleanup and setup if the current setup number is the one where
a failure happened
// this is to cleanup state before retrying
@@ -59,7 +59,7 @@ public abstract class TestRetrySupport {
}
}
- @AfterMethod(alwaysRun = true)
+ @AfterMethod(alwaysRun = true, groups = { "setup", "flaky", "extra" })
public final void failureCheck(ITestResult testResult, Method method) {
// track the setup number where the failure happened
if (!testResult.isSuccess()) {
diff --git
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index 01f32e8..a441d0f 100644
---
a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++
b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -24,7 +24,6 @@ import static java.lang.Math.min;
import static
org.apache.bookkeeper.mledger.util.Errors.isNoSuchLedgerExistsException;
import static org.apache.bookkeeper.mledger.util.SafeRun.safeRun;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.BoundType;
import com.google.common.collect.ImmutableMap;
@@ -77,7 +76,6 @@ import org.apache.bookkeeper.client.BookKeeper.DigestType;
import org.apache.bookkeeper.client.LedgerHandle;
import org.apache.bookkeeper.client.api.ReadHandle;
import org.apache.bookkeeper.common.util.Backoff;
-import org.apache.bookkeeper.common.util.JsonUtil;
import org.apache.bookkeeper.common.util.OrderedExecutor;
import org.apache.bookkeeper.common.util.OrderedScheduler;
import org.apache.bookkeeper.common.util.Retries;
diff --git
a/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java
b/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java
index b9ee5d7..b16a021 100644
---
a/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java
+++
b/managed-ledger/src/test/java/org/apache/bookkeeper/test/MockedBookKeeperTestCase.java
@@ -24,7 +24,6 @@ import java.util.concurrent.Executors;
import org.apache.bookkeeper.client.PulsarMockBookKeeper;
import org.apache.bookkeeper.common.util.OrderedScheduler;
-import org.apache.bookkeeper.conf.ClientConfiguration;
import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig;
import org.apache.bookkeeper.mledger.impl.ManagedLedgerFactoryImpl;
import org.apache.bookkeeper.util.ZkUtils;
@@ -37,6 +36,7 @@ import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
/**
* A class runs several bookie servers for testing.
@@ -54,8 +54,6 @@ public abstract class MockedBookKeeperTestCase {
protected ManagedLedgerFactoryImpl factory;
- protected ClientConfiguration baseClientConf = new ClientConfiguration();
-
protected OrderedScheduler executor;
protected ExecutorService cachedExecutor;
@@ -68,7 +66,7 @@ public abstract class MockedBookKeeperTestCase {
this.numBookies = numBookies;
}
- @BeforeMethod
+ @BeforeMethod(groups = { "broker" })
public void setUp(Method method) throws Exception {
LOG.info(">>>>>> starting {}", method);
try {
@@ -85,7 +83,7 @@ public abstract class MockedBookKeeperTestCase {
zkc.create("/managed-ledgers", new byte[0],
ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
}
- @AfterMethod(alwaysRun = true)
+ @AfterMethod(alwaysRun = true, groups = { "broker" })
public void tearDown(Method method) {
try {
LOG.info("@@@@@@@@@ stopping " + method);
@@ -99,16 +97,20 @@ public abstract class MockedBookKeeperTestCase {
}
}
- @BeforeClass
+ @BeforeClass(groups = { "broker" })
public void setUpClass() {
executor =
OrderedScheduler.newSchedulerBuilder().numThreads(2).name("test").build();
cachedExecutor = Executors.newCachedThreadPool();
}
- @AfterClass(alwaysRun = true)
+ @AfterClass(alwaysRun = true, groups = { "broker" })
public void tearDownClass() {
- executor.shutdown();
- cachedExecutor.shutdown();
+ if (executor != null) {
+ executor.shutdown();
+ }
+ if (cachedExecutor != null) {
+ cachedExecutor.shutdown();
+ }
}
/**
@@ -128,7 +130,7 @@ public abstract class MockedBookKeeperTestCase {
bkc = new PulsarMockBookKeeper(zkc, executor.chooseThread(this));
}
- protected void stopBookKeeper() throws Exception {
+ protected void stopBookKeeper() {
bkc.shutdown();
}
diff --git
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index 1d8e0de..e23ca63 100644
---
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -1236,7 +1237,7 @@ public class PulsarAdminToolTest {
// Ok
}
- // validate Athentication-tls has been configured
+ // validate Authentication-tls has been configured
Field adminBuilderField =
PulsarAdminTool.class.getDeclaredField("adminBuilder");
adminBuilderField.setAccessible(true);
PulsarAdminBuilderImpl builder = (PulsarAdminBuilderImpl)
adminBuilderField.get(tool);
diff --git
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
index f727c9d..6564d3f 100644
---
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
+++
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertFalse;
import static org.testng.Assert.assertTrue;
+
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
index bf3f420..d53ae10 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/api/AuthenticationTest.java
@@ -29,7 +29,9 @@ public class AuthenticationTest {
@Test
public void testConfigureDefaultFormat() {
try {
- MockAuthentication testAuthentication = (MockAuthentication)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockAuthentication",
"key1:value1,key2:value2");
+ MockAuthentication testAuthentication =
+ (MockAuthentication)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockAuthentication",
+ "key1:value1,key2:value2");
Assert.assertEquals(testAuthentication.authParamsMap.get("key1"),
"value1");
Assert.assertEquals(testAuthentication.authParamsMap.get("key2"),
"value2");
} catch (PulsarClientException.UnsupportedAuthenticationException e) {
@@ -41,7 +43,10 @@ public class AuthenticationTest {
@Test
public void testConfigureWrongFormat() {
try {
- MockAuthentication testAuthentication = (MockAuthentication)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockAuthentication",
"foobar");
+ MockAuthentication testAuthentication =
+ (MockAuthentication) AuthenticationFactory.create(
+
"org.apache.pulsar.client.impl.auth.MockAuthentication",
+ "foobar");
Assert.assertTrue(testAuthentication.authParamsMap.isEmpty());
} catch (PulsarClientException.UnsupportedAuthenticationException e) {
e.printStackTrace();
@@ -52,7 +57,9 @@ public class AuthenticationTest {
@Test
public void testConfigureNull() {
try {
- MockAuthentication testAuthentication = (MockAuthentication)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockAuthentication",
(String) null);
+ MockAuthentication testAuthentication = (MockAuthentication)
AuthenticationFactory.create(
+ "org.apache.pulsar.client.impl.auth.MockAuthentication",
+ (String) null);
Assert.assertTrue(testAuthentication.authParamsMap.isEmpty());
} catch (PulsarClientException.UnsupportedAuthenticationException e) {
e.printStackTrace();
@@ -63,7 +70,10 @@ public class AuthenticationTest {
@Test
public void testConfigureEmpty() {
try {
- MockAuthentication testAuthentication = (MockAuthentication)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockAuthentication",
"");
+ MockAuthentication testAuthentication =
+ (MockAuthentication) AuthenticationFactory.create(
+
"org.apache.pulsar.client.impl.auth.MockAuthentication",
+ "");
Assert.assertTrue(testAuthentication.authParamsMap.isEmpty());
} catch (PulsarClientException.UnsupportedAuthenticationException e) {
e.printStackTrace();
@@ -74,7 +84,10 @@ public class AuthenticationTest {
@Test
public void testConfigurePluginSide() {
try {
- MockEncodedAuthenticationParameterSupport testAuthentication =
(MockEncodedAuthenticationParameterSupport)
AuthenticationFactory.create("org.apache.pulsar.client.impl.auth.MockEncodedAuthenticationParameterSupport",
"key1:value1;key2:value2");
+ MockEncodedAuthenticationParameterSupport testAuthentication =
+ (MockEncodedAuthenticationParameterSupport)
AuthenticationFactory.create(
+
"org.apache.pulsar.client.impl.auth.MockEncodedAuthenticationParameterSupport",
+ "key1:value1;key2:value2");
Assert.assertEquals(testAuthentication.authParamsMap.get("key1"),
"value1");
Assert.assertEquals(testAuthentication.authParamsMap.get("key2"),
"value2");
} catch (PulsarClientException.UnsupportedAuthenticationException e) {
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
index 7ecf85a..c210fe2 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/api/ConsumerIdTest.java
@@ -30,31 +30,31 @@ import org.apache.pulsar.client.impl.ConsumerId;
public class ConsumerIdTest {
private static final String TOPIC_TEST = "my-topic-1";
private static final String TOPIC_TEST_2 = "my-topic-2";
- private static final String SUBCRIBTION_TEST = "my-sub-1";
+ private static final String SUBSCRIPTION_TEST = "my-sub-1";
@Test
public void getTopicTest() {
- ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
+ ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
assertEquals(TOPIC_TEST, testConsumerId.getTopic());
}
@Test
- public void getSubscribtionTest() {
- ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- assertEquals(SUBCRIBTION_TEST, testConsumerId.getSubscription());
+ public void getSubscriptionTest() {
+ ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ assertEquals(SUBSCRIPTION_TEST, testConsumerId.getSubscription());
}
@Test
public void hashCodeTest() {
- ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- assertEquals(Objects.hashCode(TOPIC_TEST, SUBCRIBTION_TEST),
testConsumerId.hashCode());
+ ConsumerId testConsumerId = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ assertEquals(Objects.hashCode(TOPIC_TEST, SUBSCRIPTION_TEST),
testConsumerId.hashCode());
}
@Test
public void equalTest() {
- ConsumerId testConsumerId1 = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- ConsumerId testConsumerId2 = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- ConsumerId testConsumerId3 = new ConsumerId(TOPIC_TEST_2,
SUBCRIBTION_TEST);
+ ConsumerId testConsumerId1 = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ ConsumerId testConsumerId2 = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ ConsumerId testConsumerId3 = new ConsumerId(TOPIC_TEST_2,
SUBSCRIPTION_TEST);
assertEquals(testConsumerId2, testConsumerId1);
@@ -65,9 +65,9 @@ public class ConsumerIdTest {
@Test
public void compareToTest() {
- ConsumerId testConsumerId1 = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- ConsumerId testConsumerId2 = new ConsumerId(TOPIC_TEST,
SUBCRIBTION_TEST);
- ConsumerId testConsumerId3 = new ConsumerId(TOPIC_TEST_2,
SUBCRIBTION_TEST);
+ ConsumerId testConsumerId1 = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ ConsumerId testConsumerId2 = new ConsumerId(TOPIC_TEST,
SUBSCRIPTION_TEST);
+ ConsumerId testConsumerId3 = new ConsumerId(TOPIC_TEST_2,
SUBSCRIPTION_TEST);
assertEquals(0, testConsumerId1.compareTo(testConsumerId2));
assertEquals(-1, testConsumerId1.compareTo(testConsumerId3));
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
index a5ac7f1c..9632a88 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/AcknowledgementsGroupingTrackerTest.java
@@ -258,7 +258,7 @@ public class AcknowledgementsGroupingTrackerTest {
}
@Test(dataProvider = "isNeedReceipt")
- public void testAckTrackerMultiAck(boolean isNeedReceipt) throws Exception
{
+ public void testAckTrackerMultiAck(boolean isNeedReceipt) {
ConsumerConfigurationData<?> conf = new ConsumerConfigurationData<>();
conf.setAcknowledgementsGroupTimeMicros(TimeUnit.SECONDS.toMicros(10));
conf.setAckReceiptEnabled(isNeedReceipt);
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
index 2b55505..5673b79 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/ClientCnxRequestTimeoutQueueTest.java
@@ -68,7 +68,9 @@ public class ClientCnxRequestTimeoutQueueTest {
@AfterTest(alwaysRun = true)
void cleanupClientCnx() {
- eventLoop.shutdownNow();
+ if (eventLoop != null) {
+ eventLoop.shutdownGracefully();
+ }
}
@Test
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
index bc95a07..297f2be 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/MultiTopicsConsumerImplTest.java
@@ -39,7 +39,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import static
org.apache.pulsar.client.impl.ClientTestFixtures.createDelayedCompletedFuture;
import static
org.apache.pulsar.client.impl.ClientTestFixtures.createExceptionFuture;
@@ -143,7 +142,7 @@ public class MultiTopicsConsumerImplTest {
}
@Test
- public void testConsumerCleanupOnSubscribeFailure() throws
InterruptedException, TimeoutException, ExecutionException {
+ public void testConsumerCleanupOnSubscribeFailure() {
ExecutorProvider executorProvider = mock(ExecutorProvider.class);
ConsumerConfigurationData<byte[]> consumerConfData = new
ConsumerConfigurationData<>();
consumerConfData.setSubscriptionName("subscriptionName");
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
index 878e240..2a0e39d 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/PulsarServiceNameResolverTest.java
@@ -52,7 +52,7 @@ public class PulsarServiceNameResolverTest {
}
@Test(expectedExceptions = IllegalStateException.class)
- public void testResolveUrlBeforeUpdateServiceUrl() throws Exception {
+ public void testResolveUrlBeforeUpdateServiceUrl() {
resolver.resolveHostUri();
}
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
index 94e85ff..3919bf9 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/UnAckedMessageTrackerTest.java
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
public class UnAckedMessageTrackerTest {
@Test
- public void testAddAndRemove() throws Exception {
+ public void testAddAndRemove() {
PulsarClientImpl client = mock(PulsarClientImpl.class);
Timer timer = new HashedWheelTimer(new
DefaultThreadFactory("pulsar-timer", Thread.currentThread().isDaemon()),
1, TimeUnit.MILLISECONDS);
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
index cb38ea5..9d007fa 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/conf/DefaultCryptoKeyReaderConfigurationDataTest.java
@@ -47,7 +47,7 @@ public class DefaultCryptoKeyReaderConfigurationDataTest {
}
@Test
- public void testToString() throws Exception {
+ public void testToString() {
DefaultCryptoKeyReaderConfigurationData conf = new
DefaultCryptoKeyReaderConfigurationData();
assertEquals(conf.toString(),
"DefaultCryptoKeyReaderConfigurationData(defaultPublicKey=null,
defaultPrivateKey=null, publicKeys={}, privateKeys={})");
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
index 6fc76de..489b3ab 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/DoubleSchemaTest.java
@@ -28,7 +28,7 @@ public class DoubleSchemaTest {
@Test
public void testSchemaEncode() {
DoubleSchema schema = DoubleSchema.of();
- Double data = new Double(12345678.1234);
+ double data = 12345678.1234;
long longData = Double.doubleToLongBits(data);
byte[] expected = new byte[] {
(byte) (longData >>> 56),
@@ -46,7 +46,7 @@ public class DoubleSchemaTest {
@Test
public void testSchemaEncodeDecodeFidelity() {
DoubleSchema schema = DoubleSchema.of();
- Double dbl = new Double(1234578.8754321);
+ Double dbl = 1234578.8754321;
ByteBuf byteBuf = ByteBufAllocator.DEFAULT.buffer(8);
byte[] bytes = schema.encode(dbl);
byteBuf.writeBytes(bytes);
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
index 5d5dd0b..75aa40b 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/FloatSchemaTest.java
@@ -28,7 +28,7 @@ public class FloatSchemaTest {
@Test
public void testSchemaEncode() {
FloatSchema schema = FloatSchema.of();
- Float data = new Float(12345678.1234);
+ float data = (float) 12345678.1234;
long longData = Float.floatToRawIntBits(data);
byte[] expected = new byte[] {
(byte) (longData >>> 24),
@@ -43,7 +43,7 @@ public class FloatSchemaTest {
public void testSchemaEncodeDecodeFidelity() {
FloatSchema schema = FloatSchema.of();
ByteBuf byteBuf = ByteBufAllocator.DEFAULT.buffer(4);
- Float dbl = new Float(1234578.8754321);
+ Float dbl = (float) 1234578.8754321;
byte[] bytes = schema.encode(dbl);
byteBuf.writeBytes(schema.encode(dbl));
Assert.assertEquals(dbl, schema.decode(bytes));
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
index 9102ae9..512fa6e 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/ProtobufNativeSchemaUtilsTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
public class ProtobufNativeSchemaUtilsTest {
@Test
- public static void testSerialize() throws Exception {
+ public static void testSerialize() {
byte[] data =
ProtobufNativeSchemaUtils.serialize(org.apache.pulsar.client.schema.proto.Test.TestMessage.getDescriptor());
Descriptors.Descriptor descriptor =
ProtobufNativeSchemaUtils.deserialize(data);
Assert.assertNotNull(descriptor);
@@ -34,7 +34,7 @@ public class ProtobufNativeSchemaUtilsTest {
}
@Test
- public static void testNestedMessage() throws Exception {
+ public static void testNestedMessage() {
}
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
index a28acaf..7e4d272 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousAsyncProducer.java
@@ -25,7 +25,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
public class ContinuousAsyncProducer {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
PulsarClient pulsarClient =
PulsarClient.builder().serviceUrl("http://127.0.0.1:8080";).build();
Producer<byte[]> producer =
pulsarClient.newProducer().topic("persistent://my-tenant/my-ns/my-topic")
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
index 30ce04f..623ee44 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/ContinuousProducer.java
@@ -25,7 +25,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
public class ContinuousProducer {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
PulsarClient pulsarClient =
PulsarClient.builder().serviceUrl("http://127.0.0.1:8080";).build();
Producer<byte[]> producer =
pulsarClient.newProducer().topic("persistent://my-tenant/my-ns/my-topic")
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
index b4b3f23..23bfebc 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleAsyncProducer.java
@@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SampleAsyncProducer {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
PulsarClient pulsarClient =
PulsarClient.builder().serviceUrl("http://localhost:8080";).build();
Producer<byte[]> producer =
pulsarClient.newProducer().topic("persistent://my-tenant/my-ns/my-topic")
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
index 0885500..9e3d234 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleConsumerListener.java
@@ -27,7 +27,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SampleConsumerListener {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
PulsarClient pulsarClient =
PulsarClient.builder().serviceUrl("http://localhost:8080";).build();
pulsarClient.newConsumer() //
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
index 4789692..3549b86 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleCryptoProducer.java
@@ -34,7 +34,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class SampleCryptoProducer {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
class RawFileKeyReader implements CryptoKeyReader {
diff --git
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
index 28997bd..f279af1 100644
---
a/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
+++
b/pulsar-client/src/test/java/org/apache/pulsar/client/tutorial/SampleProducer.java
@@ -25,7 +25,7 @@ import org.apache.pulsar.client.api.PulsarClient;
import org.apache.pulsar.client.api.PulsarClientException;
public class SampleProducer {
- public static void main(String[] args) throws PulsarClientException,
InterruptedException, IOException {
+ public static void main(String[] args) throws InterruptedException,
IOException {
PulsarClient client =
PulsarClient.builder().serviceUrl("pulsar://localhost:6650").build();
Producer<byte[]> producer =
client.newProducer().topic("persistent://my-tenant/my-ns/my-topic").create();
diff --git
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
index 2d2f487..83d3610 100644
---
a/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
+++
b/pulsar-common/src/main/java/org/apache/pulsar/common/policies/data/ClusterData.java
@@ -196,9 +196,13 @@ public class ClusterData {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("serviceUrl",
serviceUrl).add("serviceUrlTls", serviceUrlTls)
- .add("brokerServiceUrl",
brokerServiceUrl).add("brokerServiceUrlTls", brokerServiceUrlTls)
- .add("proxyServiceUrl", proxyServiceUrl).add("proxyProtocol",
proxyProtocol)
+ return MoreObjects.toStringHelper(this)
+ .add("serviceUrl", serviceUrl)
+ .add("serviceUrlTls", serviceUrlTls)
+ .add("brokerServiceUrl", brokerServiceUrl)
+ .add("brokerServiceUrlTls", brokerServiceUrlTls)
+ .add("proxyServiceUrl", proxyServiceUrl)
+ .add("proxyProtocol", proxyProtocol)
.add("peerClusterNames", peerClusterNames).toString();
}
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
index 978eee6..d21d4ba 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/api/raw/RawMessageImplTest.java
@@ -18,11 +18,13 @@
*/
package org.apache.pulsar.common.api.raw;
-import static org.testng.Assert.assertEquals;
-import java.util.Map;
import org.apache.pulsar.common.api.proto.SingleMessageMetadata;
import org.testng.annotations.Test;
+import java.util.Map;
+
+import static org.testng.Assert.assertEquals;
+
public class RawMessageImplTest {
private static final String HARD_CODE_KEY = "__pfn_input_topic__";
@@ -42,5 +44,7 @@ public class RawMessageImplTest {
Map<String, String> properties = msg.getProperties();
assertEquals(properties.get(HARD_CODE_KEY), KEY_VALUE_SECOND);
assertEquals(properties.get(HARD_CODE_KEY_ID), HARD_CODE_KEY_ID_VALUE);
+ assertEquals(KEY_VALUE_SECOND, properties.get(HARD_CODE_KEY));
+ assertEquals(HARD_CODE_KEY_ID_VALUE, properties.get(HARD_CODE_KEY_ID));
}
}
\ No newline at end of file
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
index 691471f..8f9f3aa 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/BacklogQuotaTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.common.policies.data;
-import org.apache.pulsar.common.policies.data.BacklogQuota;
import org.apache.pulsar.common.policies.data.BacklogQuota.RetentionPolicy;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
index a89409c..96b1f48 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/OffloadPoliciesTest.java
@@ -268,7 +268,7 @@ public class OffloadPoliciesTest {
final String brokerDriver = "aws-s3";
final Long brokerOffloadThreshold = 0L;
- final Long brokerDeletionLag = 1000L;
+ final long brokerDeletionLag = 1000L;
final Integer brokerOffloadMaxThreads = 2;
Properties brokerProperties = new Properties();
brokerProperties.setProperty("managedLedgerOffloadDriver",
brokerDriver);
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
index 3aa7112..ee6b5e7 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/PoliciesDataTest.java
@@ -31,7 +31,6 @@ import org.apache.pulsar.common.util.ObjectMapperFactory;
import org.testng.annotations.Test;
import com.fasterxml.jackson.core.JsonGenerationException;
-import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Lists;
@@ -86,7 +85,7 @@ public class PoliciesDataTest {
}
@Test
- public void bundlesData() throws JsonParseException, JsonMappingException,
IOException {
+ public void bundlesData() throws IOException {
ObjectMapper jsonMapper = ObjectMapperFactory.create();
String newJsonPolicy =
"{\"auth_policies\":{\"namespace_auth\":{},\"destination_auth\":{}},\"replication_clusters\":[],\"bundles\":{\"boundaries\":[\"0x00000000\",\"0xffffffff\"]},\"backlog_quota_map\":{},\"persistence\":null,\"latency_stats_sample_rate\":{}}";
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
index 99640db..0467053 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ReplicatorStatsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.common.policies.data;
-import org.apache.pulsar.common.policies.data.ReplicatorStats;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
index 15ff99f..8d8696e 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/policies/data/ResourceQuotaTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.pulsar.common.policies.data;
-import org.apache.pulsar.common.policies.data.ResourceQuota;
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -31,7 +30,7 @@ public class ResourceQuotaTest {
Assert.assertEquals(quota.getBandwidthIn(), 0.0);
Assert.assertEquals(quota.getBandwidthOut(), 0.0);
Assert.assertEquals(quota.getMemory(), 0.0);
- Assert.assertEquals(quota.getDynamic(), true);
+ Assert.assertTrue(quota.getDynamic());
Assert.assertFalse(quota.isValid());
quota.setMsgRateIn(10);
@@ -45,7 +44,7 @@ public class ResourceQuotaTest {
Assert.assertEquals(quota.getBandwidthIn(), 10000.0);
Assert.assertEquals(quota.getBandwidthOut(), 20000.0);
Assert.assertEquals(quota.getMemory(), 100.0);
- Assert.assertEquals(quota.getDynamic(), false);
+ Assert.assertFalse(quota.getDynamic());
}
@Test
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
index 0fcd5b7..891609d 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/RateLimiterTest.java
@@ -155,7 +155,7 @@ public class RateLimiterTest {
// change rate-time from 1sec to 5sec
rate.setRate(permits, 5 * rateTimeMSec, TimeUnit.MILLISECONDS, null);
assertEquals(rate.getAvailablePermits(), 100);
- assertEquals(rate.tryAcquire(permits), true);
+ assertTrue(rate.tryAcquire(permits));
assertEquals(rate.getAvailablePermits(), 0);
// check after a rate-time: permits can't be renewed
Thread.sleep(rateTimeMSec);
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
index 4bac2db..c7641a8 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/ConcurrentOpenHashMapTest.java
@@ -414,8 +414,8 @@ public class ConcurrentOpenHashMapTest {
}
}
- void benchHashMap() throws Exception {
- HashMap<Long, String> map = new HashMap<Long, String>(N, 0.66f);
+ void benchHashMap() {
+ HashMap<Long, String> map = new HashMap<>(N, 0.66f);
for (long i = 0; i < Iterations; i++) {
for (int j = 0; j < N; j++) {
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
index 69c9f74..c8a46cb 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/FieldParserTest.java
@@ -43,10 +43,9 @@ public class FieldParserTest {
/**
* test all conversion scenarios.
*
- * @throws Exception
*/
@Test
- public void testConversion() throws Exception {
+ public void testConversion() {
assertEquals(convert("2", Integer.class), Integer.valueOf(2));
assertEquals(convert("2", Double.class), Double.valueOf(2));
@@ -98,7 +97,7 @@ public class FieldParserTest {
static class ServiceConfiguration {
private String zookeeperServers;
- private List<String> bootstrapNamespaces = new ArrayList<String>();
+ private List<String> bootstrapNamespaces = new ArrayList<>();
public String getZookeeperServers() {
return zookeeperServers;
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
index 860fab5..5fe61c3 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/GrowableArrayBlockingQueueTest.java
@@ -212,7 +212,7 @@ public class GrowableArrayBlockingQueueTest {
}
@Test
- public void removeTest() throws Exception {
+ public void removeTest() {
BlockingQueue<Integer> queue = new GrowableArrayBlockingQueue<>(4);
assertNull(queue.poll());
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
index 241b4f2..4cb1027 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/collections/TripleLongPriorityQueueTest.java
@@ -35,7 +35,7 @@ public class TripleLongPriorityQueueTest {
final int N = 1000;
for (int i = N; i > 0; i--) {
- pq.add(i, i * 2, i * 3);
+ pq.add(i, i * 2L, i * 3L);
}
assertEquals(pq.size(), N);
diff --git
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
index 65927a8..ad4843f 100644
---
a/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
+++
b/pulsar-common/src/test/java/org/apache/pulsar/common/util/netty/ChannelFuturesTest.java
@@ -55,7 +55,9 @@ public class ChannelFuturesTest {
@AfterTest(alwaysRun = true)
public void shutdownEventLoop() throws InterruptedException {
- eventLoop.shutdownGracefully(0, 0, TimeUnit.MILLISECONDS).await(100);
+ if (eventLoop != null) {
+ eventLoop.shutdownGracefully(0, 0,
TimeUnit.MILLISECONDS).await(100);
+ }
}
@BeforeMethod
diff --git
a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
index 9620cfc..d899db1 100644
---
a/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
+++
b/pulsar-functions/worker/src/test/java/org/apache/pulsar/functions/worker/WorkerUtilsTest.java
@@ -18,6 +18,19 @@
*/
package org.apache.pulsar.functions.worker;
+import org.apache.pulsar.client.api.CompressionType;
+import org.apache.pulsar.client.api.Producer;
+import org.apache.pulsar.client.api.ProducerAccessMode;
+import org.apache.pulsar.client.api.ProducerBuilder;
+import org.apache.pulsar.client.api.PulsarClient;
+import org.apache.pulsar.client.api.PulsarClientException;
+import org.testng.annotations.Test;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
@@ -29,17 +42,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.fail;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Supplier;
-import org.apache.pulsar.client.api.CompressionType;
-import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.ProducerAccessMode;
-import org.apache.pulsar.client.api.ProducerBuilder;
-import org.apache.pulsar.client.api.PulsarClient;
-import org.apache.pulsar.client.api.PulsarClientException;
-import org.testng.annotations.Test;
public class WorkerUtilsTest {
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
index 9535ed5..70eb319 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPollingZooKeeperConfigurationProvider.java
@@ -70,7 +70,7 @@ public class TestPollingZooKeeperConfigurationProvider extends
}
@Override
- protected void doTearDown() throws Exception {
+ protected void doTearDown() {
// do nothing
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
index c44423e..2cd2b53 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/node/TestPropertiesFileConfigurationProvider.java
@@ -47,17 +47,17 @@ public class TestPropertiesFileConfigurationProvider {
private PropertiesFileConfigurationProvider provider;
@BeforeMethod
- public void setUp() throws Exception {
+ public void setUp() {
provider = new PropertiesFileConfigurationProvider("test", TESTFILE);
}
@AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception {
+ public void tearDown() {
}
@Test
- public void testPropertyRead() throws Exception {
+ public void testPropertyRead() {
FlumeConfiguration configuration = provider.getFlumeConfiguration();
assertNotNull(configuration);
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
index 91c13cd..58c6db7 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/sink/StringSinkTests.java
@@ -64,7 +64,7 @@ public class StringSinkTests extends AbstractFlumeTests {
private Channel channel;
@BeforeMethod
- public void setUp() throws Exception {
+ public void setUp() {
mockRecord = mock(Record.class);
mockSinkContext = mock(SinkContext.class);
source = new AvroSource();
@@ -89,7 +89,7 @@ public class StringSinkTests extends AbstractFlumeTests {
when(mockRecord.getKey()).thenAnswer(new Answer<Optional<String>>() {
long sequenceCounter = 0;
- public Optional<String> answer(InvocationOnMock invocation) throws
Throwable {
+ public Optional<String> answer(InvocationOnMock invocation) {
return Optional.of("key-" + sequenceCounter++);
}
});
@@ -97,18 +97,18 @@ public class StringSinkTests extends AbstractFlumeTests {
when(mockRecord.getValue()).thenAnswer(new Answer<String>() {
long sequenceCounter = 0;
- public String answer(InvocationOnMock invocation) throws Throwable
{
+ public String answer(InvocationOnMock invocation) {
return new String("value-" + sequenceCounter++);
}
});
}
@AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception {
+ public void tearDown() {
source.stop();
}
- protected final void send(StringSink stringSink, int numRecords) throws
Exception {
+ protected final void send(StringSink stringSink, int numRecords) {
for (int idx = 0; idx < numRecords; idx++) {
stringSink.write(mockRecord);
}
diff --git
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
index 3041692..c9f7cea 100644
---
a/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
+++
b/pulsar-io/flume/src/test/java/org/apache/pulsar/io/flume/source/StringSourceTests.java
@@ -69,7 +69,7 @@ public class StringSourceTests extends AbstractFlumeTests {
}
@AfterMethod(alwaysRun = true)
- public void tearDown() throws Exception {
+ public void tearDown() {
sink.stop();
sink = null;
}
diff --git
a/pulsar-io/flume/src/test/resources/flume-conf-with-envvars.properties
b/pulsar-io/flume/src/test/resources/flume-conf-with-envvars.properties
index bc73d41..c366978 100644
--- a/pulsar-io/flume/src/test/resources/flume-conf-with-envvars.properties
+++ b/pulsar-io/flume/src/test/resources/flume-conf-with-envvars.properties
@@ -30,7 +30,6 @@ a1.channels.c1.transactionCapacity = 10000
a1.channels.c1.byteCapacityBufferPercentage = 20
a1.channels.c1.byteCapacity = 800000
-a1.channels = c1
a1.sinks = k1
a1.sinks.k1.type = logger
a1.sinks.k1.channel = c1
diff --git
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
index a045d7d..1e6df3f 100644
---
a/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
+++
b/pulsar-package-management/bookkeeper-storage/src/test/java/org/apache/pulsar/packages/management/storage/bookkeeper/BookKeeperPackagesStorageTest.java
@@ -86,7 +86,7 @@ public class BookKeeperPackagesStorageTest extends
BookKeeperClusterTestCase {
storage.readAsync(testPath, readData).get();
String readResult = new String(readData.toByteArray(),
StandardCharsets.UTF_8);
- assertTrue(readResult.equals(testData));
+ assertEquals(testData, readResult);
}
@Test(timeOut = 60000)
diff --git
a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
index b039913..da5d3a6 100644
---
a/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
+++
b/pulsar-websocket/src/test/java/org/apache/pulsar/websocket/AbstractWebSocketHandlerTest.java
@@ -50,7 +50,6 @@ import
org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
import org.mockito.Mock;
import org.testng.annotations.Test;
-
public class AbstractWebSocketHandlerTest {
@Mock
private HttpServletRequest httpServletRequest;
@@ -166,14 +165,14 @@ public class AbstractWebSocketHandlerTest {
}
- class WebSocketHandlerImpl extends AbstractWebSocketHandler {
+ static class WebSocketHandlerImpl extends AbstractWebSocketHandler {
public WebSocketHandlerImpl(WebSocketService service,
HttpServletRequest request, ServletUpgradeResponse response) {
super(service, request, response);
}
@Override
- protected Boolean isAuthorized(String authRole,
AuthenticationDataSource authenticationData) throws Exception {
+ protected Boolean isAuthorized(String authRole,
AuthenticationDataSource authenticationData) {
return null;
}
@@ -188,7 +187,7 @@ public class AbstractWebSocketHandlerTest {
}
- class MockedServletUpgradeResponse extends ServletUpgradeResponse {
+ static class MockedServletUpgradeResponse extends ServletUpgradeResponse {
@Getter
private int statusCode;
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
index 64e490b..4ebf943 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BufferedOffloadStreamTest.java
@@ -37,6 +37,7 @@ import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.impl.EntryImpl;
import org.apache.bookkeeper.mledger.impl.OffloadSegmentInfoImpl;
import org.testng.annotations.Test;
+import org.testng.Assert;
public class BufferedOffloadStreamTest {
final Random random = new Random();
@@ -63,11 +64,11 @@ public class BufferedOffloadStreamTest {
final BufferedOffloadStream inputStream = new
BufferedOffloadStream(blockSize, entryBuffer,
segmentInfo.beginLedgerId,
segmentInfo.beginEntryId);
- assertEquals(inputStream.getLedgerId(), 0);
- assertEquals(inputStream.getBeginEntryId(), 0);
- assertEquals(inputStream.getBlockSize(), blockSize);
+ Assert.assertEquals(inputStream.getLedgerId(), 0);
+ Assert.assertEquals(inputStream.getBeginEntryId(), 0);
+ Assert.assertEquals(inputStream.getBlockSize(), blockSize);
- byte headerB[] = new byte[DataBlockHeaderImpl.getDataStartOffset()];
+ byte[] headerB = new byte[DataBlockHeaderImpl.getDataStartOffset()];
ByteStreams.readFully(inputStream, headerB);
StreamingDataBlockHeaderImpl headerRead = StreamingDataBlockHeaderImpl
.fromStream(new ByteArrayInputStream(headerB));
@@ -76,9 +77,9 @@ public class BufferedOffloadStreamTest {
int left = blockSize - DataBlockHeaderImpl.getDataStartOffset();
for (int i = 0; i < entryCount; i++) {
- byte lengthBuf[] = new byte[4];
- byte entryIdBuf[] = new byte[8];
- byte content[] = new byte[entries.get(i).getLength()];
+ byte[] lengthBuf = new byte[4];
+ byte[] entryIdBuf = new byte[8];
+ byte[] content = new byte[entries.get(i).getLength()];
left -= lengthBuf.length + entryIdBuf.length + content.length;
inputStream.read(lengthBuf);
@@ -88,8 +89,8 @@ public class BufferedOffloadStreamTest {
assertEquals(i, Longs.fromByteArray(entryIdBuf));
assertEquals(entries.get(i).getData(), content);
}
- assertEquals(left, paddingLen);
- byte padding[] = new byte[left];
+ Assert.assertEquals(left, paddingLen);
+ byte[] padding = new byte[left];
inputStream.read(padding);
ByteBuf paddingBuf = Unpooled.wrappedBuffer(padding);
@@ -102,7 +103,6 @@ public class BufferedOffloadStreamTest {
assertEquals(inputStream.read(), -1);
assertEquals(inputStream.read(), -1);
inputStream.close();
-
}
@Test
@@ -148,9 +148,9 @@ public class BufferedOffloadStreamTest {
final BufferedOffloadStream inputStream = new
BufferedOffloadStream(blockSize, entryBuffer,
segmentInfo.beginLedgerId,
segmentInfo.beginEntryId);
- assertEquals(inputStream.getLedgerId(), 0);
- assertEquals(inputStream.getBeginEntryId(), 0);
- assertEquals(inputStream.getBlockSize(), blockSize);
+ Assert.assertEquals(inputStream.getLedgerId(), 0);
+ Assert.assertEquals(inputStream.getBeginEntryId(), 0);
+ Assert.assertEquals(inputStream.getBlockSize(), blockSize);
byte headerB[] = new byte[DataBlockHeaderImpl.getDataStartOffset()];
ByteStreams.readFully(inputStream, headerB);
@@ -161,9 +161,9 @@ public class BufferedOffloadStreamTest {
int left = blockSize - DataBlockHeaderImpl.getDataStartOffset();
for (int i = 0; i < entryCount; i++) {
- byte lengthBuf[] = new byte[4];
- byte entryIdBuf[] = new byte[8];
- byte content[] = new byte[entries.get(i).getLength()];
+ byte[] lengthBuf = new byte[4];
+ byte[] entryIdBuf = new byte[8];
+ byte[] content = new byte[entries.get(i).getLength()];
left -= lengthBuf.length + entryIdBuf.length + content.length;
inputStream.read(lengthBuf);
@@ -173,8 +173,8 @@ public class BufferedOffloadStreamTest {
assertEquals(i, Longs.fromByteArray(entryIdBuf));
assertEquals(entries.get(i).getData(), content);
}
- assertEquals(left, paddingLen);
- byte padding[] = new byte[left];
+ Assert.assertEquals(left, paddingLen);
+ byte[] padding = new byte[left];
inputStream.read(padding);
ByteBuf paddingBuf = Unpooled.wrappedBuffer(padding);
@@ -188,6 +188,6 @@ public class BufferedOffloadStreamTest {
assertEquals(inputStream.read(), -1);
inputStream.close();
- assertEquals(entryBuffer.size(), 1);
+ Assert.assertEquals(entryBuffer.size(), 1);
}
}
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
index d793d26..917700a 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderTest.java
@@ -56,7 +56,7 @@ public class DataBlockHeaderTest {
assertEquals(stream.read(), -1);
stream.reset();
- byte streamContent[] = new
byte[DataBlockHeaderImpl.getDataStartOffset()];
+ byte[] streamContent = new
byte[DataBlockHeaderImpl.getDataStartOffset()];
// stream with all 0, simulate junk data, should throw exception for
header magic not match.
try(InputStream stream2 = new ByteArrayInputStream(streamContent, 0,
DataBlockHeaderImpl.getDataStartOffset())) {
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
index c881cea..5233933 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/DataBlockHeaderV2Test.java
@@ -58,7 +58,7 @@ public class DataBlockHeaderV2Test {
assertEquals(stream.read(), -1);
stream.reset();
- byte streamContent[] = new
byte[StreamingDataBlockHeaderImpl.getDataStartOffset()];
+ byte[] streamContent = new
byte[StreamingDataBlockHeaderImpl.getDataStartOffset()];
// stream with all 0, simulate junk data, should throw exception for
header magic not match.
try (InputStream stream2 = new ByteArrayInputStream(streamContent, 0,
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
index fc43376..f556752 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/MockManagedLedger.java
@@ -43,12 +43,12 @@ public class MockManagedLedger implements ManagedLedger {
}
@Override
- public Position addEntry(byte[] data) throws InterruptedException,
ManagedLedgerException {
+ public Position addEntry(byte[] data) {
return null;
}
@Override
- public Position addEntry(byte[] data, int numberOfMessages) throws
InterruptedException, ManagedLedgerException {
+ public Position addEntry(byte[] data, int numberOfMessages) {
return null;
}
@@ -58,7 +58,7 @@ public class MockManagedLedger implements ManagedLedger {
}
@Override
- public Position addEntry(byte[] data, int offset, int length) throws
InterruptedException, ManagedLedgerException {
+ public Position addEntry(byte[] data, int offset, int length) {
return null;
}
diff --git
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
index c45f09e..f80f3ce 100644
---
a/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
+++
b/tiered-storage/jcloud/src/test/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/TieredStorageConfigurationTests.java
@@ -47,7 +47,7 @@ public class TieredStorageConfigurationTests {
*/
@Test
public final void awsS3KeysTest() {
- Map<String, String> map = new HashMap<String,String>();
+ Map<String, String> map = new HashMap<>();
map.put(TieredStorageConfiguration.BLOB_STORE_PROVIDER_KEY,
JCloudBlobStoreProvider.AWS_S3.getDriver());
TieredStorageConfiguration config = new
TieredStorageConfiguration(map);
List<String> keys =
config.getKeys(TieredStorageConfiguration.METADATA_FIELD_BUCKET);
@@ -76,7 +76,7 @@ public class TieredStorageConfigurationTests {
*/
@Test
public final void awsS3PropertiesTest() {
- Map<String, String> map = new HashMap<String,String>();
+ Map<String, String> map = new HashMap<>();
map.put(TieredStorageConfiguration.BLOB_STORE_PROVIDER_KEY,
JCloudBlobStoreProvider.AWS_S3.getDriver());
map.put("managedLedgerOffloadRegion", "us-east-1");
map.put("managedLedgerOffloadBucket", "test bucket");
@@ -147,7 +147,7 @@ public class TieredStorageConfigurationTests {
*/
@Test
public final void gcsKeysTest() {
- Map<String, String> map = new HashMap<String,String>();
+ Map<String, String> map = new HashMap<>();
map.put(TieredStorageConfiguration.BLOB_STORE_PROVIDER_KEY,
JCloudBlobStoreProvider.GOOGLE_CLOUD_STORAGE.getDriver());
TieredStorageConfiguration config = new
TieredStorageConfiguration(map);
List<String> keys =
config.getKeys(TieredStorageConfiguration.METADATA_FIELD_BUCKET);
@@ -172,7 +172,7 @@ public class TieredStorageConfigurationTests {
*/
@Test
public final void gcsPropertiesTest() {
- Map<String, String> map = new HashMap<String,String>();
+ Map<String, String> map = new HashMap<>();
map.put(TieredStorageConfiguration.BLOB_STORE_PROVIDER_KEY,
JCloudBlobStoreProvider.GOOGLE_CLOUD_STORAGE.getDriver());
map.put("managedLedgerOffloadRegion", "us-east-1");
map.put("managedLedgerOffloadBucket", "test bucket");
@@ -192,7 +192,7 @@ public class TieredStorageConfigurationTests {
*/
@Test
public final void gcsBackwardCompatiblePropertiesTest() {
- Map<String, String> map = new HashMap<String,String>();
+ Map<String, String> map = new HashMap<>();
map.put(TieredStorageConfiguration.BLOB_STORE_PROVIDER_KEY,
JCloudBlobStoreProvider.GOOGLE_CLOUD_STORAGE.getDriver());
map.put(BC_GCS_BUCKET, "test bucket");
map.put(BC_GCS_MAX_BLOCK_SIZE, "12");
