Merge pull request #5517 from Sage-Bionetworks/release-578

Release 578

Author: john-hill

lib/jdomodels/src/test/java/org/sagebionetworks/evaluation/dbo/grid/GridDaoImplTest.java

@@ -38,6 +38,7 @@
 import org.sagebionetworks.repo.model.grid.GridSession;
 import org.sagebionetworks.repo.model.grid.GridSnapshot;
 import org.sagebionetworks.repo.model.grid.PatchInfo;
+import org.sagebionetworks.repo.model.grid.RequestOrigin;
 import org.sagebionetworks.repo.model.grid.patch.LogicalTimestamp;
 import org.sagebionetworks.repo.model.jdo.KeyFactory;
 import org.sagebionetworks.repo.model.jdo.NodeTestUtils;
@@ -329,7 +330,7 @@ public void testConnectionCRUD(EventSource source) throws InterruptedException {
 
 		// call under test
 		List<GridConnectionInfo> listed = dao.listConnections(session.getSessionId());
-		List<GridConnectionInfo> expected = source == EventSource.WEBSOCKET ? List.of(f1, f2) : List.of(f2, f1);
+		List<GridConnectionInfo> expected = source.getRequestOrigin() == RequestOrigin.USER ? List.of(f1, f2) : List.of(f2, f1);
 		assertEquals(expected, listed);
 
 		// call under test

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

@@ -23,7 +23,7 @@ public enum EventSource {
 	 * Agent driven updates to the grid. There can be many agents for a single
 	 * session.
 	 */
-	AGENT(false, RequestOrigin.SERVICE),
+	AGENT(false, RequestOrigin.USER),
 
 	/*
 	 * Patches generated by the system on the user behalf.

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

@@ -1,5 +1,7 @@
 package org.sagebionetworks.repo.model.grid;
 
+import org.sagebionetworks.util.ValidateArgument;
+
 public class GridConstants {
 
 	/**
@@ -9,16 +11,29 @@ public class GridConstants {
 	public static final Long MIN_REPICA_ID = (long) 0xffff;
 
 	/**
-	 * The starting user replica ID for a grid session. Client replicas will increment
-	 * this value.
+	 * The starting user replica ID for a grid session. Client replicas will
+	 * increment this value.
 	 */
 	public static final Long START_REPLICA_ID_CLIENT = MIN_REPICA_ID + 1001;
 	/**
 	 * The starting internal replica ID for grid session. Service replicas will
-	 * decrement this value. This ensure all service replica ID are smaller than
-	 * all client replica ID. This means when an service and client replica have a
+	 * decrement this value. This ensure all service replica ID are smaller than all
+	 * client replica ID. This means when an service and client replica have a
 	 * conflict, the client's replica always wins.
 	 */
 	public static final Long START_REPLICA_ID_SERVICE = START_REPLICA_ID_CLIENT - 1;
 
+	/**
+	 * Returns true if the passed replica ID is a USER replica (clients or agents).
+	 * Returns false if the passed replica ID is a SERVICE (like internal replica or
+	 * validation replica)
+	 * 
+	 * @param replicaId
+	 * @return
+	 */
+	public static boolean isUserReplica(Long replicaId) {
+		ValidateArgument.required(replicaId, "replicaId");
+		return replicaId >= START_REPLICA_ID_CLIENT;
+	}
+
 }

lib/lib-grid/src/main/java/org/sagebionetworks/repo/model/grid/patch/operation/builder/DeleteBuilder.java

@@ -44,5 +44,10 @@ public boolean equals(Object obj) {
 		DeleteBuilder other = (DeleteBuilder) obj;
 		return Objects.equals(nodeId, other.nodeId) && Objects.equals(timeSpans, other.timeSpans);
 	}
+
+	@Override
+	public String toString() {
+		return "DeleteBuilder [nodeId=" + nodeId + ", timeSpans=" + timeSpans + "]";
+	}
 
 }

lib/lib-grid/src/main/java/org/sagebionetworks/repo/model/grid/patch/operation/builder/InsertObjectBuilder.java

@@ -44,4 +44,11 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(objectId, map);
     }
+
+	@Override
+	public String toString() {
+		return "InsertObjectBuilder [objectId=" + objectId + ", map=" + map + "]";
+	}
+    
+    
 }

lib/lib-grid/src/main/java/org/sagebionetworks/repo/model/grid/patch/operation/builder/InsertVectorBuilder.java

@@ -44,4 +44,10 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(vectorId, map);
     }
