Rename ifSame to ifCurrent

Author: Burak Serdar

crud/src/main/java/com/redhat/lightblue/crud/DeleteRequest.java

@@ -29,31 +29,10 @@
 /**
  * Request to delete documents matching a query
  */
-public class DeleteRequest extends Request implements WithQuery, WithIfSame {
+public class DeleteRequest extends Request implements WithQuery {
 
     private QueryExpression query;
-    private boolean ifSameOnly;
-    private List<String> documentVersions;
 
-    @Override
-    public boolean isIfSameOnly() {
-        return ifSameOnly;
-    }
-
-    @Override
-    public void setIfSameOnly(boolean b) {
-        ifSameOnly=b;
-    }
-
-    @Override
-    public List<String> getDocumentVersions() {
-        return documentVersions;
-    }
-
-    @Override
-    public void setDocumentVersions(List<String> s) {
-        documentVersions=s;
-    }
 
     /**
      * The query whose result set will be deleted
@@ -84,7 +63,6 @@ public JsonNode toJson() {
         if (query != null) {
             node.set("query", query.toJson());
         }
-        WithIfSame.toJson(this,node);
         return node;
     }
 
@@ -100,7 +78,6 @@ public static DeleteRequest fromJson(ObjectNode node) {
         if (x != null) {
             req.query = QueryExpression.fromJson(x);
         }
-        WithIfSame.fromJson(req,node);
         return req;
     }
 }

crud/src/main/java/com/redhat/lightblue/crud/SaveRequest.java

@@ -27,23 +27,23 @@
 /**
  * Request to save documents
  */
-public class SaveRequest extends DocRequest implements WithRange, WithProjection, WithIfSame {
+public class SaveRequest extends DocRequest implements WithRange, WithProjection, WithIfCurrent {
 
     private Projection returnFields;
     private boolean upsert;
     private Long from;
     private Long to;
-    private boolean ifSameOnly;
+    private boolean ifCurrentOnly;
     private List<String> documentVersions;
 
     @Override
-    public boolean isIfSameOnly() {
-        return ifSameOnly;
+    public boolean isIfCurrentOnly() {
+        return ifCurrentOnly;
     }
 
     @Override
-    public void setIfSameOnly(boolean b) {
-        ifSameOnly=b;
+    public void setIfCurrentOnly(boolean b) {
+        ifCurrentOnly=b;
     }
 
     @Override
@@ -124,7 +124,7 @@ public JsonNode toJson() {
             node.set("projection", returnFields.toJson());
         }
         node.put("upsert", upsert);
-        WithIfSame.toJson(this,node);
+        WithIfCurrent.toJson(this,node);
         WithRange.toJson(this, getFactory(), node);
         return node;
     }
@@ -143,7 +143,7 @@ public static SaveRequest fromJson(ObjectNode node) {
         if (x != null) {
             req.upsert = x.asBoolean();
         }
-        WithIfSame.fromJson(req,node);
+        WithIfCurrent.fromJson(req,node);
         Range r = WithRange.fromJson(node);
         req.setFrom(r.from);
         req.setTo(r.to);

crud/src/main/java/com/redhat/lightblue/crud/UpdateRequest.java

@@ -30,24 +30,24 @@
 /**
  * Request to update documents based on a query
  */
-public class UpdateRequest extends Request implements WithQuery, WithProjection, WithRange, WithIfSame {
+public class UpdateRequest extends Request implements WithQuery, WithProjection, WithRange, WithIfCurrent {
 
     private QueryExpression query;
     private UpdateExpression updateExpression;
     private Projection returnFields;
     private Long from;
     private Long to;
-    private boolean ifSameOnly;
+    private boolean ifCurrentOnly;
     private List<String> documentVersions;
 
     @Override
-    public boolean isIfSameOnly() {
-        return ifSameOnly;
+    public boolean isIfCurrentOnly() {
+        return ifCurrentOnly;
     }
 
     @Override
-    public void setIfSameOnly(boolean b) {
-        ifSameOnly=b;
+    public void setIfCurrentOnly(boolean b) {
+        ifCurrentOnly=b;
     }
 
     @Override
@@ -146,7 +146,7 @@ public JsonNode toJson() {
         if (returnFields != null) {
             node.set("projection", returnFields.toJson());
         }
-        WithIfSame.toJson(this,node);
+        WithIfCurrent.toJson(this,node);
         WithRange.toJson(this, getFactory(), node);
         return node;
     }
@@ -169,7 +169,7 @@ public static UpdateRequest fromJson(ObjectNode node) {
         if (x != null) {
             req.returnFields = Projection.fromJson(x);
         }
-        WithIfSame.fromJson(req,node);
+        WithIfCurrent.fromJson(req,node);
         Range r = WithRange.fromJson(node);
         req.setFrom(r.from);
         req.setTo(r.to);

crud/src/main/java/com/redhat/lightblue/crud/WithIfSame.java renamed to crud/src/main/java/com/redhat/lightblue/crud/WithIfCurrent.java

@@ -33,25 +33,25 @@
 /**
  * Marker interface for requests containing if-same flag, and doc versions
  */
-public interface WithIfSame {
+public interface WithIfCurrent {
 
     /**
      * Returns true if the is-samne-only flag is set.
      */
-    boolean isIfSameOnly();
-    void setIfSameOnly(boolean b);
+    boolean isIfCurrentOnly();
+    void setIfCurrentOnly(boolean b);
 
     /**
-     * The list of document versions. If isIfSameOnly()==true, then,
+     * The list of document versions. If isIfCurrentOnly()==true, then,
      * only the documents that are in this list will be updated, and
      * only if their versions are the same.
      */
     List<String> getDocumentVersions();
     void setDocumentVersions(List<String> s);
 
-    public static void toJson(WithIfSame w,ObjectNode parent) {
-        if(w!=null&&w.isIfSameOnly()) {            
-            parent.set("onlyIfSame",JsonNodeFactory.instance.booleanNode(true));
+    public static void toJson(WithIfCurrent w,ObjectNode parent) {
+        if(w!=null&&w.isIfCurrentOnly()) {            
+            parent.set("onlyIfCurrent",JsonNodeFactory.instance.booleanNode(true));
             List<String> versions=w.getDocumentVersions();
             if(versions!=null&&!versions.isEmpty()) {
                 ArrayNode arr=JsonNodeFactory.instance.arrayNode();
@@ -62,10 +62,10 @@ public static void toJson(WithIfSame w,ObjectNode parent) {
         }
     }
 
-    public static void fromJson(WithIfSame dest,ObjectNode node) {
-        JsonNode x=node.get("onlyIfSame");
+    public static void fromJson(WithIfCurrent dest,ObjectNode node) {
+        JsonNode x=node.get("onlyIfCurrent");
         if(x instanceof ValueNode && x.booleanValue()) {
-            dest.setIfSameOnly(true);
+            dest.setIfCurrentOnly(true);
             x=node.get("documentVersions");
             if(x instanceof ArrayNode) {
                 List<String> versions=new ArrayList<>(x.size());
@@ -78,7 +78,7 @@ public static void fromJson(WithIfSame dest,ObjectNode node) {
                 dest.setDocumentVersions(versions);
             }
         } else {
-            dest.setIfSameOnly(false);
+            dest.setIfCurrentOnly(false);
         }
     }
 }

crud/src/main/java/com/redhat/lightblue/mediator/Mediator.java

@@ -53,7 +53,7 @@
 import com.redhat.lightblue.crud.UpdateRequest;
 import com.redhat.lightblue.crud.WithQuery;
 import com.redhat.lightblue.crud.WithRange;
-import com.redhat.lightblue.crud.WithIfSame;
+import com.redhat.lightblue.crud.WithIfCurrent;
 import com.redhat.lightblue.assoc.AnalyzeQuery;
 import com.redhat.lightblue.assoc.QueryFieldInfo;
 import com.redhat.lightblue.eval.FieldAccessRoleEvaluator;
@@ -670,9 +670,9 @@ public BulkResponse bulkRequest(BulkRequest requests) {
 
     protected OperationContext newCtx(Request request, CRUDOperation CRUDOperation) {
         OperationContext ctx=new OperationContext(request, metadata, factory, CRUDOperation);
-        if(request instanceof WithIfSame) {
-            WithIfSame wif=(WithIfSame)request;
-            if(wif.isIfSameOnly()) {
+        if(request instanceof WithIfCurrent) {
+            WithIfCurrent wif=(WithIfCurrent)request;
+            if(wif.isIfCurrentOnly()) {
                 ctx.setUpdateIfCurrent(true);
                 List<String> list=wif.getDocumentVersions();
                 if(list!=null)

crud/src/main/resources/json-schema/deleteRequest.json

@@ -34,7 +34,7 @@
            "query": {
                "$ref": "/json-schema/crudCommon.json#/definitions/query"
            },
-            "onlyIfSame":{
+            "onlyIfCurrent":{
                 "type":"boolean",
                 "description":"If true, perform the operation only if document version is unchanged"
             },

crud/src/main/resources/json-schema/saveRequest.json

@@ -45,7 +45,7 @@
              "type": "boolean",
              "default": false
          },
-         "onlyIfSame":{
+         "onlyIfCurrent":{
              "type":"boolean",
              "description":"If true, perform the operation only if document version is unchanged"
          },

crud/src/main/resources/json-schema/updateRequest.json

@@ -48,7 +48,7 @@
                  }
              ]
          },
-         "onlyIfSame":{
+         "onlyIfCurrent":{
              "type":"boolean",
              "description":"If true, perform the operation only if document version is unchanged"
          },