This is an automated email from the ASF dual-hosted git repository.
chia7712 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 61e63f12635 KAFKA-19822 Remove all unused static classes in Field
(#20799)
61e63f12635 is described below
commit 61e63f12635ad6ff50c5a4e54d51d725ae82d11a
Author: Lan Ding <[email protected]>
AuthorDate: Thu Nov 6 03:15:23 2025 +0800
KAFKA-19822 Remove all unused static classes in Field (#20799)
Remove all unused static classes in `Field`.
Reviewers: Chia-Ping Tsai <[email protected]>
---
.../apache/kafka/common/protocol/types/Field.java | 134 ---------
.../apache/kafka/common/protocol/types/Struct.java | 318 ---------------------
.../kafka/common/protocol/types/StructTest.java | 20 +-
3 files changed, 10 insertions(+), 462 deletions(-)
diff --git
a/clients/src/main/java/org/apache/kafka/common/protocol/types/Field.java
b/clients/src/main/java/org/apache/kafka/common/protocol/types/Field.java
index f030387b6fc..1c8d00ad6f2 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Field.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Field.java
@@ -46,115 +46,6 @@ public class Field {
this(name, type, null, false, null);
}
- public static class Int8 extends Field {
- public Int8(String name, String docString) {
- super(name, Type.INT8, docString, false, null);
- }
- public Int8(String name, String docString, byte defaultValue) {
- super(name, Type.INT8, docString, true, defaultValue);
- }
- }
-
- public static class Int32 extends Field {
- public Int32(String name, String docString) {
- super(name, Type.INT32, docString, false, null);
- }
-
- public Int32(String name, String docString, int defaultValue) {
- super(name, Type.INT32, docString, true, defaultValue);
- }
- }
-
- public static class Int64 extends Field {
- public Int64(String name, String docString) {
- super(name, Type.INT64, docString, false, null);
- }
-
- public Int64(String name, String docString, long defaultValue) {
- super(name, Type.INT64, docString, true, defaultValue);
- }
- }
-
- public static class UUID extends Field {
- public UUID(String name, String docString) {
- super(name, Type.UUID, docString, false, null);
- }
-
- public UUID(String name, String docString, UUID defaultValue) {
- super(name, Type.UUID, docString, true, defaultValue);
- }
- }
-
- public static class Int16 extends Field {
- public Int16(String name, String docString) {
- super(name, Type.INT16, docString, false, null);
- }
- }
-
- public static class Uint16 extends Field {
- public Uint16(String name, String docString) {
- super(name, Type.UINT16, docString, false, null);
- }
- }
-
- public static class Uint32 extends Field {
- public Uint32(String name, String docString) {
- super(name, Type.UNSIGNED_INT32, docString, false, null);
- }
- }
-
- public static class Float64 extends Field {
- public Float64(String name, String docString) {
- super(name, Type.FLOAT64, docString, false, null);
- }
-
- public Float64(String name, String docString, double defaultValue) {
- super(name, Type.FLOAT64, docString, true, defaultValue);
- }
- }
-
- public static class Str extends Field {
- public Str(String name, String docString) {
- super(name, Type.STRING, docString, false, null);
- }
- }
-
- public static class CompactStr extends Field {
- public CompactStr(String name, String docString) {
- super(name, Type.COMPACT_STRING, docString, false, null);
- }
- }
-
- public static class NullableStr extends Field {
- public NullableStr(String name, String docString) {
- super(name, Type.NULLABLE_STRING, docString, false, null);
- }
- }
-
- public static class CompactNullableStr extends Field {
- public CompactNullableStr(String name, String docString) {
- super(name, Type.COMPACT_NULLABLE_STRING, docString, false, null);
- }
- }
-
- public static class Bool extends Field {
- public Bool(String name, String docString) {
- super(name, Type.BOOLEAN, docString, false, null);
- }
- }
-
- public static class Array extends Field {
- public Array(String name, Type elementType, String docString) {
- super(name, new ArrayOf(elementType), docString, false, null);
- }
- }
-
- public static class CompactArray extends Field {
- public CompactArray(String name, Type elementType, String docString) {
- super(name, new CompactArrayOf(elementType), docString, false,
null);
- }
- }
-
public static class TaggedFieldsSection extends Field {
private static final String NAME = "_tagged_fields";
private static final String DOC_STRING = "The tagged fields";
@@ -174,29 +65,4 @@ public class Field {
super(NAME, type, DOC_STRING, false, null);
}
}
-
- public static class ComplexArray {
- public final String name;
- public final String docString;
-
- public ComplexArray(String name, String docString) {
- this.name = name;
- this.docString = docString;
- }
-
- public Field withFields(Field... fields) {
- Schema elementType = new Schema(fields);
- return new Field(name, new ArrayOf(elementType), docString, false,
null);
- }
-
- public Field nullableWithFields(Field... fields) {
- Schema elementType = new Schema(fields);
- return new Field(name, ArrayOf.nullable(elementType), docString,
false, null);
- }
-
- public Field withFields(String docStringOverride, Field... fields) {
- Schema elementType = new Schema(fields);
- return new Field(name, new ArrayOf(elementType),
docStringOverride, false, null);
- }
- }
}
diff --git
a/clients/src/main/java/org/apache/kafka/common/protocol/types/Struct.java
b/clients/src/main/java/org/apache/kafka/common/protocol/types/Struct.java
index e39a84137bc..c75c2209292 100644
--- a/clients/src/main/java/org/apache/kafka/common/protocol/types/Struct.java
+++ b/clients/src/main/java/org/apache/kafka/common/protocol/types/Struct.java
@@ -16,16 +16,10 @@
*/
package org.apache.kafka.common.protocol.types;
-import org.apache.kafka.common.Uuid;
-import org.apache.kafka.common.record.BaseRecords;
-
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Objects;
-import static org.apache.kafka.common.protocol.MessageUtil.UNSIGNED_INT_MAX;
-import static org.apache.kafka.common.protocol.MessageUtil.UNSIGNED_SHORT_MAX;
-
/**
* A record that can be serialized and deserialized according to a pre-defined
schema
*/
@@ -80,124 +74,6 @@ public class Struct {
return getFieldOrDefault(field);
}
- public Byte get(Field.Int8 field) {
- return getByte(field.name);
- }
-
- public Integer get(Field.Int32 field) {
- return getInt(field.name);
- }
-
- public Long get(Field.Int64 field) {
- return getLong(field.name);
- }
-
- public Uuid get(Field.UUID field) {
- return getUuid(field.name);
- }
-
- public Integer get(Field.Uint16 field) {
- return getInt(field.name);
- }
-
- public Long get(Field.Uint32 field) {
- return getLong(field.name);
- }
-
- public Short get(Field.Int16 field) {
- return getShort(field.name);
- }
-
- public Double get(Field.Float64 field) {
- return getDouble(field.name);
- }
-
- public String get(Field.Str field) {
- return getString(field.name);
- }
-
- public String get(Field.NullableStr field) {
- return getString(field.name);
- }
-
- public Boolean get(Field.Bool field) {
- return getBoolean(field.name);
- }
-
- public Object[] get(Field.Array field) {
- return getArray(field.name);
- }
-
- public Object[] get(Field.ComplexArray field) {
- return getArray(field.name);
- }
-
- public Long getOrElse(Field.Int64 field, long alternative) {
- if (hasField(field.name))
- return getLong(field.name);
- return alternative;
- }
-
- public Uuid getOrElse(Field.UUID field, Uuid alternative) {
- if (hasField(field.name))
- return getUuid(field.name);
- return alternative;
- }
-
- public Short getOrElse(Field.Int16 field, short alternative) {
- if (hasField(field.name))
- return getShort(field.name);
- return alternative;
- }
-
- public Byte getOrElse(Field.Int8 field, byte alternative) {
- if (hasField(field.name))
- return getByte(field.name);
- return alternative;
- }
-
- public Integer getOrElse(Field.Int32 field, int alternative) {
- if (hasField(field.name))
- return getInt(field.name);
- return alternative;
- }
-
- public Double getOrElse(Field.Float64 field, double alternative) {
- if (hasField(field.name))
- return getDouble(field.name);
- return alternative;
- }
-
- public String getOrElse(Field.NullableStr field, String alternative) {
- if (hasField(field.name))
- return getString(field.name);
- return alternative;
- }
-
- public String getOrElse(Field.Str field, String alternative) {
- if (hasField(field.name))
- return getString(field.name);
- return alternative;
- }
-
- public boolean getOrElse(Field.Bool field, boolean alternative) {
- if (hasField(field.name))
- return getBoolean(field.name);
- return alternative;
- }
-
- public Object[] getOrEmpty(Field.Array field) {
- if (hasField(field.name))
- return getArray(field.name);
- return new Object[0];
- }
-
- public Object[] getOrEmpty(Field.ComplexArray field) {
- if (hasField(field.name))
- return getArray(field.name);
- return new Object[0];
- }
-
/**
* Get the record value for the field with the given name by doing a hash
table lookup (slower!)
*
@@ -221,121 +97,26 @@ public class Struct {
return schema.get(name) != null;
}
- public boolean hasField(Field def) {
- return schema.get(def.name) != null;
- }
-
- public boolean hasField(Field.ComplexArray def) {
- return schema.get(def.name) != null;
- }
-
- public Struct getStruct(BoundField field) {
- return (Struct) get(field);
- }
-
- public Struct getStruct(String name) {
- return (Struct) get(name);
- }
-
- public Byte getByte(BoundField field) {
- return (Byte) get(field);
- }
-
- public byte getByte(String name) {
- return (Byte) get(name);
- }
-
- public BaseRecords getRecords(String name) {
- return (BaseRecords) get(name);
- }
-
- public Short getShort(BoundField field) {
- return (Short) get(field);
- }
-
public Short getShort(String name) {
return (Short) get(name);
}
- public Integer getUnsignedShort(BoundField field) {
- return (Integer) get(field);
- }
-
- public Integer getUnsignedShort(String name) {
- return (Integer) get(name);
- }
-
- public Integer getInt(BoundField field) {
- return (Integer) get(field);
- }
-
public Integer getInt(String name) {
return (Integer) get(name);
}
- public Long getUnsignedInt(String name) {
- return (Long) get(name);
- }
-
- public Long getUnsignedInt(BoundField field) {
- return (Long) get(field);
- }
-
- public Long getLong(BoundField field) {
- return (Long) get(field);
- }
-
public Long getLong(String name) {
return (Long) get(name);
}
- public Uuid getUuid(BoundField field) {
- return (Uuid) get(field);
- }
-
- public Uuid getUuid(String name) {
- return (Uuid) get(name);
- }
-
- public Double getDouble(BoundField field) {
- return (Double) get(field);
- }
-
- public Double getDouble(String name) {
- return (Double) get(name);
- }
-
- public Object[] getArray(BoundField field) {
- return (Object[]) get(field);
- }
-
public Object[] getArray(String name) {
return (Object[]) get(name);
}
- public String getString(BoundField field) {
- return (String) get(field);
- }
-
public String getString(String name) {
return (String) get(name);
}
- public Boolean getBoolean(BoundField field) {
- return (Boolean) get(field);
- }
-
- public Boolean getBoolean(String name) {
- return (Boolean) get(name);
- }
-
- public ByteBuffer getBytes(BoundField field) {
- Object result = get(field);
- if (result instanceof byte[])
- return ByteBuffer.wrap((byte[]) result);
- return (ByteBuffer) result;
- }
-
public ByteBuffer getBytes(String name) {
Object result = get(name);
if (result instanceof byte[])
@@ -343,17 +124,6 @@ public class Struct {
return (ByteBuffer) result;
}
- public byte[] getByteArray(String name) {
- Object result = get(name);
- if (result instanceof byte[])
- return (byte[]) result;
- ByteBuffer buf = (ByteBuffer) result;
- byte[] arr = new byte[buf.remaining()];
- buf.get(arr);
- buf.flip();
- return arr;
- }
-
/**
* Set the given field to the specified value
*
@@ -382,90 +152,6 @@ public class Struct {
return this;
}
- public Struct set(Field.Str def, String value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.NullableStr def, String value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Int8 def, byte value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Int32 def, int value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Int64 def, long value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.UUID def, Uuid value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Int16 def, short value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Uint16 def, int value) {
- if (value < 0 || value > UNSIGNED_SHORT_MAX) {
- throw new RuntimeException("Invalid value for unsigned short for "
+
- def.name + ": " + value);
- }
- return set(def.name, value);
- }
-
- public Struct set(Field.Uint32 def, long value) {
- if (value < 0 || value > UNSIGNED_INT_MAX) {
- throw new RuntimeException("Invalid value for unsigned int for " +
- def.name + ": " + value);
- }
- return set(def.name, value);
- }
-
- public Struct set(Field.Float64 def, double value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Bool def, boolean value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.Array def, Object[] value) {
- return set(def.name, value);
- }
-
- public Struct set(Field.ComplexArray def, Object[] value) {
- return set(def.name, value);
- }
-
- public Struct setByteArray(String name, byte[] value) {
- ByteBuffer buf = value == null ? null : ByteBuffer.wrap(value);
- return set(name, buf);
- }
-
- public Struct setIfExists(Field.Array def, Object[] value) {
- return setIfExists(def.name, value);
- }
-
- public Struct setIfExists(Field.ComplexArray def, Object[] value) {
- return setIfExists(def.name, value);
- }
-
- public Struct setIfExists(Field def, Object value) {
- return setIfExists(def.name, value);
- }
-
- public Struct setIfExists(String fieldName, Object value) {
- BoundField field = this.schema.get(fieldName);
- if (field != null)
- this.values[field.index] = value;
- return this;
- }
-
/**
* Create a struct for the schema of a container type (struct or array).
Note that for array type, this method
* assumes that the type is an array of schema and creates a struct of
that schema. Arrays of other types can't be
@@ -501,10 +187,6 @@ public class Struct {
return instance(schema.get(field.name));
}
- public Struct instance(Field.ComplexArray field) {
- return instance(schema.get(field.name));
- }
-
/**
* Empty all the values from this record
*/
diff --git
a/clients/src/test/java/org/apache/kafka/common/protocol/types/StructTest.java
b/clients/src/test/java/org/apache/kafka/common/protocol/types/StructTest.java
index e76022a40a0..ac8e18a3ff1 100644
---
a/clients/src/test/java/org/apache/kafka/common/protocol/types/StructTest.java
+++
b/clients/src/test/java/org/apache/kafka/common/protocol/types/StructTest.java
@@ -24,19 +24,19 @@ import static
org.junit.jupiter.api.Assertions.assertNotEquals;
public class StructTest {
private static final Schema FLAT_STRUCT_SCHEMA = new Schema(
- new Field.Int8("int8", ""),
- new Field.Int16("int16", ""),
- new Field.Int32("int32", ""),
- new Field.Int64("int64", ""),
- new Field.Bool("boolean", ""),
- new Field.Float64("float64", ""),
- new Field.Str("string", ""));
+ new Field("int8", Type.INT8, ""),
+ new Field("int16", Type.INT16, ""),
+ new Field("int32", Type.INT32, ""),
+ new Field("int64", Type.INT64, ""),
+ new Field("boolean", Type.BOOLEAN, ""),
+ new Field("float64", Type.FLOAT64, ""),
+ new Field("string", Type.STRING, ""));
- private static final Schema ARRAY_SCHEMA = new Schema(new
Field.Array("array", new ArrayOf(Type.INT8), ""));
+ private static final Schema ARRAY_SCHEMA = new Schema(new Field("array",
new ArrayOf(new ArrayOf(Type.INT8)), ""));
private static final Schema NESTED_CHILD_SCHEMA = new Schema(
- new Field.Int8("int8", ""));
+ new Field("int8", Type.INT8, ""));
private static final Schema NESTED_SCHEMA = new Schema(
- new Field.Array("array", ARRAY_SCHEMA, ""),
+ new Field("array", new ArrayOf(ARRAY_SCHEMA), ""),
new Field("nested", NESTED_CHILD_SCHEMA, ""));
@Test
