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 bb1a6ee70e4..47fcc1e61f8 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Enum.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Enum.java @@ -35,8 +35,8 @@ public final class Enum extends Table { public int valuesLength() { int o = __offset(6); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.EnumVal valuesByKey(long key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.EnumVal.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.EnumVal valuesByKey(com.google.flatbuffers.reflection.EnumVal obj, long key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.EnumVal.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.EnumVal.Vector valuesVector() { return valuesVector(new com.google.flatbuffers.reflection.EnumVal.Vector()); } - public com.google.flatbuffers.reflection.EnumVal.Vector valuesVector(com.google.flatbuffers.reflection.EnumVal.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.EnumVal._Vector valuesVector() { return valuesVector(new com.google.flatbuffers.reflection.EnumVal._Vector()); } + public com.google.flatbuffers.reflection.EnumVal._Vector valuesVector(com.google.flatbuffers.reflection.EnumVal._Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public boolean isUnion() { int o = __offset(8); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } public com.google.flatbuffers.reflection.Type underlyingType() { return underlyingType(new com.google.flatbuffers.reflection.Type()); } public com.google.flatbuffers.reflection.Type underlyingType(com.google.flatbuffers.reflection.Type obj) { int o = __offset(10); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } @@ -45,8 +45,8 @@ public final class Enum extends Table { public int attributesLength() { int o = __offset(12); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(12); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(12); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(12); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(12); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String documentation(int j) { int o = __offset(14); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int documentationLength() { int o = __offset(14); return o != 0 ? __vector_len(o) : 0; } public StringVector documentationVector() { return documentationVector(new StringVector()); } @@ -123,8 +123,8 @@ public static Enum __lookup_by_key(Enum obj, int vectorLocation, String key, Byt return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Enum get(int j) { return get(new Enum(), j); } public Enum get(Enum obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 53018d541e5..671fb1fd81b 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/EnumVal.java @@ -42,8 +42,8 @@ public final class EnumVal extends Table { public int attributesLength() { int o = __offset(14); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public static int createEnumVal(FlatBufferBuilder builder, int nameOffset, @@ -104,8 +104,8 @@ public static EnumVal __lookup_by_key(EnumVal obj, int vectorLocation, long key, return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public EnumVal get(int j) { return get(new EnumVal(), j); } public EnumVal get(EnumVal obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 aa77d297036..427b3cba2a1 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Field.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Field.java @@ -44,8 +44,8 @@ public final class Field extends Table { public int attributesLength() { int o = __offset(22); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(22); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(22); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String documentation(int j) { int o = __offset(24); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int documentationLength() { int o = __offset(24); return o != 0 ? __vector_len(o) : 0; } public StringVector documentationVector() { return documentationVector(new StringVector()); } @@ -143,8 +143,8 @@ public static Field __lookup_by_key(Field obj, int vectorLocation, String key, B return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Field get(int j) { return get(new Field(), j); } public Field get(Field obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 8bc85f0b97e..080b4c76521 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/KeyValue.java @@ -76,8 +76,8 @@ public static KeyValue __lookup_by_key(KeyValue obj, int vectorLocation, String return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public KeyValue get(int j) { return get(new KeyValue(), j); } public KeyValue get(KeyValue obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 74285c96e91..c3eb06ee760 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Object.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Object.java @@ -35,8 +35,8 @@ public final class Object extends Table { public int fieldsLength() { int o = __offset(6); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.Field fieldsByKey(String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.Field.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.Field fieldsByKey(com.google.flatbuffers.reflection.Field obj, String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.Field.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.Field.Vector fieldsVector() { return fieldsVector(new com.google.flatbuffers.reflection.Field.Vector()); } - public com.google.flatbuffers.reflection.Field.Vector fieldsVector(com.google.flatbuffers.reflection.Field.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.Field._Vector fieldsVector() { return fieldsVector(new com.google.flatbuffers.reflection.Field._Vector()); } + public com.google.flatbuffers.reflection.Field._Vector fieldsVector(com.google.flatbuffers.reflection.Field._Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public boolean isStruct() { int o = __offset(8); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } public int minalign() { int o = __offset(10); return o != 0 ? bb.getInt(o + bb_pos) : 0; } public int bytesize() { int o = __offset(12); return o != 0 ? bb.getInt(o + bb_pos) : 0; } @@ -45,8 +45,8 @@ public final class Object extends Table { public int attributesLength() { int o = __offset(14); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String documentation(int j) { int o = __offset(16); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int documentationLength() { int o = __offset(16); return o != 0 ? __vector_len(o) : 0; } public StringVector documentationVector() { return documentationVector(new StringVector()); } @@ -125,8 +125,8 @@ public static Object __lookup_by_key(Object obj, int vectorLocation, String key, return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Object get(int j) { return get(new Object(), j); } public Object get(Object obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 20bc72b7c59..ef682f78257 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/RPCCall.java @@ -39,8 +39,8 @@ public final class RPCCall extends Table { public int attributesLength() { int o = __offset(10); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(10); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(10); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(10); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(10); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String documentation(int j) { int o = __offset(12); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int documentationLength() { int o = __offset(12); return o != 0 ? __vector_len(o) : 0; } public StringVector documentationVector() { return documentationVector(new StringVector()); } @@ -103,8 +103,8 @@ public static RPCCall __lookup_by_key(RPCCall obj, int vectorLocation, String ke return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public RPCCall get(int j) { return get(new RPCCall(), j); } public RPCCall get(RPCCall obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 7b35ed10524..0c8ea33685c 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Schema.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Schema.java @@ -33,15 +33,15 @@ public final class Schema extends Table { public int objectsLength() { int o = __offset(4); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.Object objectsByKey(String key) { int o = __offset(4); return o != 0 ? com.google.flatbuffers.reflection.Object.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.Object objectsByKey(com.google.flatbuffers.reflection.Object obj, String key) { int o = __offset(4); return o != 0 ? com.google.flatbuffers.reflection.Object.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.Object.Vector objectsVector() { return objectsVector(new com.google.flatbuffers.reflection.Object.Vector()); } - public com.google.flatbuffers.reflection.Object.Vector objectsVector(com.google.flatbuffers.reflection.Object.Vector obj) { int o = __offset(4); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.Object._Vector objectsVector() { return objectsVector(new com.google.flatbuffers.reflection.Object._Vector()); } + public com.google.flatbuffers.reflection.Object._Vector objectsVector(com.google.flatbuffers.reflection.Object._Vector obj) { int o = __offset(4); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public com.google.flatbuffers.reflection.Enum enums(int j) { return enums(new com.google.flatbuffers.reflection.Enum(), j); } public com.google.flatbuffers.reflection.Enum enums(com.google.flatbuffers.reflection.Enum obj, int j) { int o = __offset(6); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int enumsLength() { int o = __offset(6); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.Enum enumsByKey(String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.Enum.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.Enum enumsByKey(com.google.flatbuffers.reflection.Enum obj, String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.Enum.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.Enum.Vector enumsVector() { return enumsVector(new com.google.flatbuffers.reflection.Enum.Vector()); } - public com.google.flatbuffers.reflection.Enum.Vector enumsVector(com.google.flatbuffers.reflection.Enum.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.Enum._Vector enumsVector() { return enumsVector(new com.google.flatbuffers.reflection.Enum._Vector()); } + public com.google.flatbuffers.reflection.Enum._Vector enumsVector(com.google.flatbuffers.reflection.Enum._Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String fileIdent() { int o = __offset(8); return o != 0 ? __string(o + bb_pos) : null; } public ByteBuffer fileIdentAsByteBuffer() { return __vector_as_bytebuffer(8, 1); } public ByteBuffer fileIdentInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 8, 1); } @@ -55,8 +55,8 @@ public final class Schema extends Table { public int servicesLength() { int o = __offset(14); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.Service servicesByKey(String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.Service.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.Service servicesByKey(com.google.flatbuffers.reflection.Service obj, String key) { int o = __offset(14); return o != 0 ? com.google.flatbuffers.reflection.Service.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.Service.Vector servicesVector() { return servicesVector(new com.google.flatbuffers.reflection.Service.Vector()); } - public com.google.flatbuffers.reflection.Service.Vector servicesVector(com.google.flatbuffers.reflection.Service.Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.Service._Vector servicesVector() { return servicesVector(new com.google.flatbuffers.reflection.Service._Vector()); } + public com.google.flatbuffers.reflection.Service._Vector servicesVector(com.google.flatbuffers.reflection.Service._Vector obj) { int o = __offset(14); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public long advancedFeatures() { int o = __offset(16); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } /** * All the files used in this compilation. Files are relative to where @@ -67,8 +67,8 @@ public final class Schema extends Table { public int fbsFilesLength() { int o = __offset(18); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.SchemaFile fbsFilesByKey(String key) { int o = __offset(18); return o != 0 ? com.google.flatbuffers.reflection.SchemaFile.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.SchemaFile fbsFilesByKey(com.google.flatbuffers.reflection.SchemaFile obj, String key) { int o = __offset(18); return o != 0 ? com.google.flatbuffers.reflection.SchemaFile.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.SchemaFile.Vector fbsFilesVector() { return fbsFilesVector(new com.google.flatbuffers.reflection.SchemaFile.Vector()); } - public com.google.flatbuffers.reflection.SchemaFile.Vector fbsFilesVector(com.google.flatbuffers.reflection.SchemaFile.Vector obj) { int o = __offset(18); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.SchemaFile._Vector fbsFilesVector() { return fbsFilesVector(new com.google.flatbuffers.reflection.SchemaFile._Vector()); } + public com.google.flatbuffers.reflection.SchemaFile._Vector fbsFilesVector(com.google.flatbuffers.reflection.SchemaFile._Vector obj) { int o = __offset(18); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public static int createSchema(FlatBufferBuilder builder, int objectsOffset, @@ -117,8 +117,8 @@ public static int endSchema(FlatBufferBuilder builder) { public static void finishSchemaBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset, "BFBS"); } public static void finishSizePrefixedSchemaBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset, "BFBS"); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Schema get(int j) { return get(new Schema(), j); } public Schema get(Schema obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 f0c13a1bb71..5fe83d32413 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/SchemaFile.java @@ -90,8 +90,8 @@ public static SchemaFile __lookup_by_key(SchemaFile obj, int vectorLocation, Str return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public SchemaFile get(int j) { return get(new SchemaFile(), j); } public SchemaFile get(SchemaFile obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 30267ba134e..e9a8297c16e 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Service.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Service.java @@ -35,15 +35,15 @@ public final class Service extends Table { public int callsLength() { int o = __offset(6); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.RPCCall callsByKey(String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.RPCCall.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.RPCCall callsByKey(com.google.flatbuffers.reflection.RPCCall obj, String key) { int o = __offset(6); return o != 0 ? com.google.flatbuffers.reflection.RPCCall.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.RPCCall.Vector callsVector() { return callsVector(new com.google.flatbuffers.reflection.RPCCall.Vector()); } - public com.google.flatbuffers.reflection.RPCCall.Vector callsVector(com.google.flatbuffers.reflection.RPCCall.Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.RPCCall._Vector callsVector() { return callsVector(new com.google.flatbuffers.reflection.RPCCall._Vector()); } + public com.google.flatbuffers.reflection.RPCCall._Vector callsVector(com.google.flatbuffers.reflection.RPCCall._Vector obj) { int o = __offset(6); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributes(int j) { return attributes(new com.google.flatbuffers.reflection.KeyValue(), j); } public com.google.flatbuffers.reflection.KeyValue attributes(com.google.flatbuffers.reflection.KeyValue obj, int j) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; } public int attributesLength() { int o = __offset(8); return o != 0 ? __vector_len(o) : 0; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(String key) { int o = __offset(8); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(null, __vector(o), key, bb) : null; } public com.google.flatbuffers.reflection.KeyValue attributesByKey(com.google.flatbuffers.reflection.KeyValue obj, String key) { int o = __offset(8); return o != 0 ? com.google.flatbuffers.reflection.KeyValue.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue.Vector()); } - public com.google.flatbuffers.reflection.KeyValue.Vector attributesVector(com.google.flatbuffers.reflection.KeyValue.Vector obj) { int o = __offset(8); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector() { return attributesVector(new com.google.flatbuffers.reflection.KeyValue._Vector()); } + public com.google.flatbuffers.reflection.KeyValue._Vector attributesVector(com.google.flatbuffers.reflection.KeyValue._Vector obj) { int o = __offset(8); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String documentation(int j) { int o = __offset(10); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int documentationLength() { int o = __offset(10); return o != 0 ? __vector_len(o) : 0; } public StringVector documentationVector() { return documentationVector(new StringVector()); } @@ -112,8 +112,8 @@ public static Service __lookup_by_key(Service obj, int vectorLocation, String ke return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Service get(int j) { return get(new Service(), j); } public Service get(Service obj, int j) { return obj.__assign(__indirect(__element(j), bb), 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 0be0651cd58..636efbac447 100644 --- a/java/src/main/java/com/google/flatbuffers/reflection/Type.java +++ b/java/src/main/java/com/google/flatbuffers/reflection/Type.java @@ -69,8 +69,8 @@ public static int endType(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Type get(int j) { return get(new Type(), j); } public Type get(Type obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/src/idl_gen_java.cpp b/src/idl_gen_java.cpp index b2aa11aa11b..d4dd91f7a11 100644 --- a/src/idl_gen_java.cpp +++ b/src/idl_gen_java.cpp @@ -206,7 +206,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"; @@ -268,7 +267,7 @@ class JavaGenerator : public BaseGenerator { case BASE_TYPE_UNION: FLATBUFFERS_FALLTHROUGH(); // else fall thru default: - return "Table"; + return "com.google.flatbuffers.Table"; } } @@ -716,7 +715,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) { @@ -1467,7 +1466,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 54c66715664..b437a6d0c3c 100644 --- a/tests/DictionaryLookup/LongFloatEntry.java +++ b/tests/DictionaryLookup/LongFloatEntry.java @@ -75,8 +75,8 @@ public static LongFloatEntry __lookup_by_key(LongFloatEntry obj, int vectorLocat return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public LongFloatEntry get(int j) { return get(new LongFloatEntry(), j); } public LongFloatEntry get(LongFloatEntry obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/DictionaryLookup/LongFloatMap.java b/tests/DictionaryLookup/LongFloatMap.java index de7d42b8a0a..0061b960426 100644 --- a/tests/DictionaryLookup/LongFloatMap.java +++ b/tests/DictionaryLookup/LongFloatMap.java @@ -32,8 +32,8 @@ public final class LongFloatMap extends Table { public int entriesLength() { int o = __offset(4); return o != 0 ? __vector_len(o) : 0; } public DictionaryLookup.LongFloatEntry entriesByKey(long key) { int o = __offset(4); return o != 0 ? DictionaryLookup.LongFloatEntry.__lookup_by_key(null, __vector(o), key, bb) : null; } public DictionaryLookup.LongFloatEntry entriesByKey(DictionaryLookup.LongFloatEntry obj, long key) { int o = __offset(4); return o != 0 ? DictionaryLookup.LongFloatEntry.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public DictionaryLookup.LongFloatEntry.Vector entriesVector() { return entriesVector(new DictionaryLookup.LongFloatEntry.Vector()); } - public DictionaryLookup.LongFloatEntry.Vector entriesVector(DictionaryLookup.LongFloatEntry.Vector obj) { int o = __offset(4); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public DictionaryLookup.LongFloatEntry._Vector entriesVector() { return entriesVector(new DictionaryLookup.LongFloatEntry._Vector()); } + public DictionaryLookup.LongFloatEntry._Vector entriesVector(DictionaryLookup.LongFloatEntry._Vector obj) { int o = __offset(4); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public static int createLongFloatMap(FlatBufferBuilder builder, int entriesOffset) { @@ -53,8 +53,8 @@ public static int endLongFloatMap(FlatBufferBuilder builder) { public static void finishLongFloatMapBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset); } public static void finishSizePrefixedLongFloatMapBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public LongFloatMap get(int j) { return get(new LongFloatMap(), j); } public LongFloatMap get(LongFloatMap obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/Ability.java b/tests/MyGame/Example/Ability.java index 8b8c38f1147..cba5b398ab8 100644 --- a/tests/MyGame/Example/Ability.java +++ b/tests/MyGame/Example/Ability.java @@ -36,8 +36,8 @@ public static int createAbility(FlatBufferBuilder builder, long id, long distanc return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Ability get(int j) { return get(new Ability(), j); } public Ability get(Ability obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/ArrayStruct.java b/tests/MyGame/Example/ArrayStruct.java index b859560bdc6..58de86815e8 100644 --- a/tests/MyGame/Example/ArrayStruct.java +++ b/tests/MyGame/Example/ArrayStruct.java @@ -67,8 +67,8 @@ public static int createArrayStruct(FlatBufferBuilder builder, float a, int[] b, return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public ArrayStruct get(int j) { return get(new ArrayStruct(), j); } public ArrayStruct get(ArrayStruct obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/ArrayTable.java b/tests/MyGame/Example/ArrayTable.java index a49c3bdcc6f..e673e03f5c1 100644 --- a/tests/MyGame/Example/ArrayTable.java +++ b/tests/MyGame/Example/ArrayTable.java @@ -40,8 +40,8 @@ public static int endArrayTable(FlatBufferBuilder builder) { public static void finishArrayTableBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset, "ARRT"); } public static void finishSizePrefixedArrayTableBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset, "ARRT"); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public ArrayTable get(int j) { return get(new ArrayTable(), j); } public ArrayTable get(ArrayTable obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/Monster.java b/tests/MyGame/Example/Monster.java index 8417ebcc561..f9d509da1ba 100644 --- a/tests/MyGame/Example/Monster.java +++ b/tests/MyGame/Example/Monster.java @@ -54,8 +54,8 @@ public final class Monster extends Table { 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; } - public MyGame.Example.Test.Vector test4Vector() { return test4Vector(new MyGame.Example.Test.Vector()); } - public MyGame.Example.Test.Vector test4Vector(MyGame.Example.Test.Vector obj) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Test._Vector test4Vector() { return test4Vector(new MyGame.Example.Test._Vector()); } + public MyGame.Example.Test._Vector test4Vector(MyGame.Example.Test._Vector obj) { int o = __offset(22); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public String testarrayofstring(int j) { int o = __offset(24); return o != 0 ? __string(__vector(o) + j * 4) : null; } public int testarrayofstringLength() { int o = __offset(24); return o != 0 ? __vector_len(o) : 0; } public StringVector testarrayofstringVector() { return testarrayofstringVector(new StringVector()); } @@ -69,8 +69,8 @@ public final class Monster extends Table { public int testarrayoftablesLength() { int o = __offset(26); return o != 0 ? __vector_len(o) : 0; } public MyGame.Example.Monster testarrayoftablesByKey(String key) { int o = __offset(26); return o != 0 ? MyGame.Example.Monster.__lookup_by_key(null, __vector(o), key, bb) : null; } public MyGame.Example.Monster testarrayoftablesByKey(MyGame.Example.Monster obj, String key) { int o = __offset(26); return o != 0 ? MyGame.Example.Monster.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public MyGame.Example.Monster.Vector testarrayoftablesVector() { return testarrayoftablesVector(new MyGame.Example.Monster.Vector()); } - public MyGame.Example.Monster.Vector testarrayoftablesVector(MyGame.Example.Monster.Vector obj) { int o = __offset(26); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Monster._Vector testarrayoftablesVector() { return testarrayoftablesVector(new MyGame.Example.Monster._Vector()); } + public MyGame.Example.Monster._Vector testarrayoftablesVector(MyGame.Example.Monster._Vector obj) { int o = __offset(26); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public MyGame.Example.Monster enemy() { return enemy(new MyGame.Example.Monster()); } public MyGame.Example.Monster enemy(MyGame.Example.Monster obj) { int o = __offset(28); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; } public int testnestedflatbuffer(int j) { int o = __offset(30); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; } @@ -122,8 +122,8 @@ public final class Monster extends Table { public MyGame.Example.Ability testarrayofsortedstruct(int j) { return testarrayofsortedstruct(new MyGame.Example.Ability(), j); } public MyGame.Example.Ability testarrayofsortedstruct(MyGame.Example.Ability obj, int j) { int o = __offset(62); return o != 0 ? obj.__assign(__vector(o) + j * 8, bb) : null; } public int testarrayofsortedstructLength() { int o = __offset(62); return o != 0 ? __vector_len(o) : 0; } - public MyGame.Example.Ability.Vector testarrayofsortedstructVector() { return testarrayofsortedstructVector(new MyGame.Example.Ability.Vector()); } - public MyGame.Example.Ability.Vector testarrayofsortedstructVector(MyGame.Example.Ability.Vector obj) { int o = __offset(62); return o != 0 ? obj.__assign(__vector(o), 8, bb) : null; } + public MyGame.Example.Ability._Vector testarrayofsortedstructVector() { return testarrayofsortedstructVector(new MyGame.Example.Ability._Vector()); } + public MyGame.Example.Ability._Vector testarrayofsortedstructVector(MyGame.Example.Ability._Vector obj) { int o = __offset(62); return o != 0 ? obj.__assign(__vector(o), 8, bb) : null; } public int flex(int j) { int o = __offset(64); return o != 0 ? bb.get(__vector(o) + j * 1) & 0xFF : 0; } public int flexLength() { int o = __offset(64); return o != 0 ? __vector_len(o) : 0; } public ByteVector flexVector() { return flexVector(new ByteVector()); } @@ -134,8 +134,8 @@ public final class Monster extends Table { public MyGame.Example.Test test5(int j) { return test5(new MyGame.Example.Test(), j); } public MyGame.Example.Test test5(MyGame.Example.Test obj, int j) { int o = __offset(66); return o != 0 ? obj.__assign(__vector(o) + j * 4, bb) : null; } public int test5Length() { int o = __offset(66); return o != 0 ? __vector_len(o) : 0; } - public MyGame.Example.Test.Vector test5Vector() { return test5Vector(new MyGame.Example.Test.Vector()); } - public MyGame.Example.Test.Vector test5Vector(MyGame.Example.Test.Vector obj) { int o = __offset(66); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Test._Vector test5Vector() { return test5Vector(new MyGame.Example.Test._Vector()); } + public MyGame.Example.Test._Vector test5Vector(MyGame.Example.Test._Vector obj) { int o = __offset(66); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public long vectorOfLongs(int j) { int o = __offset(68); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } public int vectorOfLongsLength() { int o = __offset(68); return o != 0 ? __vector_len(o) : 0; } public LongVector vectorOfLongsVector() { return vectorOfLongsVector(new LongVector()); } @@ -157,8 +157,8 @@ public final class Monster extends Table { public int vectorOfReferrablesLength() { int o = __offset(74); return o != 0 ? __vector_len(o) : 0; } public MyGame.Example.Referrable vectorOfReferrablesByKey(long key) { int o = __offset(74); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } public MyGame.Example.Referrable vectorOfReferrablesByKey(MyGame.Example.Referrable obj, long key) { int o = __offset(74); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public MyGame.Example.Referrable.Vector vectorOfReferrablesVector() { return vectorOfReferrablesVector(new MyGame.Example.Referrable.Vector()); } - public MyGame.Example.Referrable.Vector vectorOfReferrablesVector(MyGame.Example.Referrable.Vector obj) { int o = __offset(74); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Referrable._Vector vectorOfReferrablesVector() { return vectorOfReferrablesVector(new MyGame.Example.Referrable._Vector()); } + public MyGame.Example.Referrable._Vector vectorOfReferrablesVector(MyGame.Example.Referrable._Vector obj) { int o = __offset(74); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public long singleWeakReference() { int o = __offset(76); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } public boolean mutateSingleWeakReference(long single_weak_reference) { int o = __offset(76); if (o != 0) { bb.putLong(o + bb_pos, single_weak_reference); return true; } else { return false; } } public long vectorOfWeakReferences(int j) { int o = __offset(78); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } @@ -173,8 +173,8 @@ public final class Monster extends Table { public int vectorOfStrongReferrablesLength() { int o = __offset(80); return o != 0 ? __vector_len(o) : 0; } public MyGame.Example.Referrable vectorOfStrongReferrablesByKey(long key) { int o = __offset(80); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(null, __vector(o), key, bb) : null; } public MyGame.Example.Referrable vectorOfStrongReferrablesByKey(MyGame.Example.Referrable obj, long key) { int o = __offset(80); return o != 0 ? MyGame.Example.Referrable.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public MyGame.Example.Referrable.Vector vectorOfStrongReferrablesVector() { return vectorOfStrongReferrablesVector(new MyGame.Example.Referrable.Vector()); } - public MyGame.Example.Referrable.Vector vectorOfStrongReferrablesVector(MyGame.Example.Referrable.Vector obj) { int o = __offset(80); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Referrable._Vector vectorOfStrongReferrablesVector() { return vectorOfStrongReferrablesVector(new MyGame.Example.Referrable._Vector()); } + public MyGame.Example.Referrable._Vector vectorOfStrongReferrablesVector(MyGame.Example.Referrable._Vector obj) { int o = __offset(80); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public long coOwningReference() { int o = __offset(82); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } public boolean mutateCoOwningReference(long co_owning_reference) { int o = __offset(82); if (o != 0) { bb.putLong(o + bb_pos, co_owning_reference); return true; } else { return false; } } public long vectorOfCoOwningReferences(int j) { int o = __offset(84); return o != 0 ? bb.getLong(__vector(o) + j * 8) : 0; } @@ -220,8 +220,8 @@ public final class Monster extends Table { public int scalarKeySortedTablesLength() { int o = __offset(104); return o != 0 ? __vector_len(o) : 0; } public MyGame.Example.Stat scalarKeySortedTablesByKey(int key) { int o = __offset(104); return o != 0 ? MyGame.Example.Stat.__lookup_by_key(null, __vector(o), key, bb) : null; } public MyGame.Example.Stat scalarKeySortedTablesByKey(MyGame.Example.Stat obj, int key) { int o = __offset(104); return o != 0 ? MyGame.Example.Stat.__lookup_by_key(obj, __vector(o), key, bb) : null; } - public MyGame.Example.Stat.Vector scalarKeySortedTablesVector() { return scalarKeySortedTablesVector(new MyGame.Example.Stat.Vector()); } - public MyGame.Example.Stat.Vector scalarKeySortedTablesVector(MyGame.Example.Stat.Vector obj) { int o = __offset(104); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } + public MyGame.Example.Stat._Vector scalarKeySortedTablesVector() { return scalarKeySortedTablesVector(new MyGame.Example.Stat._Vector()); } + public MyGame.Example.Stat._Vector scalarKeySortedTablesVector(MyGame.Example.Stat._Vector obj) { int o = __offset(104); return o != 0 ? obj.__assign(__vector(o), 4, bb) : null; } public MyGame.Example.Test nativeInline() { return nativeInline(new MyGame.Example.Test()); } public MyGame.Example.Test nativeInline(MyGame.Example.Test obj) { int o = __offset(106); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; } public long longEnumNonEnumDefault() { int o = __offset(108); return o != 0 ? bb.getLong(o + bb_pos) : 0L; } @@ -381,8 +381,8 @@ public static Monster __lookup_by_key(Monster obj, int vectorLocation, String ke return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Monster get(int j) { return get(new Monster(), j); } public Monster get(Monster obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/NestedStruct.java b/tests/MyGame/Example/NestedStruct.java index 0d33f71332e..77bac3d71a7 100644 --- a/tests/MyGame/Example/NestedStruct.java +++ b/tests/MyGame/Example/NestedStruct.java @@ -49,8 +49,8 @@ public static int createNestedStruct(FlatBufferBuilder builder, int[] a, byte b, return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public NestedStruct get(int j) { return get(new NestedStruct(), j); } public NestedStruct get(NestedStruct obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/Referrable.java b/tests/MyGame/Example/Referrable.java index 245d2f454cd..d2118447862 100644 --- a/tests/MyGame/Example/Referrable.java +++ b/tests/MyGame/Example/Referrable.java @@ -72,8 +72,8 @@ public static Referrable __lookup_by_key(Referrable obj, int vectorLocation, lon return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Referrable get(int j) { return get(new Referrable(), j); } public Referrable get(Referrable obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/Stat.java b/tests/MyGame/Example/Stat.java index ae8d3da88ec..ba982a0197b 100644 --- a/tests/MyGame/Example/Stat.java +++ b/tests/MyGame/Example/Stat.java @@ -83,8 +83,8 @@ public static Stat __lookup_by_key(Stat obj, int vectorLocation, int key, ByteBu return null; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Stat get(int j) { return get(new Stat(), j); } public Stat get(Stat obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/StructOfStructs.java b/tests/MyGame/Example/StructOfStructs.java index befd3359050..f5738dc3aaa 100644 --- a/tests/MyGame/Example/StructOfStructs.java +++ b/tests/MyGame/Example/StructOfStructs.java @@ -46,8 +46,8 @@ public static int createStructOfStructs(FlatBufferBuilder builder, long a_id, lo return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public StructOfStructs get(int j) { return get(new StructOfStructs(), j); } public StructOfStructs get(StructOfStructs obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/StructOfStructsOfStructs.java b/tests/MyGame/Example/StructOfStructsOfStructs.java index fb14a5a0cf0..27f9fba828e 100644 --- a/tests/MyGame/Example/StructOfStructsOfStructs.java +++ b/tests/MyGame/Example/StructOfStructsOfStructs.java @@ -43,8 +43,8 @@ public static int createStructOfStructsOfStructs(FlatBufferBuilder builder, long return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public StructOfStructsOfStructs get(int j) { return get(new StructOfStructsOfStructs(), j); } public StructOfStructsOfStructs get(StructOfStructsOfStructs obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/Test.java b/tests/MyGame/Example/Test.java index cff5a6503dc..85d36279c63 100644 --- a/tests/MyGame/Example/Test.java +++ b/tests/MyGame/Example/Test.java @@ -37,8 +37,8 @@ public static int createTest(FlatBufferBuilder builder, short a, byte b) { return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Test get(int j) { return get(new Test(), j); } public Test get(Test obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example/TestSimpleTableWithEnum.java b/tests/MyGame/Example/TestSimpleTableWithEnum.java index f04dd6975e8..925ac831152 100644 --- a/tests/MyGame/Example/TestSimpleTableWithEnum.java +++ b/tests/MyGame/Example/TestSimpleTableWithEnum.java @@ -44,8 +44,8 @@ public static int endTestSimpleTableWithEnum(FlatBufferBuilder builder) { return o; } - static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public TestSimpleTableWithEnum get(int j) { return get(new TestSimpleTableWithEnum(), j); } public TestSimpleTableWithEnum get(TestSimpleTableWithEnum obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/TypeAliases.java b/tests/MyGame/Example/TypeAliases.java index 5b57a5081b2..8d9c5b13784 100644 --- a/tests/MyGame/Example/TypeAliases.java +++ b/tests/MyGame/Example/TypeAliases.java @@ -114,8 +114,8 @@ public static int endTypeAliases(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public TypeAliases get(int j) { return get(new TypeAliases(), j); } public TypeAliases get(TypeAliases obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java index c1f2ce63c07..76d61cf5856 100644 --- a/tests/MyGame/Example/Vec3.java +++ b/tests/MyGame/Example/Vec3.java @@ -54,8 +54,8 @@ public static int createVec3(FlatBufferBuilder builder, float x, float y, float return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Vec3 get(int j) { return get(new Vec3(), j); } public Vec3 get(Vec3 obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/MyGame/Example2/Monster.java b/tests/MyGame/Example2/Monster.java index 860f23e5b84..7545878a39b 100644 --- a/tests/MyGame/Example2/Monster.java +++ b/tests/MyGame/Example2/Monster.java @@ -34,8 +34,8 @@ public static int endMonster(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Monster get(int j) { return get(new Monster(), j); } public Monster get(Monster obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/InParentNamespace.java b/tests/MyGame/InParentNamespace.java index ee2640748f1..75d906a5256 100644 --- a/tests/MyGame/InParentNamespace.java +++ b/tests/MyGame/InParentNamespace.java @@ -34,8 +34,8 @@ public static int endInParentNamespace(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public InParentNamespace get(int j) { return get(new InParentNamespace(), j); } public InParentNamespace get(InParentNamespace obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/MyGame/MonsterExtra.java b/tests/MyGame/MonsterExtra.java index 98e0ad789d3..c9314b920cc 100644 --- a/tests/MyGame/MonsterExtra.java +++ b/tests/MyGame/MonsterExtra.java @@ -106,8 +106,8 @@ public static int endMonsterExtra(FlatBufferBuilder builder) { public static void finishMonsterExtraBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset, "MONE"); } public static void finishSizePrefixedMonsterExtraBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset, "MONE"); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public MonsterExtra get(int j) { return get(new MonsterExtra(), j); } public MonsterExtra get(MonsterExtra obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/optional_scalars/ScalarStuff.java b/tests/optional_scalars/ScalarStuff.java index a858821160b..afbc3b6580e 100644 --- a/tests/optional_scalars/ScalarStuff.java +++ b/tests/optional_scalars/ScalarStuff.java @@ -198,8 +198,8 @@ public static int endScalarStuff(FlatBufferBuilder builder) { public static void finishScalarStuffBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset, "NULL"); } public static void finishSizePrefixedScalarStuffBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset, "NULL"); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public ScalarStuff get(int j) { return get(new ScalarStuff(), j); } public ScalarStuff get(ScalarStuff obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/union_vector/Attacker.java b/tests/union_vector/Attacker.java index 3a288e33fdb..285d4875715 100644 --- a/tests/union_vector/Attacker.java +++ b/tests/union_vector/Attacker.java @@ -42,8 +42,8 @@ public static int endAttacker(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Attacker get(int j) { return get(new Attacker(), j); } public Attacker get(Attacker obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/union_vector/BookReader.java b/tests/union_vector/BookReader.java index 3ff0df5402c..639e06e53eb 100644 --- a/tests/union_vector/BookReader.java +++ b/tests/union_vector/BookReader.java @@ -31,8 +31,8 @@ public static int createBookReader(FlatBufferBuilder builder, int booksRead) { return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public BookReader get(int j) { return get(new BookReader(), j); } public BookReader get(BookReader obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/union_vector/FallingTub.java b/tests/union_vector/FallingTub.java index 70eabbf0f2f..b31236c3d67 100644 --- a/tests/union_vector/FallingTub.java +++ b/tests/union_vector/FallingTub.java @@ -31,8 +31,8 @@ public static int createFallingTub(FlatBufferBuilder builder, int weight) { return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public FallingTub get(int j) { return get(new FallingTub(), j); } public FallingTub get(FallingTub obj, int j) { return obj.__assign(__element(j), bb); } diff --git a/tests/union_vector/HandFan.java b/tests/union_vector/HandFan.java index e1b910deaa4..68a5c0bd29f 100644 --- a/tests/union_vector/HandFan.java +++ b/tests/union_vector/HandFan.java @@ -42,8 +42,8 @@ public static int endHandFan(FlatBufferBuilder builder) { return o; } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public HandFan get(int j) { return get(new HandFan(), j); } public HandFan get(HandFan obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/union_vector/Movie.java b/tests/union_vector/Movie.java index 35482962f3b..e673f4a8abe 100644 --- a/tests/union_vector/Movie.java +++ b/tests/union_vector/Movie.java @@ -68,8 +68,8 @@ public static int endMovie(FlatBufferBuilder builder) { public static void finishMovieBuffer(FlatBufferBuilder builder, int offset) { builder.finish(offset, "MOVI"); } public static void finishSizePrefixedMovieBuffer(FlatBufferBuilder builder, int offset) { builder.finishSizePrefixed(offset, "MOVI"); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Movie get(int j) { return get(new Movie(), j); } public Movie get(Movie obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); } diff --git a/tests/union_vector/Rapunzel.java b/tests/union_vector/Rapunzel.java index 422b4bf2e08..c813ddfa0e2 100644 --- a/tests/union_vector/Rapunzel.java +++ b/tests/union_vector/Rapunzel.java @@ -31,8 +31,8 @@ public static int createRapunzel(FlatBufferBuilder builder, int hairLength) { return builder.offset(); } - public static final class Vector extends BaseVector { - public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } + public static final class _Vector extends BaseVector { + public _Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; } public Rapunzel get(int j) { return get(new Rapunzel(), j); } public Rapunzel get(Rapunzel obj, int j) { return obj.__assign(__element(j), bb); }