From a5770508176874af47eb4e6cc981968f52e3b75d Mon Sep 17 00:00:00 2001 From: Wakahisa Date: Mon, 1 Dec 2025 18:28:50 +0200 Subject: [PATCH] [Java] Use Table's fully qualified path (#8729) * [Java] Use Table's fully qualified path When a table's name is called `Table`, the Java bindings generated result in an error due to there being 2 Tables. This fixes the issue by fully qualifyng the flatbuffers Table import. * Update codegen * Update generated Java code --------- Co-authored-by: Neville Dipale --- .../com/google/flatbuffers/reflection/Enum.java | 3 +-- .../google/flatbuffers/reflection/EnumVal.java | 3 +-- .../com/google/flatbuffers/reflection/Field.java | 3 +-- .../google/flatbuffers/reflection/KeyValue.java | 3 +-- .../com/google/flatbuffers/reflection/Object.java | 3 +-- .../google/flatbuffers/reflection/RPCCall.java | 3 +-- .../com/google/flatbuffers/reflection/Schema.java | 3 +-- .../google/flatbuffers/reflection/SchemaFile.java | 3 +-- .../google/flatbuffers/reflection/Service.java | 3 +-- .../com/google/flatbuffers/reflection/Type.java | 3 +-- src/idl_gen_java.cpp | 7 +++---- tests/DictionaryLookup/LongFloatEntry.java | 3 +-- tests/DictionaryLookup/LongFloatMap.java | 3 +-- tests/MyGame/Example/Ability.java | 1 - tests/MyGame/Example/AbilityT.java | 1 - tests/MyGame/Example/ArrayStruct.java | 1 - tests/MyGame/Example/ArrayStructT.java | 1 - tests/MyGame/Example/ArrayTable.java | 3 +-- tests/MyGame/Example/ArrayTableT.java | 1 - tests/MyGame/Example/Monster.java | 15 +++++++-------- tests/MyGame/Example/MonsterT.java | 1 - tests/MyGame/Example/NestedStruct.java | 1 - tests/MyGame/Example/NestedStructT.java | 1 - tests/MyGame/Example/Referrable.java | 3 +-- tests/MyGame/Example/ReferrableT.java | 1 - tests/MyGame/Example/Stat.java | 3 +-- tests/MyGame/Example/StatT.java | 1 - tests/MyGame/Example/StructOfStructs.java | 1 - .../MyGame/Example/StructOfStructsOfStructs.java | 1 - .../MyGame/Example/StructOfStructsOfStructsT.java | 1 - tests/MyGame/Example/StructOfStructsT.java | 1 - tests/MyGame/Example/Test.java | 1 - tests/MyGame/Example/TestSimpleTableWithEnum.java | 3 +-- .../MyGame/Example/TestSimpleTableWithEnumT.java | 1 - tests/MyGame/Example/TestT.java | 1 - tests/MyGame/Example/TypeAliases.java | 3 +-- tests/MyGame/Example/TypeAliasesT.java | 1 - tests/MyGame/Example/Vec3.java | 1 - tests/MyGame/Example/Vec3T.java | 1 - tests/MyGame/Example2/Monster.java | 3 +-- tests/MyGame/Example2/MonsterT.java | 1 - tests/MyGame/InParentNamespace.java | 3 +-- tests/MyGame/InParentNamespaceT.java | 1 - tests/MyGame/MonsterExtra.java | 3 +-- tests/MyGame/MonsterExtraT.java | 1 - tests/optional_scalars/ScalarStuff.java | 3 +-- tests/union_vector/Attacker.java | 3 +-- tests/union_vector/AttackerT.java | 1 - tests/union_vector/BookReader.java | 1 - tests/union_vector/BookReaderT.java | 1 - tests/union_vector/FallingTub.java | 1 - tests/union_vector/FallingTubT.java | 1 - tests/union_vector/HandFan.java | 3 +-- tests/union_vector/HandFanT.java | 1 - tests/union_vector/Movie.java | 11 +++++------ tests/union_vector/MovieT.java | 1 - tests/union_vector/Rapunzel.java | 1 - tests/union_vector/RapunzelT.java | 1 - 58 files changed, 38 insertions(+), 96 deletions(-) diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Enum.java b/java/src/main/java/com/google/flatbuffers/reflection/Enum.java index bb1a6ee70..6967ae696 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Enum.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Enum.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Enum extends Table { +public final class Enum extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Enum getRootAsEnum(ByteBuffer _bb) { return getRootAsEnum(_bb, new Enum()); } public static Enum getRootAsEnum(ByteBuffer _bb, Enum obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java b/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java index 53018d541..d73dbd7e7 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class EnumVal extends Table { +public final class EnumVal extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static EnumVal getRootAsEnumVal(ByteBuffer _bb) { return getRootAsEnumVal(_bb, new EnumVal()); } public static EnumVal getRootAsEnumVal(ByteBuffer _bb, EnumVal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Field.java b/java/src/main/java/com/google/flatbuffers/reflection/Field.java index aa77d2970..503e14d5b 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Field.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Field.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Field extends Table { +public final class Field extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Field getRootAsField(ByteBuffer _bb) { return getRootAsField(_bb, new Field()); } public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java b/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java index 8bc85f0b9..56fd57257 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class KeyValue extends Table { +public final class KeyValue extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static KeyValue getRootAsKeyValue(ByteBuffer _bb) { return getRootAsKeyValue(_bb, new KeyValue()); } public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Object.java b/java/src/main/java/com/google/flatbuffers/reflection/Object.java index 74285c96e..d90a79b31 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Object.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Object.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Object extends Table { +public final class Object extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Object getRootAsObject(ByteBuffer _bb) { return getRootAsObject(_bb, new Object()); } public static Object getRootAsObject(ByteBuffer _bb, Object obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java b/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java index 20bc72b7c..7656d28b0 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class RPCCall extends Table { +public final class RPCCall extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static RPCCall getRootAsRPCCall(ByteBuffer _bb) { return getRootAsRPCCall(_bb, new RPCCall()); } public static RPCCall getRootAsRPCCall(ByteBuffer _bb, RPCCall obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Schema.java b/java/src/main/java/com/google/flatbuffers/reflection/Schema.java index 7b35ed105..81a6d9cb2 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Schema.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Schema.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Schema extends Table { +public final class Schema extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Schema getRootAsSchema(ByteBuffer _bb) { return getRootAsSchema(_bb, new Schema()); } public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java b/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java index f0c13a1bb..203119b31 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -25,7 +24,7 @@ import java.nio.ByteOrder; * symbols and examining the `declaration_file` field. */ @SuppressWarnings("unused") -public final class SchemaFile extends Table { +public final class SchemaFile extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static SchemaFile getRootAsSchemaFile(ByteBuffer _bb) { return getRootAsSchemaFile(_bb, new SchemaFile()); } public static SchemaFile getRootAsSchemaFile(ByteBuffer _bb, SchemaFile obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Service.java b/java/src/main/java/com/google/flatbuffers/reflection/Service.java index 30267ba13..20063de33 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Service.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Service.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Service extends Table { +public final class Service extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Service getRootAsService(ByteBuffer _bb) { return getRootAsService(_bb, new Service()); } public static Service getRootAsService(ByteBuffer _bb, Service obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/java/src/main/java/com/google/flatbuffers/reflection/Type.java b/java/src/main/java/com/google/flatbuffers/reflection/Type.java index 0be0651cd..8aa361a26 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Type.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Type.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Type extends Table { +public final class Type extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Type getRootAsType(ByteBuffer _bb) { return getRootAsType(_bb, new Type()); } public static Type getRootAsType(ByteBuffer _bb, Type obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/src/idl_gen_java.cpp b/src/idl_gen_java.cpp index 418d2875c..143a361b3 100644 --- a/src/idl_gen_java.cpp +++ b/src/idl_gen_java.cpp @@ -207,7 +207,6 @@ class JavaGenerator : public BaseGenerator { "import com.google.flatbuffers.ShortVector;\n" "import com.google.flatbuffers.StringVector;\n" "import com.google.flatbuffers.Struct;\n" - "import com.google.flatbuffers.Table;\n" "import com.google.flatbuffers.UnionVector;\n" "import java.nio.ByteBuffer;\n" "import java.nio.ByteOrder;\n"; @@ -269,7 +268,7 @@ class JavaGenerator : public BaseGenerator { case BASE_TYPE_UNION: FLATBUFFERS_FALLTHROUGH(); // else fall thru default: - return "Table"; + return "com.google.flatbuffers.Table"; } } @@ -718,7 +717,7 @@ class JavaGenerator : public BaseGenerator { const auto struct_class = namer_.Type(struct_def); code += "final class " + struct_class; code += " extends "; - code += struct_def.fixed ? "Struct" : "Table"; + code += struct_def.fixed ? "Struct" : "com.google.flatbuffers.Table"; code += " {\n"; if (!struct_def.fixed) { @@ -1469,7 +1468,7 @@ class JavaGenerator : public BaseGenerator { " " + variable_name + "Type = " + field_name + "Type(" + type_params + ");\n"; code += indent + variable_name + ".setType(" + variable_name + "Type);\n"; - code += indent + "Table " + variable_name + "Value;\n"; + code += indent + "com.google.flatbuffers.Table " + variable_name + "Value;\n"; code += indent + "switch (" + variable_name + "Type) {\n"; for (auto eit = enum_def.Vals().begin(); eit != enum_def.Vals().end(); ++eit) { diff --git a/tests/DictionaryLookup/LongFloatEntry.java b/tests/DictionaryLookup/LongFloatEntry.java index 54c667156..cf9f6658a 100644 --- a/tests/DictionaryLookup/LongFloatEntry.java +++ b/tests/DictionaryLookup/LongFloatEntry.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class LongFloatEntry extends Table { +public final class LongFloatEntry extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static LongFloatEntry getRootAsLongFloatEntry(ByteBuffer _bb) { return getRootAsLongFloatEntry(_bb, new LongFloatEntry()); } public static LongFloatEntry getRootAsLongFloatEntry(ByteBuffer _bb, LongFloatEntry obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/DictionaryLookup/LongFloatMap.java b/tests/DictionaryLookup/LongFloatMap.java index de7d42b8a..a0ebbb532 100644 --- a/tests/DictionaryLookup/LongFloatMap.java +++ b/tests/DictionaryLookup/LongFloatMap.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class LongFloatMap extends Table { +public final class LongFloatMap extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static LongFloatMap getRootAsLongFloatMap(ByteBuffer _bb) { return getRootAsLongFloatMap(_bb, new LongFloatMap()); } public static LongFloatMap getRootAsLongFloatMap(ByteBuffer _bb, LongFloatMap obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/Ability.java b/tests/MyGame/Example/Ability.java index 8b8c38f11..efd8f5e5c 100644 --- a/tests/MyGame/Example/Ability.java +++ b/tests/MyGame/Example/Ability.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/AbilityT.java b/tests/MyGame/Example/AbilityT.java index 73c236224..1da0dde51 100644 --- a/tests/MyGame/Example/AbilityT.java +++ b/tests/MyGame/Example/AbilityT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/ArrayStruct.java b/tests/MyGame/Example/ArrayStruct.java index b859560bd..c72ee8338 100644 --- a/tests/MyGame/Example/ArrayStruct.java +++ b/tests/MyGame/Example/ArrayStruct.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/ArrayStructT.java b/tests/MyGame/Example/ArrayStructT.java index 99922be98..96d3ebf92 100644 --- a/tests/MyGame/Example/ArrayStructT.java +++ b/tests/MyGame/Example/ArrayStructT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/ArrayTable.java b/tests/MyGame/Example/ArrayTable.java index a49c3bdcc..400d9cd08 100644 --- a/tests/MyGame/Example/ArrayTable.java +++ b/tests/MyGame/Example/ArrayTable.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class ArrayTable extends Table { +public final class ArrayTable extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static ArrayTable getRootAsArrayTable(ByteBuffer _bb) { return getRootAsArrayTable(_bb, new ArrayTable()); } public static ArrayTable getRootAsArrayTable(ByteBuffer _bb, ArrayTable obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/ArrayTableT.java b/tests/MyGame/Example/ArrayTableT.java index 645538148..aa6b32c64 100644 --- a/tests/MyGame/Example/ArrayTableT.java +++ b/tests/MyGame/Example/ArrayTableT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java index 8417ebcc5..d0dfb9e04 100644 --- a/tests/MyGame/Example/Monster.java +++ b/tests/MyGame/Example/Monster.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -23,7 +22,7 @@ import java.nio.ByteOrder; * an example documentation comment: "monster object" */ @SuppressWarnings("unused") -public final class Monster extends Table { +public final class Monster extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Monster getRootAsMonster(ByteBuffer _bb) { return getRootAsMonster(_bb, new Monster()); } public static Monster getRootAsMonster(ByteBuffer _bb, Monster obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } @@ -50,7 +49,7 @@ public final class Monster extends Table { public int color() { int o = __offset(16); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 8; } public boolean mutateColor(int color) { int o = __offset(16); if (o != 0) { bb.put(o + bb_pos, (byte) color); return true; } else { return false; } } public byte testType() { int o = __offset(18); return o != 0 ? bb.get(o + bb_pos) : 0; } - public Table test(Table obj) { int o = __offset(20); return o != 0 ? __union(obj, o + bb_pos) : null; } + public com.google.flatbuffers.Table test(com.google.flatbuffers.Table obj) { int o = __offset(20); return o != 0 ? __union(obj, o + bb_pos) : null; } public MyGame.Example.Test test4(int j) { return test4(new MyGame.Example.Test(), j); } public MyGame.Example.Test test4(MyGame.Example.Test obj, int j) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } public int test4Length() { int o = __offset(22); return o != 0 ? __vector_len(o) : 0; } @@ -194,9 +193,9 @@ public final class Monster extends Table { public ByteBuffer vectorOfNonOwningReferencesInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 88, 8); } public boolean mutateVectorOfNonOwningReferences(int j, long vector_of_non_owning_references) { int o = __offset(88); if (o != 0) { bb.putLong(__vector(o) + j * 8, vector_of_non_owning_references); return true; } else { return false; } } public byte anyUniqueType() { int o = __offset(90); return o != 0 ? bb.get(o + bb_pos) : 0; } - public Table anyUnique(Table obj) { int o = __offset(92); return o != 0 ? __union(obj, o + bb_pos) : null; } + public com.google.flatbuffers.Table anyUnique(com.google.flatbuffers.Table obj) { int o = __offset(92); return o != 0 ? __union(obj, o + bb_pos) : null; } public byte anyAmbiguousType() { int o = __offset(94); return o != 0 ? bb.get(o + bb_pos) : 0; } - public Table anyAmbiguous(Table obj) { int o = __offset(96); return o != 0 ? __union(obj, o + bb_pos) : null; } + public com.google.flatbuffers.Table anyAmbiguous(com.google.flatbuffers.Table obj) { int o = __offset(96); return o != 0 ? __union(obj, o + bb_pos) : null; } public int vectorOfEnums(int j) { int o = __offset(98); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; } public int vectorOfEnumsLength() { int o = __offset(98); return o != 0 ? __vector_len(o) : 0; } public ByteVector vectorOfEnumsVector() { return vectorOfEnumsVector(new ByteVector()); } @@ -411,7 +410,7 @@ public final class Monster extends Table { MyGame.Example.AnyUnion _oTest = new MyGame.Example.AnyUnion(); byte _oTestType = testType(); _oTest.setType(_oTestType); - Table _oTestValue; + com.google.flatbuffers.Table _oTestValue; switch (_oTestType) { case MyGame.Example.Any.Monster: _oTestValue = test(new MyGame.Example.Monster()); @@ -515,7 +514,7 @@ public final class Monster extends Table { MyGame.Example.AnyUniqueAliasesUnion _oAnyUnique = new MyGame.Example.AnyUniqueAliasesUnion(); byte _oAnyUniqueType = anyUniqueType(); _oAnyUnique.setType(_oAnyUniqueType); - Table _oAnyUniqueValue; + com.google.flatbuffers.Table _oAnyUniqueValue; switch (_oAnyUniqueType) { case MyGame.Example.AnyUniqueAliases.M: _oAnyUniqueValue = anyUnique(new MyGame.Example.Monster()); @@ -535,7 +534,7 @@ public final class Monster extends Table { MyGame.Example.AnyAmbiguousAliasesUnion _oAnyAmbiguous = new MyGame.Example.AnyAmbiguousAliasesUnion(); byte _oAnyAmbiguousType = anyAmbiguousType(); _oAnyAmbiguous.setType(_oAnyAmbiguousType); - Table _oAnyAmbiguousValue; + com.google.flatbuffers.Table _oAnyAmbiguousValue; switch (_oAnyAmbiguousType) { case MyGame.Example.AnyAmbiguousAliases.M1: _oAnyAmbiguousValue = anyAmbiguous(new MyGame.Example.Monster()); diff --git a/tests/MyGame/Example/MonsterT.java b/tests/MyGame/Example/MonsterT.java index 622a4fa80..29e2e982b 100644 --- a/tests/MyGame/Example/MonsterT.java +++ b/tests/MyGame/Example/MonsterT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/NestedStruct.java b/tests/MyGame/Example/NestedStruct.java index 0d33f7133..e6934a545 100644 --- a/tests/MyGame/Example/NestedStruct.java +++ b/tests/MyGame/Example/NestedStruct.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/NestedStructT.java b/tests/MyGame/Example/NestedStructT.java index 396522a91..9594675de 100644 --- a/tests/MyGame/Example/NestedStructT.java +++ b/tests/MyGame/Example/NestedStructT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Referrable.java b/tests/MyGame/Example/Referrable.java index 245d2f454..e8aafe6b0 100644 --- a/tests/MyGame/Example/Referrable.java +++ b/tests/MyGame/Example/Referrable.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Referrable extends Table { +public final class Referrable extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Referrable getRootAsReferrable(ByteBuffer _bb) { return getRootAsReferrable(_bb, new Referrable()); } public static Referrable getRootAsReferrable(ByteBuffer _bb, Referrable obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/ReferrableT.java b/tests/MyGame/Example/ReferrableT.java index 5efd363f8..73757c5b6 100644 --- a/tests/MyGame/Example/ReferrableT.java +++ b/tests/MyGame/Example/ReferrableT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Stat.java b/tests/MyGame/Example/Stat.java index ae8d3da88..98076d312 100644 --- a/tests/MyGame/Example/Stat.java +++ b/tests/MyGame/Example/Stat.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Stat extends Table { +public final class Stat extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Stat getRootAsStat(ByteBuffer _bb) { return getRootAsStat(_bb, new Stat()); } public static Stat getRootAsStat(ByteBuffer _bb, Stat obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/StatT.java b/tests/MyGame/Example/StatT.java index 82939a6c6..6696b3080 100644 --- a/tests/MyGame/Example/StatT.java +++ b/tests/MyGame/Example/StatT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/StructOfStructs.java b/tests/MyGame/Example/StructOfStructs.java index befd33590..2b4c723da 100644 --- a/tests/MyGame/Example/StructOfStructs.java +++ b/tests/MyGame/Example/StructOfStructs.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/StructOfStructsOfStructs.java b/tests/MyGame/Example/StructOfStructsOfStructs.java index fb14a5a0c..dabd68525 100644 --- a/tests/MyGame/Example/StructOfStructsOfStructs.java +++ b/tests/MyGame/Example/StructOfStructsOfStructs.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/StructOfStructsOfStructsT.java b/tests/MyGame/Example/StructOfStructsOfStructsT.java index 60afd7384..cf4428ae7 100644 --- a/tests/MyGame/Example/StructOfStructsOfStructsT.java +++ b/tests/MyGame/Example/StructOfStructsOfStructsT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/StructOfStructsT.java b/tests/MyGame/Example/StructOfStructsT.java index 8d5034af5..eec5ef30e 100644 --- a/tests/MyGame/Example/StructOfStructsT.java +++ b/tests/MyGame/Example/StructOfStructsT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Test.java b/tests/MyGame/Example/Test.java index cff5a6503..0200a93bd 100644 --- a/tests/MyGame/Example/Test.java +++ b/tests/MyGame/Example/Test.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.java b/tests/MyGame/Example/TestSimpleTableWithEnum.java index f04dd6975..0a09400e3 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.java +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -final class TestSimpleTableWithEnum extends Table { +final class TestSimpleTableWithEnum extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb) { return getRootAsTestSimpleTableWithEnum(_bb, new TestSimpleTableWithEnum()); } public static TestSimpleTableWithEnum getRootAsTestSimpleTableWithEnum(ByteBuffer _bb, TestSimpleTableWithEnum obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/TestSimpleTableWithEnumT.java b/tests/MyGame/Example/TestSimpleTableWithEnumT.java index 7641550c4..ab4722654 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnumT.java +++ b/tests/MyGame/Example/TestSimpleTableWithEnumT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/TestT.java b/tests/MyGame/Example/TestT.java index 38103172b..19f19d74e 100644 --- a/tests/MyGame/Example/TestT.java +++ b/tests/MyGame/Example/TestT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/TypeAliases.java b/tests/MyGame/Example/TypeAliases.java index 5b57a5081..a97ef998d 100644 --- a/tests/MyGame/Example/TypeAliases.java +++ b/tests/MyGame/Example/TypeAliases.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class TypeAliases extends Table { +public final class TypeAliases extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static TypeAliases getRootAsTypeAliases(ByteBuffer _bb) { return getRootAsTypeAliases(_bb, new TypeAliases()); } public static TypeAliases getRootAsTypeAliases(ByteBuffer _bb, TypeAliases obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example/TypeAliasesT.java b/tests/MyGame/Example/TypeAliasesT.java index 2e056843c..90038ae67 100644 --- a/tests/MyGame/Example/TypeAliasesT.java +++ b/tests/MyGame/Example/TypeAliasesT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java index c1f2ce63c..4246e96ff 100644 --- a/tests/MyGame/Example/Vec3.java +++ b/tests/MyGame/Example/Vec3.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example/Vec3T.java b/tests/MyGame/Example/Vec3T.java index 78fb1dd77..41bff348b 100644 --- a/tests/MyGame/Example/Vec3T.java +++ b/tests/MyGame/Example/Vec3T.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/Example2/Monster.java b/tests/MyGame/Example2/Monster.java index 860f23e5b..5ce1dfe73 100644 --- a/tests/MyGame/Example2/Monster.java +++ b/tests/MyGame/Example2/Monster.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Monster extends Table { +public final class Monster extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Monster getRootAsMonster(ByteBuffer _bb) { return getRootAsMonster(_bb, new Monster()); } public static Monster getRootAsMonster(ByteBuffer _bb, Monster obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/Example2/MonsterT.java b/tests/MyGame/Example2/MonsterT.java index 699d6c6da..0d1471424 100644 --- a/tests/MyGame/Example2/MonsterT.java +++ b/tests/MyGame/Example2/MonsterT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/InParentNamespace.java b/tests/MyGame/InParentNamespace.java index ee2640748..52f13b025 100644 --- a/tests/MyGame/InParentNamespace.java +++ b/tests/MyGame/InParentNamespace.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class InParentNamespace extends Table { +public final class InParentNamespace extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static InParentNamespace getRootAsInParentNamespace(ByteBuffer _bb) { return getRootAsInParentNamespace(_bb, new InParentNamespace()); } public static InParentNamespace getRootAsInParentNamespace(ByteBuffer _bb, InParentNamespace obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/InParentNamespaceT.java b/tests/MyGame/InParentNamespaceT.java index 9180ce19a..c9a8c0590 100644 --- a/tests/MyGame/InParentNamespaceT.java +++ b/tests/MyGame/InParentNamespaceT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/MyGame/MonsterExtra.java b/tests/MyGame/MonsterExtra.java index 98e0ad789..5e3995386 100644 --- a/tests/MyGame/MonsterExtra.java +++ b/tests/MyGame/MonsterExtra.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class MonsterExtra extends Table { +public final class MonsterExtra extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static MonsterExtra getRootAsMonsterExtra(ByteBuffer _bb) { return getRootAsMonsterExtra(_bb, new MonsterExtra()); } public static MonsterExtra getRootAsMonsterExtra(ByteBuffer _bb, MonsterExtra obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/MyGame/MonsterExtraT.java b/tests/MyGame/MonsterExtraT.java index 8872c1ce2..b35a4093a 100644 --- a/tests/MyGame/MonsterExtraT.java +++ b/tests/MyGame/MonsterExtraT.java @@ -14,7 +14,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/optional_scalars/ScalarStuff.java b/tests/optional_scalars/ScalarStuff.java index a85882116..30b942bf9 100644 --- a/tests/optional_scalars/ScalarStuff.java +++ b/tests/optional_scalars/ScalarStuff.java @@ -14,13 +14,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class ScalarStuff extends Table { +public final class ScalarStuff extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static ScalarStuff getRootAsScalarStuff(ByteBuffer _bb) { return getRootAsScalarStuff(_bb, new ScalarStuff()); } public static ScalarStuff getRootAsScalarStuff(ByteBuffer _bb, ScalarStuff obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/union_vector/Attacker.java b/tests/union_vector/Attacker.java index 3a288e33f..75304c77c 100644 --- a/tests/union_vector/Attacker.java +++ b/tests/union_vector/Attacker.java @@ -12,13 +12,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Attacker extends Table { +public final class Attacker extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Attacker getRootAsAttacker(ByteBuffer _bb) { return getRootAsAttacker(_bb, new Attacker()); } public static Attacker getRootAsAttacker(ByteBuffer _bb, Attacker obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/union_vector/AttackerT.java b/tests/union_vector/AttackerT.java index 39e9b6757..c5f45199c 100644 --- a/tests/union_vector/AttackerT.java +++ b/tests/union_vector/AttackerT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/BookReader.java b/tests/union_vector/BookReader.java index 3ff0df540..2a036d618 100644 --- a/tests/union_vector/BookReader.java +++ b/tests/union_vector/BookReader.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/BookReaderT.java b/tests/union_vector/BookReaderT.java index f07d7c558..b328b91bc 100644 --- a/tests/union_vector/BookReaderT.java +++ b/tests/union_vector/BookReaderT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/FallingTub.java b/tests/union_vector/FallingTub.java index 70eabbf0f..a8b4707b4 100644 --- a/tests/union_vector/FallingTub.java +++ b/tests/union_vector/FallingTub.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/FallingTubT.java b/tests/union_vector/FallingTubT.java index 0f373fd79..8c4ab9d1e 100644 --- a/tests/union_vector/FallingTubT.java +++ b/tests/union_vector/FallingTubT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/HandFan.java b/tests/union_vector/HandFan.java index e1b910dea..c8dc61358 100644 --- a/tests/union_vector/HandFan.java +++ b/tests/union_vector/HandFan.java @@ -12,13 +12,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class HandFan extends Table { +public final class HandFan extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static HandFan getRootAsHandFan(ByteBuffer _bb) { return getRootAsHandFan(_bb, new HandFan()); } public static HandFan getRootAsHandFan(ByteBuffer _bb, HandFan obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } diff --git a/tests/union_vector/HandFanT.java b/tests/union_vector/HandFanT.java index d1ad4cf44..982c03d80 100644 --- a/tests/union_vector/HandFanT.java +++ b/tests/union_vector/HandFanT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/Movie.java b/tests/union_vector/Movie.java index 35482962f..8cdcdc1be 100644 --- a/tests/union_vector/Movie.java +++ b/tests/union_vector/Movie.java @@ -12,13 +12,12 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; @SuppressWarnings("unused") -public final class Movie extends Table { +public final class Movie extends com.google.flatbuffers.Table { public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); } public static Movie getRootAsMovie(ByteBuffer _bb) { return getRootAsMovie(_bb, new Movie()); } public static Movie getRootAsMovie(ByteBuffer _bb, Movie obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); } @@ -27,14 +26,14 @@ public final class Movie extends Table { public Movie __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; } public byte mainCharacterType() { int o = __offset(4); return o != 0 ? bb.get(o + bb_pos) : 0; } - public Table mainCharacter(Table obj) { int o = __offset(6); return o != 0 ? __union(obj, o + bb_pos) : null; } + public com.google.flatbuffers.Table mainCharacter(com.google.flatbuffers.Table obj) { int o = __offset(6); return o != 0 ? __union(obj, o + bb_pos) : null; } public byte charactersType(int j) { int o = __offset(8); return o != 0 ? bb.get(__vector(o) + j * 1) : 0; } public int charactersTypeLength() { int o = __offset(8); return o != 0 ? __vector_len(o) : 0; } public ByteVector charactersTypeVector() { return charactersTypeVector(new ByteVector()); } public ByteVector charactersTypeVector(ByteVector obj) { int o = __offset(8); return o != 0 ? obj.__assign(__vector(o), bb) : null; } public ByteBuffer charactersTypeAsByteBuffer() { return __vector_as_bytebuffer(8, 1); } public ByteBuffer charactersTypeInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 8, 1); } - public Table characters(Table obj, int j) { int o = __offset(10); return o != 0 ? __union(obj, __vector(o) + j * 4) : null; } + public com.google.flatbuffers.Table characters(com.google.flatbuffers.Table obj, int j) { int o = __offset(10); return o != 0 ? __union(obj, __vector(o) + j * 4) : null; } public int charactersLength() { int o = __offset(10); return o != 0 ? __vector_len(o) : 0; } public UnionVector charactersVector() { return charactersVector(new UnionVector()); } public UnionVector charactersVector(UnionVector obj) { int o = __offset(10); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } @@ -83,7 +82,7 @@ public final class Movie extends Table { CharacterUnion _oMainCharacter = new CharacterUnion(); byte _oMainCharacterType = mainCharacterType(); _oMainCharacter.setType(_oMainCharacterType); - Table _oMainCharacterValue; + com.google.flatbuffers.Table _oMainCharacterValue; switch (_oMainCharacterType) { case Character.MuLan: _oMainCharacterValue = mainCharacter(new Attacker()); @@ -97,7 +96,7 @@ public final class Movie extends Table { CharacterUnion _oCharactersElement = new CharacterUnion(); byte _oCharactersElementType = charactersType(_j); _oCharactersElement.setType(_oCharactersElementType); - Table _oCharactersElementValue; + com.google.flatbuffers.Table _oCharactersElementValue; switch (_oCharactersElementType) { case Character.MuLan: _oCharactersElementValue = characters(new Attacker(), _j); diff --git a/tests/union_vector/MovieT.java b/tests/union_vector/MovieT.java index 0a3bb59a3..3dd85b944 100644 --- a/tests/union_vector/MovieT.java +++ b/tests/union_vector/MovieT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/Rapunzel.java b/tests/union_vector/Rapunzel.java index 422b4bf2e..0595df41f 100644 --- a/tests/union_vector/Rapunzel.java +++ b/tests/union_vector/Rapunzel.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/tests/union_vector/RapunzelT.java b/tests/union_vector/RapunzelT.java index 5adbcc67e..24f934077 100644 --- a/tests/union_vector/RapunzelT.java +++ b/tests/union_vector/RapunzelT.java @@ -12,7 +12,6 @@ import com.google.flatbuffers.LongVector; import com.google.flatbuffers.ShortVector; import com.google.flatbuffers.StringVector; import com.google.flatbuffers.Struct; -import com.google.flatbuffers.Table; import com.google.flatbuffers.UnionVector; import java.nio.ByteBuffer; import java.nio.ByteOrder;