cleanup: Miscellaneous minor cleanup from code inspections (#57)

Author: njhill

build-env/install-etcd.sh

@@ -11,6 +11,6 @@ INSTALL_DIR="${1:-$HOME/etcd}"
 echo "Downloading etcd server ${ETCD_VERSION}"
 cd /tmp
 wget -nv https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz
-mkdir -p ${INSTALL_DIR}
-tar xzf etcd-${ETCD_VERSION}-linux-amd64.tar.gz -C ${INSTALL_DIR} --strip-components=1
+mkdir -p "${INSTALL_DIR}"
+tar xzf etcd-${ETCD_VERSION}-linux-amd64.tar.gz -C "${INSTALL_DIR}" --strip-components=1
 rm -rf etcd*.gz

cd/deploy.sh

@@ -2,10 +2,10 @@
 
 echo TRAVIS_JDK_VERSION="$TRAVIS_JDK_VERSION"
 if [ "$TRAVIS_BRANCH" = 'main' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ] && [ "$TRAVIS_JDK_VERSION" == 'openjdk8' ]; then
-	echo "deploying release to central repository"
+    echo "deploying release to central repository"
 
-	# prepare key for signing
-    openssl aes-256-cbc -K $encrypted_d363c995e9f6_key -iv $encrypted_d363c995e9f6_iv -in cd/signingkey.asc.enc -out cd/signingkey.asc -d
+    # prepare key for signing
+    openssl aes-256-cbc -K "$encrypted_d363c995e9f6_key" -iv "$encrypted_d363c995e9f6_iv" -in cd/signingkey.asc.enc -out cd/signingkey.asc -d
     gpg --fast-import cd/signingkey.asc
     shred --remove cd/signingkey.asc
 

pom.xml

@@ -28,7 +28,7 @@
    <licenses>
       <license>
          <name>The Apache License, Version 2.0</name>
-         <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+         <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
       </license>
    </licenses>
 

src/main/java/com/ibm/etcd/client/EtcdClient.java

@@ -798,7 +798,7 @@ static final class SharedScheduledExecutorService extends ForwardingExecutorServ
         implements ScheduledExecutorService {
         private final ScheduledExecutorService delegate;
 
-        public SharedScheduledExecutorService(ScheduledExecutorService delegate) {
+        SharedScheduledExecutorService(ScheduledExecutorService delegate) {
             this.delegate = delegate;
         }
         @Override

src/main/java/com/ibm/etcd/client/FluentRequest.java

@@ -74,18 +74,18 @@ public FR deadline(Deadline deadline) {
             return (FR) this;
         }
         @Override
-        final public FR backoffRetry() {
+        public final FR backoffRetry() {
             this.retryStrategy = RetryStrategy.BACKOFF;
             return (FR) this;
         }
         @Override
-        final public FR backoffRetry(Condition precondition) {
+        public final FR backoffRetry(Condition precondition) {
             this.retryStrategy = RetryStrategy.BACKOFF;
             this.precondition = precondition;
             return (FR) this;
         }
         @Override
-        final public ReqT asRequest() {
+        public final ReqT asRequest() {
             return (ReqT) builder.build();
         }
         @Override

src/main/java/com/ibm/etcd/client/GrpcClient.java

@@ -220,7 +220,7 @@ public <ReqT,R> ListenableFuture<R> call(MethodDescriptor<ReqT,R> method,
     }
 
     //TODO probably move this
-    public static interface RetryDecision<ReqT> {
+    public interface RetryDecision<ReqT> {
         boolean retry(Throwable t, ReqT request);
     }
 
@@ -385,12 +385,12 @@ public <ReqT,RespT> StreamObserver<ReqT> callStream(MethodDescriptor<ReqT,RespT>
         return new ResilientBiDiStream<>(method, respStream, responseExecutor).start();
     }
 
-    public static interface ResilientResponseObserver<ReqT,RespT> extends StreamObserver<RespT> {
+    public interface ResilientResponseObserver<ReqT,RespT> extends StreamObserver<RespT> {
         /**
          * Called once initially, and once after each {@link #onReplaced(StreamObserver)},
          * to indicate the corresponding (sub) stream is successfully established
          */
-        public void onEstablished();
+        void onEstablished();
 
         /**
          * Indicates the underlying stream failed and will be re-established. There is
@@ -403,7 +403,7 @@ public static interface ResilientResponseObserver<ReqT,RespT> extends StreamObse
          * 
          * @param newStreamRequestObserver
          */
-        public void onReplaced(StreamObserver<ReqT> newStreamRequestObserver);
+        void onReplaced(StreamObserver<ReqT> newStreamRequestObserver);
     }
 
 
@@ -438,7 +438,7 @@ final class ResilientBiDiStream<ReqT,RespT> {
          * @param respStream
          * @param responseExecutor
          */
-        public ResilientBiDiStream(MethodDescriptor<ReqT,RespT> method,
+        ResilientBiDiStream(MethodDescriptor<ReqT,RespT> method,
                 ResilientResponseObserver<ReqT,RespT> respStream,
                 Executor responseExecutor) {
             this.method = method;
@@ -680,7 +680,7 @@ public void onError(Throwable t) {
                         // delay stream retry using backoff/jitter strategy
                         ses.schedule(ResilientBiDiStream.this::refreshBackingStream,
                                 // skip attempt in rate-limited case (errCount <=1)
-                                delayAfterFailureMs(errCount <= 2 ? 2 : errCount), MILLISECONDS);
+                                delayAfterFailureMs(Math.max(errCount, 2)), MILLISECONDS);
                     }
                 } else {
                     sentCallOptions = null;

src/main/java/com/ibm/etcd/client/KeyUtils.java

@@ -21,7 +21,7 @@
 /**
  * Helper methods for manipulating ByteString keys
  */
-public class KeyUtils {
+public final class KeyUtils {
 
     private KeyUtils() {} // static only
 

src/main/java/com/ibm/etcd/client/KvStoreClient.java

@@ -24,11 +24,11 @@
 
 public interface KvStoreClient extends Closeable {
 
-    public KvClient getKvClient();
+    KvClient getKvClient();
 
-    public LeaseClient getLeaseClient();
+    LeaseClient getLeaseClient();
 
-    public LockClient getLockClient();
+    LockClient getLockClient();
 
     /**
      * Returns a singular {@link PersistentLease} bound
@@ -39,6 +39,6 @@ public interface KvStoreClient extends Closeable {
      * 
      * @return the session lease
      */
-    public PersistentLease getSessionLease();
+    PersistentLease getSessionLease();
 
 }

src/main/java/com/ibm/etcd/client/config/EtcdClusterConfig.java

@@ -355,7 +355,7 @@ public int hashCode() {
     private static final Gson gson = new Gson();
 
     private static JsonConfig deserializeJson(InputStream in) {
-        return gson.fromJson(new InputStreamReader(in, StandardCharsets.UTF_8), JsonConfig.class);
+        return gson.fromJson(new InputStreamReader(in, UTF_8), JsonConfig.class);
     }
 
     static class JsonConfig {

src/main/java/com/ibm/etcd/client/kv/EtcdKvClient.java

@@ -87,7 +87,7 @@ public FluentRangeRequest get(ByteString key) {
     }
 
     //TODO reinstate txn idempotence determination
-    private static Predicate<TxnRequest> IDEMPOTENT_TXN = txn ->
+    private static final Predicate<TxnRequest> IDEMPOTENT_TXN = txn ->
         Iterables.all(Iterables.concat(txn.getSuccessList(),txn.getFailureList()), op ->
             op.getRequestCase() == RequestCase.REQUEST_RANGE);
 
@@ -320,7 +320,7 @@ final class EtcdTxnRequest extends AbstractFluentRequest<FluentTxnRequest,TxnReq
         FluentTxnSuccOps TXN_OPS = null; // lazy instantiate
         boolean idempotent = true; // set to false when any non-idempotent ops are added
 
-        public EtcdTxnRequest() {
+        EtcdTxnRequest() {
             super(EtcdKvClient.this.client, TxnRequest.newBuilder());
         }
         @Override