Skip to content

Commit a577050

Browse files
nevi-meNeville Dipale
nevi-me
and
Neville Dipale
authored
[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 <[email protected]>
1 parent 31ab0bf commit a577050

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+38
-96
lines changed

‎java/src/main/java/com/google/flatbuffers/reflection/Enum.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Enum extends Table {
22+
public final class Enum extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Enum getRootAsEnum(ByteBuffer _bb) { return getRootAsEnum(_bb, new Enum()); }
2625
public static Enum getRootAsEnum(ByteBuffer _bb, Enum obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class EnumVal extends Table {
22+
public final class EnumVal extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static EnumVal getRootAsEnumVal(ByteBuffer _bb) { return getRootAsEnumVal(_bb, new EnumVal()); }
2625
public static EnumVal getRootAsEnumVal(ByteBuffer _bb, EnumVal obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/Field.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Field extends Table {
22+
public final class Field extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Field getRootAsField(ByteBuffer _bb) { return getRootAsField(_bb, new Field()); }
2625
public static Field getRootAsField(ByteBuffer _bb, Field obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class KeyValue extends Table {
22+
public final class KeyValue extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static KeyValue getRootAsKeyValue(ByteBuffer _bb) { return getRootAsKeyValue(_bb, new KeyValue()); }
2625
public static KeyValue getRootAsKeyValue(ByteBuffer _bb, KeyValue obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/Object.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Object extends Table {
22+
public final class Object extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Object getRootAsObject(ByteBuffer _bb) { return getRootAsObject(_bb, new Object()); }
2625
public static Object getRootAsObject(ByteBuffer _bb, Object obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class RPCCall extends Table {
22+
public final class RPCCall extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static RPCCall getRootAsRPCCall(ByteBuffer _bb) { return getRootAsRPCCall(_bb, new RPCCall()); }
2625
public static RPCCall getRootAsRPCCall(ByteBuffer _bb, RPCCall obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/Schema.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Schema extends Table {
22+
public final class Schema extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Schema getRootAsSchema(ByteBuffer _bb) { return getRootAsSchema(_bb, new Schema()); }
2625
public static Schema getRootAsSchema(ByteBuffer _bb, Schema obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
@@ -25,7 +24,7 @@
2524
* symbols and examining the `declaration_file` field.
2625
*/
2726
@SuppressWarnings("unused")
28-
public final class SchemaFile extends Table {
27+
public final class SchemaFile extends com.google.flatbuffers.Table {
2928
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
3029
public static SchemaFile getRootAsSchemaFile(ByteBuffer _bb) { return getRootAsSchemaFile(_bb, new SchemaFile()); }
3130
public static SchemaFile getRootAsSchemaFile(ByteBuffer _bb, SchemaFile obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/Service.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Service extends Table {
22+
public final class Service extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Service getRootAsService(ByteBuffer _bb) { return getRootAsService(_bb, new Service()); }
2625
public static Service getRootAsService(ByteBuffer _bb, Service obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

‎java/src/main/java/com/google/flatbuffers/reflection/Type.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
import com.google.flatbuffers.ShortVector;
1515
import com.google.flatbuffers.StringVector;
1616
import com.google.flatbuffers.Struct;
17-
import com.google.flatbuffers.Table;
1817
import com.google.flatbuffers.UnionVector;
1918
import java.nio.ByteBuffer;
2019
import java.nio.ByteOrder;
2120

2221
@SuppressWarnings("unused")
23-
public final class Type extends Table {
22+
public final class Type extends com.google.flatbuffers.Table {
2423
public static void ValidateVersion() { Constants.FLATBUFFERS_25_9_23(); }
2524
public static Type getRootAsType(ByteBuffer _bb) { return getRootAsType(_bb, new Type()); }
2625
public static Type getRootAsType(ByteBuffer _bb, Type obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }

0 commit comments

Comments
 (0)