FlatBuffers 1.8.0, remove xxxInByteBuffer methods from model (not yet in 1.8.0)

greenrobot · greenrobot · commit 46bd8778d315 · 2018-03-07T19:43:41.000+01:00
diff --git a/objectbox-java/build.gradle b/objectbox-java/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':objectbox-java-api')
     compile 'org.greenrobot:essentials:3.0.0-RC1'
-    compile 'com.google.flatbuffers:flatbuffers-java:1.7.2'
+    compile 'com.google.flatbuffers:flatbuffers-java:1.8.0'
     compile 'com.google.code.findbugs:jsr305:3.0.2'
 }
 
diff --git a/objectbox-java/src/main/java/io/objectbox/BoxStore.java b/objectbox-java/src/main/java/io/objectbox/BoxStore.java
@@ -59,7 +59,7 @@
 @ThreadSafe
 public class BoxStore implements Closeable {
 
-    private static final String VERSION = "1.4.4-2018-03-04";
+    private static final String VERSION = "1.4.4-2018-03-07";
     private static BoxStore defaultStore;
 
     private static final Set<String> openFiles = new HashSet<>();
@@ -135,7 +135,6 @@ static native void nativeRegisterCustomType(long store, int entityId, int proper
     public static native boolean isObjectBrowserAvailable();
 
     public static String getVersion() {
-
         return VERSION;
     }
 
diff --git a/objectbox-java/src/main/java/io/objectbox/model/Model.java b/objectbox-java/src/main/java/io/objectbox/model/Model.java
@@ -45,7 +45,6 @@ public final class Model extends Table {
    */
   public String name() { int o = __offset(6); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameAsByteBuffer() { return __vector_as_bytebuffer(6, 1); }
-  public ByteBuffer nameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 6, 1); }
   /**
    * User controlled version, not really used at the moment
    */
diff --git a/objectbox-java/src/main/java/io/objectbox/model/ModelEntity.java b/objectbox-java/src/main/java/io/objectbox/model/ModelEntity.java
@@ -34,7 +34,6 @@ public final class ModelEntity extends Table {
   public IdUid id(IdUid obj) { int o = __offset(4); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; }
   public String name() { int o = __offset(6); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameAsByteBuffer() { return __vector_as_bytebuffer(6, 1); }
-  public ByteBuffer nameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 6, 1); }
   public ModelProperty properties(int j) { return properties(new ModelProperty(), j); }
   public ModelProperty properties(ModelProperty obj, int j) { int o = __offset(8); return o != 0 ? obj.__assign(__indirect(__vector(o) + j * 4), bb) : null; }
   public int propertiesLength() { int o = __offset(8); return o != 0 ? __vector_len(o) : 0; }
@@ -52,7 +51,6 @@ public final class ModelEntity extends Table {
    */
   public String nameSecondary() { int o = __offset(16); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameSecondaryAsByteBuffer() { return __vector_as_bytebuffer(16, 1); }
-  public ByteBuffer nameSecondaryInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 16, 1); }
 
   public static void startModelEntity(FlatBufferBuilder builder) { builder.startObject(7); }
   public static void addId(FlatBufferBuilder builder, int idOffset) { builder.addStruct(0, idOffset, 0); }
diff --git a/objectbox-java/src/main/java/io/objectbox/model/ModelProperty.java b/objectbox-java/src/main/java/io/objectbox/model/ModelProperty.java
@@ -34,7 +34,6 @@ public final class ModelProperty extends Table {
   public IdUid id(IdUid obj) { int o = __offset(4); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; }
   public String name() { int o = __offset(6); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameAsByteBuffer() { return __vector_as_bytebuffer(6, 1); }
-  public ByteBuffer nameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 6, 1); }
   public int type() { int o = __offset(8); return o != 0 ? bb.getShort(o + bb_pos) & 0xFFFF : 0; }
   /**
    * bit flags: e.g. indexed, not-nullable
@@ -47,19 +46,16 @@ public final class ModelProperty extends Table {
    */
   public String targetEntity() { int o = __offset(14); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer targetEntityAsByteBuffer() { return __vector_as_bytebuffer(14, 1); }
-  public ByteBuffer targetEntityInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 14, 1); }
   /**
    * E.g. for virtual to-one target ID properties, this references the ToOne object
    */
   public String virtualTarget() { int o = __offset(16); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer virtualTargetAsByteBuffer() { return __vector_as_bytebuffer(16, 1); }
-  public ByteBuffer virtualTargetInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 16, 1); }
   /**
    * Secondary name ignored by core; e.g. may reference a binding specific name (e.g. Java property)
    */
   public String nameSecondary() { int o = __offset(18); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameSecondaryAsByteBuffer() { return __vector_as_bytebuffer(18, 1); }
-  public ByteBuffer nameSecondaryInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 18, 1); }
 
   public static void startModelProperty(FlatBufferBuilder builder) { builder.startObject(8); }
   public static void addId(FlatBufferBuilder builder, int idOffset) { builder.addStruct(0, idOffset, 0); }
diff --git a/objectbox-java/src/main/java/io/objectbox/model/ModelRelation.java b/objectbox-java/src/main/java/io/objectbox/model/ModelRelation.java
@@ -34,7 +34,6 @@ public final class ModelRelation extends Table {
   public IdUid id(IdUid obj) { int o = __offset(4); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; }
   public String name() { int o = __offset(6); return o != 0 ? __string(o + bb_pos) : null; }
   public ByteBuffer nameAsByteBuffer() { return __vector_as_bytebuffer(6, 1); }
-  public ByteBuffer nameInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 6, 1); }
   public IdUid targetEntityId() { return targetEntityId(new IdUid()); }
   public IdUid targetEntityId(IdUid obj) { int o = __offset(8); return o != 0 ? obj.__assign(o + bb_pos, bb) : null; }
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ dependencies {`
`19`	`19`	`compile fileTree(include: ['*.jar'], dir: 'libs')`
`20`	`20`	`compile project(':objectbox-java-api')`
`21`	`21`	`compile 'org.greenrobot:essentials:3.0.0-RC1'`
`22`		`- compile 'com.google.flatbuffers:flatbuffers-java:1.7.2'`
	`22`	`+ compile 'com.google.flatbuffers:flatbuffers-java:1.8.0'`
`23`	`23`	`compile 'com.google.code.findbugs:jsr305:3.0.2'`
`24`	`24`	`}`
`25`	`25`