Merge pull request #6 from aerospike/rest-1.1.1

Rest 1.1.1

build.gradle

@@ -3,7 +3,7 @@ buildscript {
 		springBootVersion = '2.1.1.RELEASE'
 		springfoxVersion = '2.9.2'
 		httpclientVersion = '4.5.8'
-		aerospikeClientVersion = findProperty('aerospikeClientVersion') ?:'4.4.1'
+		aerospikeClientVersion = findProperty('aerospikeClientVersion') ?:'4.4.2'
 	}
     if (findProperty("aerospikeUseLocal")) {
     print("using Local repo")

gradle.properties

@@ -1,2 +1,2 @@
-appVersion=1.1.0
+appVersion=1.1.1
 warBaseName=as-rest-client

src/main/java/com/aerospike/restclient/service/AerospikeClusterServiceV1.java

@@ -28,6 +28,7 @@
 import com.aerospike.restclient.handlers.ClusterHandler;
 import com.aerospike.restclient.handlers.InfoHandler;
 import com.aerospike.restclient.util.InfoResponseParser;
+import com.aerospike.restclient.util.RestClientErrors;
 
 @Service
 public class AerospikeClusterServiceV1 implements AerospikeClusterService {
@@ -124,6 +125,9 @@ private long getSetRecordCount(String namespace, String set) {
 			}
 			objects += InfoResponseParser.getSetObjectCountFromResponse(response);
 		}
+		if (responses.size() == 0 || replFactor == 0) {
+			throw new RestClientErrors.ClusterUnstableError("Cluster unstable, unable to return cluster information");
+		}
 		if (found) {
 			return objects / Math.min(responses.size(), replFactor);
 		}

src/main/java/com/aerospike/restclient/util/QueryParamDescriptors.java

@@ -8,7 +8,7 @@ public class QueryParamDescriptors {
 
 	public static final String POLICY_REPLICA_NOTES = "Replica algorithm used to determine the target node for a single record command.";
 	public static final String POLICY_REPLICA_ALLOWABLE_VALUES = "MASTER, MASTER_PROLES, SEQUENCE, RANDOM";
-	public static final String POLICY_REPLICA_DEFAULT = "false";
+	public static final String POLICY_REPLICA_DEFAULT = "SEQUENCE";
 
 	public static final String KEYTYPE_NOTES = "The Type of the userKey.";
 	public static final String KEYTYPE_ALLOWABLE_VALUES = "STRING, INTEGER, BYTES, DIGEST";
@@ -43,5 +43,5 @@ public class QueryParamDescriptors {
 	public static final String WRITE_POLICY_RECORD_EXISTS_NOTES = "How to handle the existence of the record. This is ignored for POST/PUT/UPDATE kvs methods.";
 	public static final String WRITE_POLICY_RECORD_EXISTS_DEFAULT = "UPDATE";
 	public static final String WRITE_POLICY_RECORD_EXISTS_ALLOWABLE_VALUES = "UPDATE, UPDATE_ONLY, REPLACE, REPLACE_ONLY, CREATE_ONLY";
-	
+
 }

src/main/java/com/aerospike/restclient/util/RestClientErrors.java

@@ -150,4 +150,20 @@ public InvalidDateFormat(String dateStr) {
 		}
 	}
 
+	public static class ClusterUnstableError extends AerospikeRestClientError {
+		private static final long serialVersionUID = 1L;
+		@Override
+		public HttpStatus getStatusCode() {
+			return HttpStatus.INTERNAL_SERVER_ERROR;
+		}
+
+		public ClusterUnstableError() {
+			this("Unable to complete operation, cluster is unstable.");
+		}
+
+		public ClusterUnstableError(String message) {
+			super(message);
+		}
+	}
+
 }

src/main/java/com/aerospike/restclient/util/converters/OperationConverter.java

@@ -147,6 +147,10 @@ public class OperationConverter {
 
 	@SuppressWarnings("unchecked")
 	public static Operation convertMapToOperation(Map<String, Object>operationMap) {
+		/* Make sure that the user is not providing additional top level keys */
+		hasAllRequiredKeys(operationMap, OPERATION_FIELD_KEY, OP_VALUES_KEY);
+		onlyHasAllowedKeys(operationMap, OPERATION_FIELD_KEY, OP_VALUES_KEY);
+
 		String opName = (String) operationMap.get(OPERATION_FIELD_KEY);
 		if (opName == null) {
 			throw new InvalidOperationError("Operation must contain the \"operation\" field");

src/test/java/com/aerospike/restclient/ASTestUtils.java

@@ -24,8 +24,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.net.ssl.SSLContext;
-
 import org.mockito.ArgumentMatcher;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;

src/test/java/com/aerospike/restclient/converters/OperationConverterErrors.java

@@ -48,6 +48,20 @@ public void testMissingOpValues() {
 		OperationConverter.convertMapToOperation(op);
 	}
 
+	/*
+	 * If the user accidentally provides an extra key at the top level, we should error out.
+	 */
+	@Test(expected=InvalidOperationError.class)
+	public void testAdditionalTopLevelValue() {
+		Map<String, Object>opValues = new HashMap<>();
+		Map<String, Object>op = new HashMap<>();
+		op.put(AerospikeAPIConstants.OPERATION_FIELD, AerospikeAPIConstants.OPERATION_READ);
+		op.put("An Extra", "Field");
+		opValues.put("bin", "binname");
+		op.put(AerospikeAPIConstants.OPERATION_VALUES_FIELD, opValues);
+		OperationConverter.convertMapToOperation(op);
+	}
+
 	@Test(expected=InvalidOperationError.class)
 	public void testMissingValueInOpvalue() {
 		/*