This is an automated email from the ASF dual-hosted git repository.
jgus pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0538f15 KAFKA-5772 Improve Util classes (#3370)
0538f15 is described below
commit 0538f15ac36358937eb7a3167ea99f7a668797e0
Author: Matthias Wessendorf <[email protected]>
AuthorDate: Fri Dec 22 20:41:21 2017 +0100
KAFKA-5772 Improve Util classes (#3370)
Utils with static methods should not be instantiated, hence marking the
classes `final` and adding a `private` constructor.
Reviewers: Randall Hauch <[email protected]>, Jason Gustafson
<[email protected]>
---
clients/src/main/java/org/apache/kafka/clients/ClientUtils.java | 4 +++-
.../src/main/java/org/apache/kafka/clients/NetworkClientUtils.java | 4 +++-
.../src/main/java/org/apache/kafka/common/requests/RequestUtils.java | 4 +++-
.../src/main/java/org/apache/kafka/common/security/JaasUtils.java | 4 +++-
.../org/apache/kafka/common/security/scram/ScramCredentialUtils.java | 4 +++-
.../src/main/java/org/apache/kafka/common/utils/CollectionUtils.java | 5 ++++-
clients/src/main/java/org/apache/kafka/common/utils/Utils.java | 4 +++-
7 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
index 2a9b763..fba220c 100644
--- a/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
+++ b/clients/src/main/java/org/apache/kafka/clients/ClientUtils.java
@@ -35,9 +35,11 @@ import java.util.concurrent.atomic.AtomicReference;
import static org.apache.kafka.common.utils.Utils.getHost;
import static org.apache.kafka.common.utils.Utils.getPort;
-public class ClientUtils {
+public final class ClientUtils {
private static final Logger log =
LoggerFactory.getLogger(ClientUtils.class);
+ private ClientUtils() {}
+
public static List<InetSocketAddress>
parseAndValidateAddresses(List<String> urls) {
List<InetSocketAddress> addresses = new ArrayList<>();
for (String url : urls) {
diff --git
a/clients/src/main/java/org/apache/kafka/clients/NetworkClientUtils.java
b/clients/src/main/java/org/apache/kafka/clients/NetworkClientUtils.java
index c4559a4..94fe288 100644
--- a/clients/src/main/java/org/apache/kafka/clients/NetworkClientUtils.java
+++ b/clients/src/main/java/org/apache/kafka/clients/NetworkClientUtils.java
@@ -26,7 +26,9 @@ import java.util.List;
/**
* Provides additional utilities for {@link NetworkClient} (e.g. to implement
blocking behaviour).
*/
-public class NetworkClientUtils {
+public final class NetworkClientUtils {
+
+ private NetworkClientUtils() {}
/**
* Checks whether the node is currently connected, first calling
`client.poll` to ensure that any pending
diff --git
a/clients/src/main/java/org/apache/kafka/common/requests/RequestUtils.java
b/clients/src/main/java/org/apache/kafka/common/requests/RequestUtils.java
index 103246c..a1c27b7 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/RequestUtils.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/RequestUtils.java
@@ -35,7 +35,9 @@ import static
org.apache.kafka.common.protocol.CommonFields.RESOURCE_NAME;
import static
org.apache.kafka.common.protocol.CommonFields.RESOURCE_NAME_FILTER;
import static org.apache.kafka.common.protocol.CommonFields.RESOURCE_TYPE;
-class RequestUtils {
+final class RequestUtils {
+
+ private RequestUtils() {}
static Resource resourceFromStructFields(Struct struct) {
byte resourceType = struct.get(RESOURCE_TYPE);
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java
b/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java
index 08f41c3..c2e7fbd 100644
--- a/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java
+++ b/clients/src/main/java/org/apache/kafka/common/security/JaasUtils.java
@@ -22,7 +22,7 @@ import org.apache.kafka.common.KafkaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class JaasUtils {
+public final class JaasUtils {
private static final Logger LOG = LoggerFactory.getLogger(JaasUtils.class);
public static final String JAVA_LOGIN_CONFIG_PARAM =
"java.security.auth.login.config";
@@ -31,6 +31,8 @@ public class JaasUtils {
public static final String ZK_SASL_CLIENT = "zookeeper.sasl.client";
public static final String ZK_LOGIN_CONTEXT_NAME_KEY =
"zookeeper.sasl.clientconfig";
+ private JaasUtils() {}
+
public static boolean isZkSecurityEnabled() {
boolean zkSaslEnabled =
Boolean.parseBoolean(System.getProperty(ZK_SASL_CLIENT, "true"));
String zkLoginContextName =
System.getProperty(ZK_LOGIN_CONTEXT_NAME_KEY, "Client");
diff --git
a/clients/src/main/java/org/apache/kafka/common/security/scram/ScramCredentialUtils.java
b/clients/src/main/java/org/apache/kafka/common/security/scram/ScramCredentialUtils.java
index 55b0651..8d80542 100644
---
a/clients/src/main/java/org/apache/kafka/common/security/scram/ScramCredentialUtils.java
+++
b/clients/src/main/java/org/apache/kafka/common/security/scram/ScramCredentialUtils.java
@@ -31,12 +31,14 @@ import org.apache.kafka.common.utils.Base64;
* </pre>
*
*/
-public class ScramCredentialUtils {
+public final class ScramCredentialUtils {
private static final String SALT = "salt";
private static final String STORED_KEY = "stored_key";
private static final String SERVER_KEY = "server_key";
private static final String ITERATIONS = "iterations";
+ private ScramCredentialUtils() {}
+
public static String credentialToString(ScramCredential credential) {
return String.format("%s=%s,%s=%s,%s=%s,%s=%d",
SALT,
diff --git
a/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java
b/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java
index d7ab4e0..dd4b46a 100644
--- a/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/CollectionUtils.java
@@ -23,7 +23,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class CollectionUtils {
+public final class CollectionUtils {
+
+ private CollectionUtils() {}
+
/**
* group data by topic
* @param data Data to be partitioned
diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
index 2843f3e..8d8f118 100755
--- a/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
+++ b/clients/src/main/java/org/apache/kafka/common/utils/Utils.java
@@ -59,7 +59,9 @@ import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-public class Utils {
+public final class Utils {
+
+ private Utils() {}
// This matches URIs of formats: host:port and protocol:\\host:port
// IPv6 is supported with [ip] pattern
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
