updated client to new protocol buffer interface

- removed integer and aw-map types
- added dw flag and ew flag support
- fixed resolving of localhost as default host name
- version switch to 0.2.0

Author: mweberUKL

build.gradle

@@ -1,5 +1,5 @@
 group 'eu.antidotedb'
-version '0.1.0'
+version '0.2.0'
 
 apply plugin: 'java'
 apply plugin: 'maven'

src/main/java/eu/antidotedb/client/AntidoteConfigManager.java

@@ -110,7 +110,7 @@ public List<InetSocketAddress> getConfigHosts(String filepath) {
         String cfgPath = filepath;
         if (!this.configFileExist(cfgPath)) {
             // No File Found, returning default values
-            list.add(InetSocketAddress.createUnresolved(DEFAULT_HOST, DEFAULT_PORT));
+            list.add(new InetSocketAddress(DEFAULT_HOST, DEFAULT_PORT));
             return list;
         }
         File config = new File(cfgPath);

src/main/java/eu/antidotedb/client/FlagKey.java

@@ -0,0 +1,32 @@
+package eu.antidotedb.client;
+
+import com.google.protobuf.ByteString;
+import eu.antidotedb.antidotepb.AntidotePB;
+
+import javax.annotation.CheckReturnValue;
+
+public class FlagKey extends Key<Boolean> {
+
+    FlagKey(AntidotePB.CRDT_type type, ByteString key) {
+        super(type, key);
+    }
+
+    @Override
+    Boolean readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
+        return ResponseDecoder.flag().readResponseToValue(resp);
+    }
+
+    /**
+     * Creates an update operation which assigns a new value to the flag.
+     * <p>
+     * Use the methods on {@link Bucket} to execute the update.
+     */
+    @CheckReturnValue
+    public UpdateOpDefaultImpl assign(boolean value) {
+        AntidotePB.ApbFlagUpdate.Builder flagUpdateInstruction = AntidotePB.ApbFlagUpdate.newBuilder(); // The specific instruction in update instructions
+        flagUpdateInstruction.setValue(value); // Set increment
+        AntidotePB.ApbUpdateOperation.Builder updateOperation = AntidotePB.ApbUpdateOperation.newBuilder();
+        updateOperation.setFlagop(flagUpdateInstruction);
+        return new UpdateOpDefaultImpl(this, updateOperation);
+    }
+}

src/main/java/eu/antidotedb/client/IntegerKey.java

@@ -9,7 +9,7 @@
 
 /**
  * An Antidote key consists of a CRDT type and a corresponding key.
- * It can be used as a top-level-key of an Antidote object in a bucket or as a key in a map.
+ * It can be used as a top-level-key of an Antidote object in a bucket or as a key in a map_rr.
  * <p>
  * Use the static methods of this class to create keys for the respective CRDT types.
  */
@@ -95,21 +95,6 @@ public static CounterKey fatCounter(String key) {
         return fatCounter(ByteString.copyFromUtf8(key));
     }
 
