From 288ebd07d2a7e14726c40e6f629093121fe6c516 Mon Sep 17 00:00:00 2001 From: Mickael Maison Date: Mon, 30 Jan 2023 15:03:52 +0100 Subject: [PATCH] MINOR: Various cleanups in common utils - Remove unused methods - Cleanup syntax --- .../kafka/common/utils/CopyOnWriteMap.java | 6 ++--- .../org/apache/kafka/common/utils/Exit.java | 27 +++++-------------- .../utils/ImplicitLinkedHashCollection.java | 2 +- .../ImplicitLinkedHashMultiCollection.java | 2 +- .../kafka/common/utils/MappedIterator.java | 4 +-- .../apache/kafka/common/utils/Sanitizer.java | 3 +-- .../kafka/common/utils/SecurityUtils.java | 7 ----- .../org/apache/kafka/common/utils/Utils.java | 27 ------------------- 8 files changed, 15 insertions(+), 63 deletions(-) diff --git a/clients/src/main/java/org/apache/kafka/common/utils/CopyOnWriteMap.java b/clients/src/main/java/org/apache/kafka/common/utils/CopyOnWriteMap.java index 1a3351f7ab225..35e2d7e365545 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/CopyOnWriteMap.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/CopyOnWriteMap.java @@ -85,7 +85,7 @@ public synchronized void clear() { @Override public synchronized V put(K k, V v) { - Map copy = new HashMap(this.map); + Map copy = new HashMap<>(this.map); V prev = copy.put(k, v); this.map = Collections.unmodifiableMap(copy); return prev; @@ -93,14 +93,14 @@ public synchronized V put(K k, V v) { @Override public synchronized void putAll(Map entries) { - Map copy = new HashMap(this.map); + Map copy = new HashMap<>(this.map); copy.putAll(entries); this.map = Collections.unmodifiableMap(copy); } @Override public synchronized V remove(Object key) { - Map copy = new HashMap(this.map); + Map copy = new HashMap<>(this.map); V prev = copy.remove(key); this.map = Collections.unmodifiableMap(copy); return prev; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java index 20a7b2035ca16..896f769397238 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Exit.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Exit.java @@ -30,28 +30,15 @@ public interface ShutdownHookAdder { void addShutdownHook(String name, Runnable runnable); } - private static final Procedure DEFAULT_HALT_PROCEDURE = new Procedure() { - @Override - public void execute(int statusCode, String message) { - Runtime.getRuntime().halt(statusCode); - } - }; + private static final Procedure DEFAULT_HALT_PROCEDURE = (statusCode, message) -> Runtime.getRuntime().halt(statusCode); - private static final Procedure DEFAULT_EXIT_PROCEDURE = new Procedure() { - @Override - public void execute(int statusCode, String message) { - System.exit(statusCode); - } - }; + private static final Procedure DEFAULT_EXIT_PROCEDURE = (statusCode, message) -> System.exit(statusCode); - private static final ShutdownHookAdder DEFAULT_SHUTDOWN_HOOK_ADDER = new ShutdownHookAdder() { - @Override - public void addShutdownHook(String name, Runnable runnable) { - if (name != null) - Runtime.getRuntime().addShutdownHook(KafkaThread.nonDaemon(name, runnable)); - else - Runtime.getRuntime().addShutdownHook(new Thread(runnable)); - } + private static final ShutdownHookAdder DEFAULT_SHUTDOWN_HOOK_ADDER = (name, runnable) -> { + if (name != null) + Runtime.getRuntime().addShutdownHook(KafkaThread.nonDaemon(name, runnable)); + else + Runtime.getRuntime().addShutdownHook(new Thread(runnable)); }; private volatile static Procedure exitProcedure = DEFAULT_EXIT_PROCEDURE; diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java index ef33f5fee7dc3..193ef6c2a1888 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashCollection.java @@ -320,7 +320,7 @@ final int slot(Element[] curElements, Object e) { * @param key The element to match. * @return The match index, or INVALID_INDEX if no match was found. */ - final private int findIndexOfEqualElement(Object key) { + private int findIndexOfEqualElement(Object key) { if (key == null || size == 0) { return INVALID_INDEX; } diff --git a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java index b95b7de21673b..534bb588c1ff7 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/ImplicitLinkedHashMultiCollection.java @@ -121,7 +121,7 @@ int findElementToRemove(Object key) { */ final public List findAll(E key) { if (key == null || size() == 0) { - return Collections.emptyList(); + return Collections.emptyList(); } ArrayList results = new ArrayList<>(); int slot = slot(elements, key); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java b/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java index f6eb270c56a2d..b03610d128eba 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/MappedIterator.java @@ -32,12 +32,12 @@ public MappedIterator(Iterator underlyingIterator, Function m } @Override - public final boolean hasNext() { + public boolean hasNext() { return underlyingIterator.hasNext(); } @Override - public final T next() { + public T next() { return mapper.apply(underlyingIterator.next()); } diff --git a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java b/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java index f921590012b58..ce6812f6522cf 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/Sanitizer.java @@ -50,9 +50,8 @@ public class Sanitizer { * using URL-encoding. */ public static String sanitize(String name) { - String encoded = ""; try { - encoded = URLEncoder.encode(name, StandardCharsets.UTF_8.name()); + String encoded = URLEncoder.encode(name, StandardCharsets.UTF_8.name()); StringBuilder builder = new StringBuilder(); for (int i = 0; i < encoded.length(); i++) { char c = encoded.charAt(i); diff --git a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java index 88a4cfc592536..10c6b3bbf78fe 100644 --- a/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java +++ b/clients/src/main/java/org/apache/kafka/common/utils/SecurityUtils.java @@ -19,8 +19,6 @@ import org.apache.kafka.common.acl.AclOperation; import org.apache.kafka.common.acl.AclPermissionType; import org.apache.kafka.common.config.SecurityConfig; -import org.apache.kafka.common.resource.PatternType; -import org.apache.kafka.common.resource.ResourcePattern; import org.apache.kafka.common.resource.ResourceType; import org.apache.kafka.common.security.auth.SecurityProviderCreator; import org.apache.kafka.common.security.auth.KafkaPrincipal; @@ -171,9 +169,4 @@ public static void authorizeByResourceTypeCheckArgs(AclOperation op, "Unknown operation type"); } } - - public static boolean denyAll(ResourcePattern pattern) { - return pattern.patternType() == PatternType.LITERAL - && pattern.name().equals(ResourcePattern.WILDCARD_RESOURCE); - } } 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 9249d7f96aa20..c7128910cdee4 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 @@ -1257,15 +1257,6 @@ public static List toList(Iterator iterator, Predicate predicate) { return res; } - public static List concatListsUnmodifiable(List left, List right) { - return concatLists(left, right, Collections::unmodifiableList); - } - - public static List concatLists(List left, List right, Function, List> finisher) { - return Stream.concat(left.stream(), right.stream()) - .collect(Collectors.collectingAndThen(Collectors.toList(), finisher)); - } - public static int to32BitField(final Set bytes) { int value = 0; for (final byte b : bytes) @@ -1291,18 +1282,6 @@ public static Set from32BitField(final int intValue) { return result; } - public static Map transformMap( - Map map, - Function keyMapper, - Function valueMapper) { - return map.entrySet().stream().collect( - Collectors.toMap( - entry -> keyMapper.apply(entry.getKey()), - entry -> valueMapper.apply(entry.getValue()) - ) - ); - } - /** * A Collector that offers two kinds of convenience: * 1. You can specify the concrete type of the returned Map @@ -1454,12 +1433,6 @@ public static boolean isBlank(String str) { return str == null || str.trim().isEmpty(); } - public static Map initializeMap(Collection keys, Supplier valueSupplier) { - Map res = new HashMap<>(keys.size()); - keys.forEach(key -> res.put(key, valueSupplier.get())); - return res; - } - /** * Get an array containing all of the {@link Object#toString string representations} of a given enumerable type. * @param enumClass the enum class; may not be null