googleapis
diff --git a/‎src/main/java/com/google/gcloud/datastore/KeyMapValue.java‎
Lines changed: 0 additions & 41 deletions b/‎src/main/java/com/google/gcloud/datastore/KeyMapValue.java‎
Lines changed: 0 additions & 41 deletions
diff --git a/‎src/main/java/com/google/gcloud/datastore/MapValueProperty.java‎
Lines changed: 63 additions & 0 deletions b/‎src/main/java/com/google/gcloud/datastore/MapValueProperty.java‎
Lines changed: 63 additions & 0 deletions
diff --git a/‎src/main/java/com/google/gcloud/datastore/NullProperty.java‎
Lines changed: 35 additions & 19 deletions b/‎src/main/java/com/google/gcloud/datastore/NullProperty.java‎
Lines changed: 35 additions & 19 deletions
@@ -0,0 +1,63 @@
+package com.google.gcloud.datastore;
+
+import com.google.api.services.datastore.DatastoreV1.Value;
+import com.google.common.collect.ImmutableMap;
+
+import java.util.Map;
+
+public class MapValueProperty extends Property<String, StringProperty, StringProperty.Builder> {
+
+  private final Key key;
+  private final ImmutableMap<String, Property> values;
+
+  static final Marshaller<MapValueProperty> MARSHALLER = new Marshaller<MapValueProperty>() {
+    @Override
+    MapValueProperty get(Value proto, boolean indexed, Integer meaning) {
+      // TODO: implement
+      return new MapValueProperty(indexed);
+    }
+
+    @Override
+    public Builder<MapValueProperty> newBuilder() {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    @Override
+    public MapValueProperty fromProto(Value proto) {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    @Override
+    public Value toProto(MapValueProperty property) {
+      // TODO Auto-generated method stub
+      return null;
+    }
+
+    @Override
+    public int getProtoFieldId() {
+      return ENTITY_VALUE_FIELD_NUMBER;;
+    }
+  };
+
+  MapValueProperty(boolean indexed) {
+    super(Type.KEY_MAP_VALUE, indexed, 0);
+    key = null;
+    values = null;
+    // TODO Auto-generated constructor stub
+  }
+
+  public Key getKey() {
+    return key;
+  }
+
+  public Map<String, Property> getValues() {
+    return values;
+  }
+
+  @Override
+  protected void addValueToProto(Builder builder) {
+    // TODO Auto-generated method stub
+  }
+}
@@ -1,30 +1,56 @@
 package com.google.gcloud.datastore;
 
+import static com.google.common.base.Preconditions.checkArgument;
+
 import com.google.api.services.datastore.DatastoreV1.Value;
 
-public final class NullProperty extends Property<NullProperty> {
+public final class NullProperty extends Property<Void, NullProperty, NullProperty.Builder> {
+
+  static final Marshaller<Void, NullProperty, Builder> MARSHALLER =
+      new BaseMarshaller<Void, NullProperty, Builder>() {
+
+    @Override
+    public Builder newBuilder() {
+      return new Builder();
+    }
+
+    @Override
+    public int getProtoFieldId() {
+      return 0;
+    }
+
+    @Override
+    protected void set(Value from, Builder to) {
+      // nothing to set
+    }
 
-  static final Provider<NullProperty> PROVIDER = new Provider<NullProperty>() {
     @Override
-    NullProperty get(Value proto, boolean indexed, Integer meaning) {
-      return new NullProperty(indexed, meaning);
+    protected void set(NullProperty from, Value.Builder to) {
+      // nothing to set
     }
   };
 
-  public static class Builder extends Property.Builder<NullProperty> {
+  public static final class Builder extends Property.Builder<Void, NullProperty, Builder> {
 
     public Builder() {
       super(Type.NULL);
     }
 
-    public Builder(NullProperty property) {
-      super(property);
-    }
-
     @Override
     public NullProperty build() {
       return new NullProperty(this);
     }
+
+    @Override
+    public Void validate(Void value) {
+      checkArgument(value == null, "Only null values are allowed");
+      return null;
+    }
+
+    @Override
+    protected Builder self() {
+      return this;
+    }
   }
 
   public NullProperty() {
@@ -34,14 +60,4 @@ public NullProperty() {
   NullProperty(Builder builder) {
     super(builder);
   }
-
-  @Override
-  protected void addValueToProto(Value.Builder builder) {
-    // set nothing
-  }
-
-  @Override
-  public Property.Builder<NullProperty> toBuilder() {
-    return new Builder(this);
-  }
 }