-    /**
-     * An integer can be incremented and assigned to.
-     */
-    public static IntegerKey integer(ByteString key) {
-        return new IntegerKey(key);
-    }
-
-
-    /**
-     * An integer can be incremented and assigned to.
-     */
-    public static IntegerKey integer(String key) {
-        return integer(ByteString.copyFromUtf8(key));
-    }
-
     /**
      * A last-writer-wins register.
      *
@@ -233,26 +218,10 @@ public static SetKey<String> set_removeWins(String key) {
         return set_removeWins(key, ValueCoder.utf8String);
     }
 
-    /**
-     * An add-wins map.
-     * Updates win over concurrent deletes.
-     * Deleting an entry uses tombstones which are not garbage-collected.
-     */
-    public static MapKey map_aw(ByteString key) {
-        return new MapKey(AntidotePB.CRDT_type.AWMAP, key);
-    }
-
-    /**
-     * @see #map_aw(ByteString)
-     */
-    public static MapKey map_aw(String key) {
-        return map_aw(ByteString.copyFromUtf8(key));
-    }
-
-
     /**
      * Remove-resets map.
      * Removing an entry resets the corresponding CRDT.
+     * Entries using a CRDT that does not support resets cannot be removed form the map.
      * Therefore this map should mainly be used with embedded CRDTs that support a reset operation.
      * <p>
      * Reading the map only returns entries which have a value, where the internal state is not equal to the initial CRDT state.
@@ -285,6 +254,23 @@ public static MapKey map_g(String key) {
     }
 
 
+    public static FlagKey flag_ew(ByteString key) {
+        return new FlagKey(AntidotePB.CRDT_type.FLAG_EW, key);
+    }
+
+    public static FlagKey flag_ew(String key) {
+        return flag_ew(ByteString.copyFromUtf8(key));
+    }
+
+    public static FlagKey flag_dw(ByteString key) {
+        return new FlagKey(AntidotePB.CRDT_type.FLAG_DW, key);
+    }
+
+    public static FlagKey flag_dw(String key) {
+        return flag_ew(ByteString.copyFromUtf8(key));
+    }
+
+
     AntidotePB.ApbMapKey.Builder toApbMapKey() {
         AntidotePB.ApbMapKey.Builder builder = AntidotePB.ApbMapKey.newBuilder();
         builder.setType(type);
@@ -311,20 +297,18 @@ public static Key<?> create(AntidotePB.CRDT_type type, ByteString k) {
                 return register(k);
             case MVREG:
                 return multiValueRegister(k);
-            case INTEGER:
-                return integer(k);
             case GMAP:
                 return map_g(k);
-            case AWMAP:
-                return map_aw(k);
             case RWSET:
                 return set_removeWins(k);
             case RRMAP:
                 return map_rr(k);
             case FATCOUNTER:
                 return fatCounter(k);
-            case POLICY:
-                throw new RuntimeException("policy CRDT not yet supported");
+            case FLAG_EW:
+                return flag_ew(k);
+            case FLAG_DW:
+                return flag_dw(k);
             default:
                 throw new RuntimeException("CRDT not yet supported: " + type);
         }

src/main/java/eu/antidotedb/client/Key.java

@@ -26,28 +26,13 @@ Integer readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
         };
     }
 
-
-    public static ResponseDecoder<Long> integer() {
-        return new ResponseDecoder<Long>() {
-            @Override
-            Long readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
-                if (resp == null) {
-                    return 0L;
-                } else if (resp.getInt() == null) {
-                    throw new AntidoteException("Invalid response " + resp);
-                }
-                return resp.getInt().getValue();
-            }
-        };
-    }
-
     public static <T> ResponseDecoder<T> register(ValueCoder<T> format) {
         return new ResponseDecoder<T>() {
             @Override
             T readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
                 if (resp == null) {
                     return null;
-                } else if (resp.getReg() == null) {
+                } else if (!resp.hasReg()) {
                     throw new AntidoteException("Invalid response " + resp);
                 }
                 return format.decode(resp.getReg().getValue());
@@ -65,7 +50,7 @@ public static <T> ResponseDecoder<List<T>> multiValueRegister(ValueCoder<T> form
             List<T> readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
                 if (resp == null) {
                     return Collections.emptyList();
-                } else if (resp.getMvreg() == null) {
+                } else if (!resp.hasMvreg()) {
                     throw new AntidoteException("Invalid response " + resp);
                 }
                 return format.decodeList(resp.getMvreg().getValuesList());
@@ -83,7 +68,7 @@ public static <T> ResponseDecoder<List<T>> set(ValueCoder<T> format) {
             List<T> readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
                 if (resp == null) {
                     return Collections.emptyList();
-                } else if (resp.getSet() == null) {
+                } else if (!resp.hasSet()) {
                     throw new AntidoteException("Invalid response " + resp);
                 }
                 return format.decodeList(resp.getSet().getValueList());
@@ -102,13 +87,26 @@ public static <K> ResponseDecoder<MapKey.MapReadResult> map() {
             MapKey.MapReadResult readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
                 if (resp == null) {
                     return new MapKey.MapReadResult(Collections.emptyList());
-                } else if (resp.getCounter() == null) {
+                } else if (!resp.hasMap()) {
                     throw new AntidoteException("Invalid response " + resp);
                 }
                 return new MapKey.MapReadResult(resp.getMap().getEntriesList());
             }
         };
     }
 
+    public static ResponseDecoder<Boolean> flag() {
+        return new ResponseDecoder<Boolean>() {
+            @Override
+            Boolean readResponseToValue(AntidotePB.ApbReadObjectResp resp) {
+                if (resp == null) {
+                    return false;
+                } else if (!resp.hasFlag()) {
+                    throw new AntidoteException("Invalid response " + resp);
+                }
+                return resp.getFlag().getValue();
+            }
+        };
+    }
 
 }

src/main/java/eu/antidotedb/client/ResponseDecoder.java

@@ -21,13 +21,13 @@
  * <li>{@link eu.antidotedb.client.Key#register register}
  * <li>{@link eu.antidotedb.client.Key#multiValueRegister multiValueRegister}
  * <li>{@link eu.antidotedb.client.Key#counter counter}
- * <li>{@link eu.antidotedb.client.Key#integer integer}
  * <li>{@link eu.antidotedb.client.Key#fatCounter fatCounter}
  * <li>{@link eu.antidotedb.client.Key#map_g map_g}
- * <li>{@link eu.antidotedb.client.Key#map_aw map_aw}
  * <li>{@link eu.antidotedb.client.Key#map_rr map_rr}
  * <li>{@link eu.antidotedb.client.Key#set_removeWins set_removeWins}
  * <li>{@link eu.antidotedb.client.Key#set set}
+ * <li>{@link eu.antidotedb.client.Key#flag_ew flag_ew}
+ * <li>{@link eu.antidotedb.client.Key#flag_dw flag_dw}
  * <p>
  * </li>
  * </ul>

src/main/java/eu/antidotedb/client/package-info.java

@@ -8,18 +8,15 @@ enum CRDT_type {
     ORSET = 4;
     LWWREG = 5;
     MVREG = 6;
-    INTEGER = 7;
     GMAP = 8;
-    AWMAP = 9;
     RWSET = 10;
     RRMAP = 11;
     FATCOUNTER = 12;
-    POLICY = 13;
+    FLAG_EW = 13;
+    FLAG_DW = 14;
 }
 
-
-//------------------
-// Error messages
+// Riak Error response
 message ApbErrorResp {
     required bytes errmsg = 1;
     required uint32 errcode = 2;
@@ -83,33 +80,6 @@ message ApbGetMVRegResp {
     repeated bytes values = 1;
 }
 
-
-//------------------
-// Policy
-
-message ApbPolicyUpdate {
-  repeated bytes permissions = 1;
-}
-
-message ApbGetPolicyResp {
-  repeated bytes permissions = 1;
-}
-
-//------------------
-// Integer
-
-message ApbIntegerUpdate {
-    // choose one of the following:
-    // increment the integer
-    optional sint64 inc = 1;
-    // set the integer to a number
-    optional sint64 set = 2;
-}
-
-message ApbGetIntegerResp {
-    required sint64 value = 1;
-}
-
 //------------------
 // Map
 
@@ -138,6 +108,18 @@ message ApbMapEntry {
     required ApbReadObjectResp value = 2;
 }
 
+//-------------------
+// Flags
+
+message ApbFlagUpdate {
+    required bool value = 1;
+}
+
+message ApbGetFlagResp {
+    required bool value = 1;
+}
+
+
 
 // General reset operation
 message ApbCrdtReset {
@@ -182,10 +164,9 @@ message ApbUpdateOperation { // TODO use this above
     optional ApbCounterUpdate counterop = 1;
     optional ApbSetUpdate setop = 2;
     optional ApbRegUpdate regop = 3;
-    optional ApbIntegerUpdate integerop = 4;
     optional ApbMapUpdate mapop = 5;
     optional ApbCrdtReset resetop = 6;
-    optional ApbPolicyUpdate policyop = 7;
+    optional ApbFlagUpdate flagop = 7;
 }
 
 // Objects to be updated
@@ -235,9 +216,8 @@ message ApbReadObjectResp {
     optional ApbGetSetResp set = 2;
     optional ApbGetRegResp reg = 3;
     optional ApbGetMVRegResp mvreg = 4;
-    optional ApbGetIntegerResp int = 5;
     optional ApbGetMapResp map = 6;
-    optional ApbGetPolicyResp policy = 7;
+    optional ApbGetFlagResp flag = 7;
 }
 message ApbReadObjectsResp {
     required bool success = 1;