Fixed checkstyle

pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdMetadataStore.java

@@ -52,7 +52,6 @@
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.metadata.api.GetResult;
@@ -69,10 +68,6 @@
 import org.apache.pulsar.metadata.impl.batching.OpGet;
 import org.apache.pulsar.metadata.impl.batching.OpGetChildren;
 import org.apache.pulsar.metadata.impl.batching.OpPut;
-import org.apache.zookeeper.AddWatchMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
 
 @Slf4j
 public class EtcdMetadataStore extends AbstractBatchedMetadataStore {
@@ -330,11 +325,12 @@ protected void batchOperation(List<MetadataOp> ops) {
                 if (ops.size() > 1 && cause instanceof StatusRuntimeException) {
                     Status.Code code = ((StatusRuntimeException) cause).getStatus().getCode();
                     if (
-                        // This could be caused by having repeated keys in the batch, retry individually
-                            code == Status.Code.INVALID_ARGUMENT ||
-
-                                    // We might have exceeded the max-frame size for the respons
-                                    code == Status.Code.RESOURCE_EXHAUSTED
+                            code == Status.Code.INVALID_ARGUMENT /* This could be caused by having repeated keys
+                                    in the batch, retry individually */
+                                    ||
+                                    code
+                                            == Status.Code.RESOURCE_EXHAUSTED /* We might have exceeded the max-frame
+                                             size for the response */
                     ) {
                         ops.forEach(o -> batchOperation(Collections.singletonList(o)));
                     }

pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/EtcdSessionWatcher.java

@@ -35,7 +35,7 @@
 import org.apache.pulsar.metadata.api.extended.SessionEvent;
 
 /**
- * Monitor the ETCd session state every few seconds and send notifications
+ * Monitor the ETCd session state every few seconds and send notifications.
  */
 @Slf4j
 public class EtcdSessionWatcher implements AutoCloseable {

pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/MetadataStoreFactoryImpl.java

@@ -48,10 +48,9 @@ private static MetadataStore newInstance(String metadataURL, MetadataStoreConfig
 
         if (metadataURL.startsWith("memory://")) {
             return new LocalMemoryMetadataStore(metadataURL, metadataStoreConfig);
-        }
-        if (metadataURL.startsWith("rocksdb://")) {
+        } else if (metadataURL.startsWith("rocksdb://")) {
             return RocksdbMetadataStore.get(metadataURL, metadataStoreConfig);
-        } if (metadataURL.startsWith(EtcdMetadataStore.ETCD_SCHEME_IDENTIFIER)) {
+        } else if (metadataURL.startsWith(EtcdMetadataStore.ETCD_SCHEME_IDENTIFIER)) {
             return new EtcdMetadataStore(metadataURL, metadataStoreConfig, enableSessionWatcher);
         } else {
             return new ZKMetadataStore(metadataURL, metadataStoreConfig, enableSessionWatcher);

pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java

@@ -21,7 +21,6 @@
 import static org.testng.Assert.assertTrue;
 import io.etcd.jetcd.launcher.EtcdCluster;
 import io.etcd.jetcd.launcher.EtcdClusterFactory;
-import io.etcd.jetcd.test.EtcdClusterExtension;
 import java.io.File;
 import java.util.UUID;
 import java.util.concurrent.CompletionException;