QueryCacheProperties Mode in enum

Author: Mark

src/main/java/com/arangodb/entity/EntityDeserializers.java

@@ -37,6 +37,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.arangodb.entity.CollectionEntity.Figures;
+import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
 import com.arangodb.entity.ReplicationApplierState.LastError;
 import com.arangodb.entity.ReplicationApplierState.Progress;
 import com.arangodb.entity.ReplicationInventoryEntity.Collection;
@@ -2302,7 +2303,8 @@ public QueryCachePropertiesEntity deserialize(
 			final QueryCachePropertiesEntity entity = deserializeBaseParameter(obj, new QueryCachePropertiesEntity());
 
 			if (obj.has("mode")) {
-				entity.setMode(obj.getAsJsonPrimitive("mode").getAsString());
+				final String modeAsString = obj.getAsJsonPrimitive("mode").getAsString();
+				entity.setMode(CacheMode.valueOf(modeAsString));
 			}
 
 			if (obj.has("maxResults")) {

src/main/java/com/arangodb/entity/QueryCachePropertiesEntity.java

@@ -21,11 +21,15 @@
  */
 public class QueryCachePropertiesEntity extends BaseEntity {
 
+	public enum CacheMode {
+		off, on, demand;
+	}
+
 	/**
 	 * The mode the AQL query cache operates in. The mode is one of the
 	 * following values: "off", "on" or "demand".
 	 */
-	private String mode;
+	private CacheMode mode;
 
 	/**
 	 * The maximum number of query results that will be stored per
@@ -41,7 +45,7 @@ public QueryCachePropertiesEntity() {
 	 * 
 	 * @return The mode is one of the following values: "off", "on" or "demand".
 	 */
-	public String getMode() {
+	public CacheMode getMode() {
 		return mode;
 	}
 
@@ -52,7 +56,7 @@ public String getMode() {
 	 *            The mode is one of the following values: "off", "on" or
 	 *            "demand".
 	 */
-	public void setMode(String mode) {
+	public void setMode(CacheMode mode) {
 		this.mode = mode;
 	}
 

src/test/java/com/arangodb/ArangoDriverDocumentCursorTest.java

@@ -30,6 +30,7 @@
 
 import com.arangodb.entity.DocumentEntity;
 import com.arangodb.entity.QueryCachePropertiesEntity;
+import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
 import com.arangodb.util.AqlQueryOptions;
 import com.arangodb.util.MapBuilder;
 import com.arangodb.util.TestUtils;
@@ -154,7 +155,7 @@ public void test_withCache() throws ArangoException {
 		if (isMinimumVersion(TestUtils.VERSION_2_7)) {
 			// start caching
 			final QueryCachePropertiesEntity properties = new QueryCachePropertiesEntity();
-			properties.setMode("on");
+			properties.setMode(CacheMode.on);
 			driver.setQueryCacheProperties(properties);
 
 			final String query = "FOR t IN unit_test_query_test FILTER t.age >= @age SORT t.age RETURN t";

src/test/java/com/arangodb/ArangoDriverQueryCacheTest.java

@@ -23,6 +23,7 @@
 
 import com.arangodb.entity.DefaultEntity;
 import com.arangodb.entity.QueryCachePropertiesEntity;
+import com.arangodb.entity.QueryCachePropertiesEntity.CacheMode;
 import com.arangodb.util.TestUtils;
 
 /**
@@ -53,25 +54,23 @@ public void test_getQueryCacheProperties() throws ArangoException {
 
 	@Test
 	public void test_setQueryCacheProperties() throws ArangoException {
-		final String on = "on";
-		final String off = "off";
 
 		if (isMinimumVersion(TestUtils.VERSION_2_7)) {
 			final QueryCachePropertiesEntity properties = new QueryCachePropertiesEntity();
-			properties.setMode(on);
+			properties.setMode(CacheMode.on);
 			properties.setMaxResults(100L);
 
 			QueryCachePropertiesEntity ret = driver.setQueryCacheProperties(properties);
 			assertEquals(200, ret.getStatusCode());
-			assertEquals(on, ret.getMode());
+			assertEquals(CacheMode.on, ret.getMode());
 			assertEquals(new Long(100L), ret.getMaxResults());
 
-			properties.setMode(off);
+			properties.setMode(CacheMode.off);
 			properties.setMaxResults(200L);
 
 			ret = driver.setQueryCacheProperties(properties);
 			assertEquals(200, ret.getStatusCode());
-			assertEquals(off, ret.getMode());
+			assertEquals(CacheMode.off, ret.getMode());
 			assertEquals(new Long(200L), ret.getMaxResults());
 		}
 	}