PropertyBuilder need to defer all properties into finish because of optional secondaryName

Author: greenrobot

objectbox-java/src/main/java/io/objectbox/ModelBuilder.java

@@ -48,50 +48,50 @@ public class ModelBuilder {
     Long lastRelationUid;
 
     public class PropertyBuilder {
-        /** Deferred, so we can still add strings after constructor. */
         private final int type;
+        private final int virtualTargetOffset;
+        private final int propertyNameOffset;
+        private final int targetEntityOffset;
+
+        private int secondaryNameOffset;
         boolean finished;
+        private int flags;
+        private int id;
+        private long uid;
+        private int indexId;
+        private long indexUid;
 
         PropertyBuilder(String name, String targetEntityName, String virtualTarget, int type) {
             this.type = type;
-            int propertyNameOffset = fbb.createString(name);
-            int targetEntityOffset = targetEntityName != null ? fbb.createString(targetEntityName) : 0;
-            int virtualTargetOffset = virtualTarget != null ? fbb.createString(virtualTarget) : 0;
-            ModelProperty.startModelProperty(fbb);
-            ModelProperty.addName(fbb, propertyNameOffset);
-            if (targetEntityOffset != 0) {
-                ModelProperty.addTargetEntity(fbb, targetEntityOffset);
-            }
-            if (virtualTargetOffset != 0) {
-                ModelProperty.addVirtualTarget(fbb, virtualTargetOffset);
-            }
+            propertyNameOffset = fbb.createString(name);
+            targetEntityOffset = targetEntityName != null ? fbb.createString(targetEntityName) : 0;
+            virtualTargetOffset = virtualTarget != null ? fbb.createString(virtualTarget) : 0;
         }
 
         public PropertyBuilder id(int id, long uid) {
             checkNotFinished();
-            int idOffset = IdUid.createIdUid(fbb, id, uid);
-            ModelProperty.addId(fbb, idOffset);
+            this.id = id;
+            this.uid = uid;
             return this;
         }
 
         public PropertyBuilder indexId(int indexId, long indexUid) {
             checkNotFinished();
-            int idOffset = IdUid.createIdUid(fbb, indexId, indexUid);
-            ModelProperty.addIndexId(fbb, idOffset);
+            this.indexId = indexId;
+            this.indexUid = indexUid;
             return this;
         }
 
         public PropertyBuilder flags(int flags) {
             checkNotFinished();
-            ModelProperty.addFlags(fbb, flags);
+            this.flags = flags;
             return this;
         }
 
         public PropertyBuilder secondaryName(String secondaryName) {
             checkNotFinished();
             if (secondaryName != null) {
-                int offset = fbb.createString(secondaryName);
-                ModelProperty.addNameSecondary(fbb, offset);
+                secondaryNameOffset = fbb.createString(secondaryName);
             }
             return this;
         }
@@ -105,7 +105,29 @@ private void checkNotFinished() {
         public int finish() {
             checkNotFinished();
             finished = true;
+            ModelProperty.startModelProperty(fbb);
+            ModelProperty.addName(fbb, propertyNameOffset);
+            if (targetEntityOffset != 0) {
+                ModelProperty.addTargetEntity(fbb, targetEntityOffset);
+            }
+            if (virtualTargetOffset != 0) {
+                ModelProperty.addVirtualTarget(fbb, virtualTargetOffset);
+            }
+            if (secondaryNameOffset != 0) {
+                ModelProperty.addNameSecondary(fbb, secondaryNameOffset);
+            }
+            if (id != 0) {
+                int idOffset = IdUid.createIdUid(fbb, id, uid);
+                ModelProperty.addId(fbb, idOffset);
+            }
+            if (indexId != 0) {
+                int indexIdOffset = IdUid.createIdUid(fbb, indexId, indexUid);
+                ModelProperty.addIndexId(fbb, indexIdOffset);
+            }
             ModelProperty.addType(fbb, type);
+            if (flags != 0) {
+                ModelProperty.addFlags(fbb, flags);
+            }
             return ModelProperty.endModelProperty(fbb);
         }
     }