You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2018/04/27 03:54:54 UTC

[06/12] kudu git commit: java: make all enum members immutable

java: make all enum members immutable

This fixes instances of the ImmutableEnumChecker[1] error-prone check.
This should be a non-functional change.

[1] https://github.com/google/error-prone/blob/master/docs/bugpattern/ImmutableEnumChecker.md

Change-Id: Ia02dce78d6084e73ec4e5beb2e22aea2c206141d
Reviewed-on: http://gerrit.cloudera.org:8080/10195
Reviewed-by: Grant Henke <gr...@apache.org>
Tested-by: Todd Lipcon <to...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/7a2c7e3a
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/7a2c7e3a
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/7a2c7e3a

Branch: refs/heads/master
Commit: 7a2c7e3a9158994eb2f2749813fc53ea2363b694
Parents: 4969989
Author: Todd Lipcon <to...@apache.org>
Authored: Wed Apr 25 11:36:39 2018 -0700
Committer: Todd Lipcon <to...@apache.org>
Committed: Thu Apr 26 22:19:00 2018 +0000

----------------------------------------------------------------------
 .../kudu/mapreduce/tools/IntegrationTestBigLinkedList.java   | 2 +-
 java/kudu-client/src/main/java/org/apache/kudu/Type.java     | 8 ++++----
 .../main/java/org/apache/kudu/client/AsyncKuduScanner.java   | 2 +-
 .../java/org/apache/kudu/client/ExternalConsistencyMode.java | 2 +-
 .../src/main/java/org/apache/kudu/client/Negotiator.java     | 2 +-
 .../src/main/java/org/apache/kudu/client/Operation.java      | 2 +-
 .../src/main/java/org/apache/kudu/util/SecurityUtil.java     | 2 +-
 .../java/org/apache/kudu/client/TestConnectToCluster.java    | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/IntegrationTestBigLinkedList.java
