remove fields in list commands which are no longer needed #16

Author: rbi

kryo-serializer/src/main/java/de/saxsys/synchronizefx/kryo/serializer/AddToListSerializer.java

@@ -44,13 +44,11 @@ public void write(final Kryo kryo, final Output output, final AddToList object)
         kryo.writeObject(output, object.getListVersionChange().getToVersion());
         kryo.writeObject(output, object.getValue());
         output.writeInt(object.getPosition());
-        output.writeInt(object.getNewSize());
     }
 
     @Override
     public AddToList read(final Kryo kryo, final Input input, final Class<AddToList> type) {
         return new AddToList(kryo.readObject(input, UUID.class), new ListVersionChange(kryo.readObject(input,
-                UUID.class), kryo.readObject(input, UUID.class)), kryo.readObject(input, Value.class), input.readInt(),
-                input.readInt());
+                UUID.class), kryo.readObject(input, UUID.class)), kryo.readObject(input, Value.class), input.readInt());
     }
 }

kryo-serializer/src/main/java/de/saxsys/synchronizefx/kryo/serializer/RemoveFromListSerializer.java

@@ -44,13 +44,12 @@ public void write(final Kryo kryo, final Output output, final RemoveFromList inp
         kryo.writeObject(output, input.getListVersionChange().getToVersion());
         output.writeInt(input.getStartPosition());
         output.writeInt(input.getRemoveCount());
-        output.writeInt(input.getNewSize());
     }
 
     @Override
     public RemoveFromList read(final Kryo kryo, final Input input, final Class<RemoveFromList> clazz) {
         return new RemoveFromList(kryo.readObject(input, UUID.class), new ListVersionChange(kryo.readObject(input,
-                UUID.class), kryo.readObject(input, UUID.class)), input.readInt(), input.readInt(), input.readInt());
+                UUID.class), kryo.readObject(input, UUID.class)), input.readInt(), input.readInt());
     }
 
 }

synchronizefx-core/src/main/java/de/saxsys/synchronizefx/core/metamodel/commands/AddToList.java

@@ -30,7 +30,6 @@ public class AddToList extends ListCommand {
 
     private final Value value;
     private final int position;
-    private final int newSize;
 
     /**
      * Initializes an instance.
@@ -46,31 +45,9 @@ public class AddToList extends ListCommand {
      */
     public AddToList(final UUID listId, final ListVersionChange listVersionChange, final Value value, //
             final int position) {
-        this(listId, listVersionChange, value, position, -1);
-    }
-
-    /**
-     * Initializes an instance with a size value.
-     * 
-     * @param listId
-     *            see {@link #getListId()}
-     * @param listVersionChange
-     *            see {@link #getListVersionChange()}
-     * @param value
-     *            see {@link #getValue()}
-     * @param position
-     *            see {@link #getPosition()}
-     * @param newSize
-     *            see {@link #getNewSize()}
-     * @deprecated since newSize is no longer used in the new self repairing implementation.
-     */
-    @Deprecated
-    public AddToList(final UUID listId, final ListVersionChange listVersionChange, final Value value,
-            final int position, final int newSize) {
         super(listId, listVersionChange);
         this.value = value;
         this.position = position;
-        this.newSize = newSize;
     }
 
     /**
@@ -94,21 +71,9 @@ public Value getValue() {
         return value;
     }
 
-    /**
-     * The new size the list should have after this command has been executed on it.
-     * 
-     * @deprecated The new self repairing algorithm will not use this information.
-     * @return the new size
-     */
-    @Deprecated
-    public int getNewSize() {
-        return newSize;
-    }
-
     @Override
     public String toString() {
-        return "AddToList [value=" + value + ", position=" + position + ", newSize=" + newSize + ", ListVersionChange="
-                + super.toString() + "]";
+        return "AddToList [value=" + value + ", position=" + position + ", ListVersionChange=" + super.toString() + "]";
     }
 
 }

synchronizefx-core/src/main/java/de/saxsys/synchronizefx/core/metamodel/commands/RemoveFromList.java