+
+	@Override
+	public String toString() {
+		return "InsertVectorBuilder [vectorId=" + vectorId + ", map=" + map + "]";
+	}
+    
 }

lib/lib-grid/src/main/java/org/sagebionetworks/repo/model/grid/patch/operation/builder/NewConstantBuilder.java

@@ -34,4 +34,10 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hashCode(value);
     }
+
+	@Override
+	public String toString() {
+		return "NewConstantBuilder [value=" + value + "]";
+	}
+    
 }

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

@@ -0,0 +1,31 @@
+package org.sagebionetworks.repo.model.grid;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+public class GridConstantsTest {
+
+	@Test
+	public void testIsUserReplica() {
+		assertTrue(GridConstants.isUserReplica(GridConstants.START_REPLICA_ID_CLIENT));
+		assertTrue(GridConstants.isUserReplica(GridConstants.START_REPLICA_ID_CLIENT + 1L));
+		assertFalse(GridConstants.isUserReplica(GridConstants.START_REPLICA_ID_SERVICE));
+		assertFalse(GridConstants.isUserReplica(GridConstants.START_REPLICA_ID_SERVICE - 1));
+	}
+
+	@Test
+	public void testIsUserReplciaWithNullId() {
+
+		String message = assertThrows(IllegalArgumentException.class, () -> {
+			// call under test
+			GridConstants.isUserReplica(null);
+
+		}).getMessage();
+		assertEquals("replicaId is required.", message);
+	}
+
+}

services/repository-managers/src/main/java/org/sagebionetworks/repo/manager/evaluation/EvaluationPermissionsManagerImpl.java

@@ -20,7 +20,7 @@
 import org.sagebionetworks.evaluation.dao.SubmissionDAO;
 import org.sagebionetworks.evaluation.model.Evaluation;
 import org.sagebionetworks.evaluation.model.UserEvaluationPermissions;
-import org.sagebionetworks.repo.manager.AccessControlListManager;;
+import org.sagebionetworks.repo.manager.AccessControlListManager;
 import org.sagebionetworks.repo.manager.UserManager;
 import org.sagebionetworks.repo.model.ACCESS_TYPE;
 import org.sagebionetworks.repo.model.AccessControlList;

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

@@ -0,0 +1,64 @@
+package org.sagebionetworks.repo.manager.grid;
+
+/**
+ * Constants for the Grid document schema.
+ * 
+ * @see <a href=
+ *      "https://sagebionetworks.jira.com/wiki/spaces/PLFM/pages/4123361355/Grid+Implementation+Using+JSON+Joy">Grid
+ *      Implementation Using JSON Joy</a>
+ */
+public class DocumentConstants {
+
+	/**
+	 * The semantic version of the document schema. This value will change anytime
+	 * the schema changes.
+	 */
+	public static final String DOC_VERSION = "doc_version";
+
+	/**
+	 * Vector that captures the name of columns in their natural order (order they
+	 * were added). Vectors are append-only (up to 256 values) and allow LWW changes
+	 * to each index.
+	 */
+	public static final String COLUMN_NAMES = "columnNames";
+
+	/**
+	 * Array that defines the order columns should be displayed. Each value is an
+	 * index into columnNames. The array can be reordered.
+	 */
+	public static final String COLUMN_ORDER = "columnOrder";
+
+	/**
+	 * Array of row objects. Each row contains data and metadata properties. The
+	 * array represents the mutable row order.
+	 */
+	public static final String ROWS = "rows";
+
+	/**
+	 * The row data vector represents the data in a row. The order matches the
+	 * columnNames vector. Each cell can be changed to a new constant. Cells with
+	 * identical values typically share a reference.
+	 */
+	public static final String DATA = "data";
+
+	/**
+	 * Reference to a constant containing JSON serialization of [rowId, rowVersion,
+	 * etag]. Maps a row back to its source from a Synapse Table or View. Omitted if
+	 * items are not defined.
+	 */
+	public static final String SYNAPSE_ROW = "synapseRow";
+
+	/**
+	 * Object containing supplemental information about the row. Should be treated
+	 * as read-only for all replicas other than the hub. May be omitted if no
+	 * additional information is included.
+	 */
+	public static final String METADATA = "metadata";
+
+	/**
+	 * Reference to a constant containing JSON serialization of the ValidationResult
+	 * object. The ValidationResult is identical to results provided for Entity
+	 * Validation.
+	 */
+	public static final String ROW_VALIDATION = "rowValidation";
+}