Merge pull request #5395 from marcomarasca/PLFM-9198

PLFM-9198: Small refactoring and missing test

Author: marcomarasca

lib/lib-grid/src/main/java/org/sagebionetworks/repo/model/grid/patch/ConType.java

@@ -1,11 +1,58 @@
 package org.sagebionetworks.repo.model.grid.patch;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+
 /**
  * The value of a con node is JSON-like value. The value can be any JSON value,
  * including null, true, false, numbers, strings, arrays, objects, binary blobs,
  * undefined value, and logical clock timestamp
  */
 public enum ConType {
 
-	NULL, BOOLEAN, LONG, DOUBLE, STRING, JSON_ARRAY, JSON_OBJECT, UNDEFINED, TIMESTAMP;
+	NULL, 
+	BOOLEAN(Boolean.class), 
+	LONG(Long.class, Integer.class, Short.class), 
+	DOUBLE(Double.class, Float.class), 
+	STRING(String.class), 
+	JSON_ARRAY(JSONArray.class), 
+	JSON_OBJECT(JSONObject.class),	
+	TIMESTAMP(LogicalTimestamp.class),
+	UNDEFINED;
+	
+	private Class<?>[] supportedClasses;
+	
+	private ConType(Class<?> ...classes) {
+		this.supportedClasses = classes;
+	}
+	
+	public Class<?>[] getSupportedClasses() {
+		return supportedClasses;
+	}
+	
+	private static final Map<Class<?>, ConType> CLASS_MAP = new HashMap<>();
+	
+	static {
+		for (ConType type : ConType.values()) {
+			
+			if (type.supportedClasses == null || type.supportedClasses.length == 0) {
+				continue;
+			}
+			
+			for (Class<?> clazz : type.supportedClasses) {
+				CLASS_MAP.put(clazz, type);
+			}
+		}
+	}
+	
+	public static ConType fromValue(Object value) {
+		if (value == null) {
+			return NULL;
+		}
+		return CLASS_MAP.getOrDefault(value.getClass(), UNDEFINED);
+	}
+	
 }

lib/lib-grid/src/test/java/org/sagebionetworks/repo/model/grid/patch/ConTypeTest.java

@@ -0,0 +1,65 @@
+package org.sagebionetworks.repo.model.grid.patch;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.EnumSource.Mode;
+
+public class ConTypeTest {
+
+	@ParameterizedTest
+	@EnumSource(value = ConType.class, mode = Mode.EXCLUDE, names = {"NULL", "UNDEFINED"})
+	public void testFromValue(ConType expectedType) {		
+		for (Class<?> clazz : expectedType.getSupportedClasses()) {
+			assertEquals(expectedType, ConType.fromValue(getTestValue(clazz)));
+		}
+	}
+	
+	private Object getTestValue(Class<?> clazz) {
+		if (Boolean.class.isAssignableFrom(clazz)) {
+			return true;
+		}
+		if (Long.class.isAssignableFrom(clazz)) {
+			return 123L;
+		}
+		if (Integer.class.isAssignableFrom(clazz)) {
+			return 123;
+		}
+		if (Short.class.isAssignableFrom(clazz)) {
+			return Short.valueOf("1");
+		}
+		if (Double.class.isAssignableFrom(clazz)) {
+			return 123.0D;
+		}
+		if (Float.class.isAssignableFrom(clazz)) {
+			return 123f;
+		}
+		if (String.class.isAssignableFrom(clazz)) {
+			return "123";
+		}
+		if (JSONArray.class.isAssignableFrom(clazz)) {
+			return new JSONArray();
+		}
+		if (JSONObject.class.isAssignableFrom(clazz)) {
+			return new JSONObject();
+		}
+		if (LogicalTimestamp.class.isAssignableFrom(clazz)) {
+			return new LogicalTimestamp();
+		}
+		throw new IllegalStateException("Unsuported class " + clazz + ".");
+	}
+	
+	@Test
+	public void testFromValueWithNull() {
+		assertEquals(ConType.NULL, ConType.fromValue(null));
+	}
+	
+	@Test
+	public void testFromValueWithUndefined() {
+		assertEquals(ConType.UNDEFINED, ConType.fromValue(new String[] {}));
+	}
+}

services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/grid/PatchUtils.java

@@ -1,9 +1,5 @@
 package org.sagebionetworks.repo.manager.grid;
 
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.sagebionetworks.repo.model.grid.patch.ConType;
-
 public class PatchUtils {
 
 	/**
@@ -39,30 +35,5 @@ public static int calculateRowsPerPatch(Long maxRowSizeBytes) {
 	public static Long plusTenPerent(Long value) {
 		return value + Double.valueOf(value * 0.1).longValue();
 	}
-	
-	public static ConType getConType(Object value) {
-		if (value == null) {
-			return ConType.NULL;
-		}
-		if (value instanceof Boolean) {
-			return ConType.BOOLEAN;
-		}
-		if (value instanceof Long || value instanceof Integer) {
-			return ConType.LONG;
-		}
-		if (value instanceof Double || value instanceof Float) {
-			return ConType.DOUBLE;
-		}
-		if (value instanceof String) {
-			return ConType.STRING;
-		}
-		if (value instanceof JSONArray) {
-			return ConType.JSON_ARRAY;
-		}
-		if (value instanceof JSONObject) {
-			return ConType.JSON_OBJECT;
-		}
-		return ConType.UNDEFINED;
-	}
 
 }

services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/grid/internal/replica/change/InsertRowChangeHandler.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 
 import org.json.JSONArray;
-import org.sagebionetworks.repo.manager.grid.PatchUtils;
+import org.sagebionetworks.repo.model.grid.patch.ConType;
 import org.sagebionetworks.repo.model.grid.patch.ConValue;
 import org.sagebionetworks.repo.model.grid.patch.LogicalTimestamp;
 import org.sagebionetworks.repo.model.grid.patch.operation.builder.Operations;
@@ -34,7 +34,7 @@ public void handleChange(PatchBuilder builder, InsertRowChange change) {
 			Object value = rowData.get(i);
 			Integer vectorIndex = rowVectorIndex[i];
 			LogicalTimestamp cellConstId = builder.addOperationBuilder(Operations.newConstant().setValue(
-				new ConValue(PatchUtils.getConType(value), value))
+				new ConValue(ConType.fromValue(value), value))
 			);
 			newVecConstantMap.put(vectorIndex, cellConstId);
 		}

services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/grid/internal/replica/change/UpdateRowChangeHandler.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import org.json.JSONArray;
-import org.sagebionetworks.repo.manager.grid.PatchUtils;
+import org.sagebionetworks.repo.model.grid.patch.ConType;
 import org.sagebionetworks.repo.model.grid.patch.ConValue;
 import org.sagebionetworks.repo.model.grid.patch.LogicalTimestamp;
 import org.sagebionetworks.repo.model.grid.patch.operation.builder.Operations;
@@ -33,7 +33,7 @@ public void handleChange(PatchBuilder builder, UpdateRowChange change) {
 			Integer vectorIndex = rowVecIndex[i];
 
 			LogicalTimestamp cellConstId = builder.addOperationBuilder(Operations.newConstant().setValue(
-				new ConValue(PatchUtils.getConType(value), value))
+				new ConValue(ConType.fromValue(value), value))
 			);
 
 			updatedConstantMap.put(vectorIndex, cellConstId);