@@ -30,7 +30,6 @@ public class RemoveFromList extends ListCommand {
 
     private final int startPosition;
     private final int removeCount;
-    private final int newSize;
 
     /**
      * Initializes an instance.
@@ -46,31 +45,9 @@ public class RemoveFromList extends ListCommand {
      */
     public RemoveFromList(final UUID listId, final ListVersionChange listVersionChange, final int startPosition,
             final int removeCount) {
-        this(listId, listVersionChange, startPosition, removeCount, -1);
-    }
-
-    /**
-     * Initializes an instance.
-     * 
-     * @param listId
-     *            see {@link #getListId()}
-     * @param listVersionChange
-     *            see {@link #getListVersionChange()}
-     * @param startPosition
-     *            see {@link #getStartPosition()}
-     * @param removeCount
-     *            see {@link #getRemoveCount()}
-     * @param newSize
-     *            see {@link #getNewSize()}
-     * @deprecated since newSize is no longer used in the new self repairing implementation.
-     */
-    @Deprecated
-    public RemoveFromList(final UUID listId, final ListVersionChange listVersionChange, final int startPosition,
-            final int removeCount, final int newSize) {
         super(listId, listVersionChange);
         this.startPosition = startPosition;
         this.removeCount = removeCount;
-        this.newSize = newSize;
     }
 
     /**
@@ -91,19 +68,10 @@ public int getRemoveCount() {
         return removeCount;
     }
 
-    /**
-     * The new size the list should have after this command has been executed on it.
-     * 
-     * @return the new size
-     */
-    public int getNewSize() {
-        return newSize;
-    }
-
     @Override
     public String toString() {
-        return "RemoveFromList [startPosition=" + startPosition + ", removeCount=" + removeCount + ", newSize="
-                + newSize + ", ListVersionChange=" + super.toString() + "]";
+        return "RemoveFromList [startPosition=" + startPosition + ", removeCount=" + removeCount
+                + ", ListVersionChange=" + super.toString() + "]";
     }
 
 }

synchronizefx-core/src/test/java/de/saxsys/synchronizefx/core/metamodel/SyncListPropertyTest.java

@@ -94,7 +94,6 @@ public void testAdd() {
         assertEquals("Test Value 257", msg1.getValue().getSimpleObjectValue());
         assertNull(msg1.getValue().getObservableObjectId());
         assertEquals(0, msg1.getPosition());
-        assertEquals(1, msg1.getNewSize());
 
         // test adding of a observable object
         root.childList.add(new Child());
@@ -105,14 +104,12 @@ public void testAdd() {
         assertEquals(Child.class.getName(), msg2.getClassName());
         assertNull(msg3.getValue().getSimpleObjectValue());
         assertEquals(msg2.getObjectId(), msg3.getValue().getObservableObjectId());
-        assertEquals(1, msg3.getNewSize());
 
         // test that the position is set correctly
         root.wrappedList.add("some text");
         root.wrappedList.add(1, "some more text");
         final AddToList msg4 = (AddToList) cb.getCommands().get(0);
         assertEquals(1, msg4.getPosition());
-        assertEquals(3, msg4.getNewSize());
 
     }
 
@@ -128,25 +125,21 @@ public void testRemove() {
         final RemoveFromList msg0 = (RemoveFromList) cb.getCommands().get(0);
         assertEquals(2, msg0.getStartPosition());
         assertEquals(1, msg0.getRemoveCount());
-        assertEquals(3, msg0.getNewSize());
 
         root.wrappedList.remove("Test Value 0");
         final RemoveFromList msg1 = (RemoveFromList) cb.getCommands().get(0);
         assertEquals(0, msg1.getStartPosition());
         assertEquals(1, msg1.getRemoveCount());
-        assertEquals(2, msg1.getNewSize());
 
         root.childList.remove(new Child(2));
         final RemoveFromList msg2 = (RemoveFromList) cb.getCommands().get(0);
         assertEquals(2, msg2.getStartPosition());
         assertEquals(1, msg2.getRemoveCount());
-        assertEquals(2, msg2.getNewSize());
 
         root.childList.remove(1);
         final RemoveFromList msg3 = (RemoveFromList) cb.getCommands().get(0);
         assertEquals(1, msg3.getStartPosition());
         assertEquals(1, msg3.getRemoveCount());
-        assertEquals(1, msg3.getNewSize());
     }
 
     /**
@@ -175,22 +168,21 @@ public void testReplace() {
         assertNull(replaceCommand2.getValue().getSimpleObjectValue());
         assertNotNull(replaceCommand2.getValue().getObservableObjectId());
     }
-    
+
     /**
      * Tests whether the {@link List#clear()} operation removes all elements from the list.
      */
     @Test
     public void testClear() {
         simpleTestData();
-        
+
         root.wrappedList.clear();
 
         final Command command = cb.getCommands().get(0);
         assertTrue(command instanceof RemoveFromList);
         final RemoveFromList replaceCommand = (RemoveFromList) command;
         assertEquals(0, replaceCommand.getStartPosition());
         assertEquals(4, replaceCommand.getRemoveCount());
-        assertEquals(0, replaceCommand.getNewSize());
     }
 
     /**