----------------------------------------------------------------------
diff --git a/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/IntegrationTestBigLinkedList.java b/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/IntegrationTestBigLinkedList.java
index 08bbcb2..0de052b 100644
--- a/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/IntegrationTestBigLinkedList.java
+++ b/java/kudu-client-tools/src/main/java/org/apache/kudu/mapreduce/tools/IntegrationTestBigLinkedList.java
@@ -1075,7 +1075,7 @@ public class IntegrationTestBigLinkedList extends Configured implements Tool {
        * Schema we use when getting rows from the linked list, we only need the reference and
        * its update count.
        */
-      private static final List<String> SCAN_COLUMN_NAMES =
+      private static final ImmutableList<String> SCAN_COLUMN_NAMES =
           ImmutableList.of(COLUMN_PREV_ONE, COLUMN_PREV_TWO, COLUMN_UPDATE_COUNT, COLUMN_CLIENT);
 
       private int numUpdatesPerMapper;

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/Type.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/Type.java b/java/kudu-client/src/main/java/org/apache/kudu/Type.java
index 4173c9b..d960db9 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/Type.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/Type.java
@@ -20,9 +20,9 @@ package org.apache.kudu;
 import static org.apache.kudu.Common.DataType;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Longs;
 import com.google.common.primitives.Shorts;
@@ -51,7 +51,7 @@ public enum Type {
   UNIXTIME_MICROS(DataType.UNIXTIME_MICROS, "unixtime_micros"),
   DECIMAL(Arrays.asList(DataType.DECIMAL32, DataType.DECIMAL64, DataType.DECIMAL128), "decimal");
 
-  private final List<DataType> dataTypes;
+  private final ImmutableList<DataType> dataTypes;
   private final String name;
   private final int size;
 
@@ -61,13 +61,13 @@ public enum Type {
    * @param name string representation of the type
    */
   private Type(DataType dataType, String name) {
-    this.dataTypes = Collections.singletonList(dataType);
+    this.dataTypes = ImmutableList.of(dataType);
     this.name = name;
     this.size = getTypeSize(dataType);
   }
 
   private Type(List<DataType> dataTypes, String name) {
-    this.dataTypes = dataTypes;
+    this.dataTypes = ImmutableList.copyOf(dataTypes);
     this.name = name;
     this.size = -1;
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduScanner.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduScanner.java b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduScanner.java
index af82c2d..ceae708 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduScanner.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/AsyncKuduScanner.java
@@ -134,7 +134,7 @@ public final class AsyncKuduScanner {
      */
     READ_YOUR_WRITES(Common.ReadMode.READ_YOUR_WRITES);
 
-    private Common.ReadMode pbVersion;
+    private final Common.ReadMode pbVersion;
     ReadMode(Common.ReadMode pbVersion) {
       this.pbVersion = pbVersion;
     }

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/client/ExternalConsistencyMode.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/ExternalConsistencyMode.java b/java/kudu-client/src/main/java/org/apache/kudu/client/ExternalConsistencyMode.java
index fc2e669..75dc197 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/ExternalConsistencyMode.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/ExternalConsistencyMode.java
@@ -33,7 +33,7 @@ public enum ExternalConsistencyMode {
   CLIENT_PROPAGATED(Common.ExternalConsistencyMode.CLIENT_PROPAGATED),
   COMMIT_WAIT(Common.ExternalConsistencyMode.COMMIT_WAIT);
 
-  private Common.ExternalConsistencyMode pbVersion;
+  private final Common.ExternalConsistencyMode pbVersion;
   private ExternalConsistencyMode(Common.ExternalConsistencyMode pbVersion) {
     this.pbVersion = pbVersion;
   }

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java b/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
index 9e76165..9168031 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/Negotiator.java
@@ -92,7 +92,7 @@ public class Negotiator extends SimpleChannelUpstreamHandler {
   private static final Logger LOG = LoggerFactory.getLogger(Negotiator.class);
 
   private final SaslClientCallbackHandler SASL_CALLBACK = new SaslClientCallbackHandler();
-  private static final Set<RpcHeader.RpcFeatureFlag> SUPPORTED_RPC_FEATURES =
+  private static final ImmutableSet<RpcHeader.RpcFeatureFlag> SUPPORTED_RPC_FEATURES =
       ImmutableSet.of(
           RpcHeader.RpcFeatureFlag.APPLICATION_FEATURE_FLAGS,
           RpcHeader.RpcFeatureFlag.TLS);

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java b/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java
index b6ca888..797b197 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/client/Operation.java
@@ -74,7 +74,7 @@ public abstract class Operation extends KuduRpc<OperationResponse> {
     }
 
     /** The byte used to encode this in a RowOperationsPB */
-    private byte encodedByte;
+    private final byte encodedByte;
   }
 
   static final String METHOD = "Write";

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/main/java/org/apache/kudu/util/SecurityUtil.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/main/java/org/apache/kudu/util/SecurityUtil.java b/java/kudu-client/src/main/java/org/apache/kudu/util/SecurityUtil.java
index e4697fd..34ea70c 100644
--- a/java/kudu-client/src/main/java/org/apache/kudu/util/SecurityUtil.java
+++ b/java/kudu-client/src/main/java/org/apache/kudu/util/SecurityUtil.java
@@ -50,7 +50,7 @@ public abstract class SecurityUtil {
    * Map from the names of digest algorithms used in X509 certificates to
    * the appropriate MessageDigest implementation to use for channel-bindings.
    */
-  private static final Map<String, String> CERT_DIGEST_TO_MESSAGE_DIGEST =
+  private static final ImmutableMap<String, String> CERT_DIGEST_TO_MESSAGE_DIGEST =
       ImmutableMap.<String, String>builder()
       // RFC 5929: if the certificate's signatureAlgorithm uses a single hash
       // function, and that hash function is either MD5 [RFC1321] or SHA-1

http://git-wip-us.apache.org/repos/asf/kudu/blob/7a2c7e3a/java/kudu-client/src/test/java/org/apache/kudu/client/TestConnectToCluster.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/test/java/org/apache/kudu/client/TestConnectToCluster.java b/java/kudu-client/src/test/java/org/apache/kudu/client/TestConnectToCluster.java
index 907e987..bb94bce 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestConnectToCluster.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestConnectToCluster.java
@@ -37,7 +37,7 @@ import org.hamcrest.CoreMatchers;
 
 public class TestConnectToCluster {
 
-  private static final List<HostAndPort> MASTERS = ImmutableList.of(
+  private static final ImmutableList<HostAndPort> MASTERS = ImmutableList.of(
       HostAndPort.fromParts("0", 9000),
       HostAndPort.fromParts("1", 9000),
       HostAndPort.fromParts("2", 9000));