From 84d18159161fac20fd476eef1d7f948206d26030 Mon Sep 17 00:00:00 2001 From: Jia-Sheng Chen Date: Fri, 26 May 2023 11:28:17 +0800 Subject: [PATCH 1/3] update pattern match for instanceof --- .../java/org/astraea/common/ByteUtils.java | 24 +++++++++---------- .../main/java/org/astraea/common/Utils.java | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/org/astraea/common/ByteUtils.java b/common/src/main/java/org/astraea/common/ByteUtils.java index 405c01f3c6..593b95c307 100644 --- a/common/src/main/java/org/astraea/common/ByteUtils.java +++ b/common/src/main/java/org/astraea/common/ByteUtils.java @@ -398,18 +398,18 @@ public Set topicPartitions() { * and "char" in Protocol Buffers. Use "int" and "String" instead. */ private static PrimitiveOuterClass.Primitive primitive(Object v) throws SerializationException { - if (v instanceof Integer) - return PrimitiveOuterClass.Primitive.newBuilder().setInt((int) v).build(); - else if (v instanceof Long) - return PrimitiveOuterClass.Primitive.newBuilder().setLong((long) v).build(); - else if (v instanceof Float) - return PrimitiveOuterClass.Primitive.newBuilder().setFloat((float) v).build(); - else if (v instanceof Double) - return PrimitiveOuterClass.Primitive.newBuilder().setDouble((double) v).build(); - else if (v instanceof Boolean) - return PrimitiveOuterClass.Primitive.newBuilder().setBoolean((boolean) v).build(); - else if (v instanceof String) - return PrimitiveOuterClass.Primitive.newBuilder().setStr(v.toString()).build(); + if (v instanceof Integer integerV) + return PrimitiveOuterClass.Primitive.newBuilder().setInt(integerV).build(); + else if (v instanceof Long longV) + return PrimitiveOuterClass.Primitive.newBuilder().setLong(longV).build(); + else if (v instanceof Float floatV) + return PrimitiveOuterClass.Primitive.newBuilder().setFloat(floatV).build(); + else if (v instanceof Double doubleV) + return PrimitiveOuterClass.Primitive.newBuilder().setDouble(doubleV).build(); + else if (v instanceof Boolean booleanV) + return PrimitiveOuterClass.Primitive.newBuilder().setBoolean(booleanV).build(); + else if (v instanceof String stringV) + return PrimitiveOuterClass.Primitive.newBuilder().setStr(stringV).build(); else throw new SerializationException( "Type " diff --git a/common/src/main/java/org/astraea/common/Utils.java b/common/src/main/java/org/astraea/common/Utils.java index 59d420b2b4..002fc3affd 100644 --- a/common/src/main/java/org/astraea/common/Utils.java +++ b/common/src/main/java/org/astraea/common/Utils.java @@ -148,8 +148,8 @@ public static R packException(Getter getter) { } public static void close(Object obj) { - if (obj instanceof AutoCloseable) { - packException(() -> ((AutoCloseable) obj).close()); + if (obj instanceof AutoCloseable autoCloseableObj) { + packException(autoCloseableObj::close); } } From a34df5722b9d68ec120410fbc1067f186d755a3d Mon Sep 17 00:00:00 2001 From: Jia-Sheng Chen Date: Fri, 26 May 2023 11:29:31 +0800 Subject: [PATCH 2/3] update to Stream.toList --- common/src/main/java/org/astraea/common/Header.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/src/main/java/org/astraea/common/Header.java b/common/src/main/java/org/astraea/common/Header.java index 0beea8ef7d..4637408afe 100644 --- a/common/src/main/java/org/astraea/common/Header.java +++ b/common/src/main/java/org/astraea/common/Header.java @@ -18,7 +18,6 @@ import java.util.List; import java.util.Spliterators; -import java.util.stream.Collectors; import java.util.stream.StreamSupport; import org.apache.kafka.common.header.Headers; @@ -29,7 +28,7 @@ public static List
of(Headers headers) { if (!iter.hasNext()) return List.of(); return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iter, 0), false) .map(h -> new Header(h.key(), h.value())) - .collect(Collectors.toUnmodifiableList()); + .toList(); } public static Header of(String key, byte[] value) { From 59835da1083f74265fb43fdbe759ae7019b15b51 Mon Sep 17 00:00:00 2001 From: Jia-Sheng Chen Date: Fri, 26 May 2023 20:39:35 +0800 Subject: [PATCH 3/3] rename the instanceof variable --- .../java/org/astraea/common/ByteUtils.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/common/src/main/java/org/astraea/common/ByteUtils.java b/common/src/main/java/org/astraea/common/ByteUtils.java index 593b95c307..577497cc2d 100644 --- a/common/src/main/java/org/astraea/common/ByteUtils.java +++ b/common/src/main/java/org/astraea/common/ByteUtils.java @@ -398,18 +398,18 @@ public Set topicPartitions() { * and "char" in Protocol Buffers. Use "int" and "String" instead. */ private static PrimitiveOuterClass.Primitive primitive(Object v) throws SerializationException { - if (v instanceof Integer integerV) - return PrimitiveOuterClass.Primitive.newBuilder().setInt(integerV).build(); - else if (v instanceof Long longV) - return PrimitiveOuterClass.Primitive.newBuilder().setLong(longV).build(); - else if (v instanceof Float floatV) - return PrimitiveOuterClass.Primitive.newBuilder().setFloat(floatV).build(); - else if (v instanceof Double doubleV) - return PrimitiveOuterClass.Primitive.newBuilder().setDouble(doubleV).build(); - else if (v instanceof Boolean booleanV) - return PrimitiveOuterClass.Primitive.newBuilder().setBoolean(booleanV).build(); - else if (v instanceof String stringV) - return PrimitiveOuterClass.Primitive.newBuilder().setStr(stringV).build(); + if (v instanceof Integer value) + return PrimitiveOuterClass.Primitive.newBuilder().setInt(value).build(); + else if (v instanceof Long value) + return PrimitiveOuterClass.Primitive.newBuilder().setLong(value).build(); + else if (v instanceof Float value) + return PrimitiveOuterClass.Primitive.newBuilder().setFloat(value).build(); + else if (v instanceof Double value) + return PrimitiveOuterClass.Primitive.newBuilder().setDouble(value).build(); + else if (v instanceof Boolean value) + return PrimitiveOuterClass.Primitive.newBuilder().setBoolean(value).build(); + else if (v instanceof String value) + return PrimitiveOuterClass.Primitive.newBuilder().setStr(value).build(); else throw new SerializationException( "Type "