Expanding keySet test and support for FileWorkspaceMap

Author: PicoCreator

src/main/java/picoded/dstack/FileWorkspaceMap.java

@@ -123,7 +123,14 @@ default FileWorkspace[] getArrayFromID(String[] idArray, boolean isUnchecked) {
 	 *
 	 * This is equivalent of "TRUNCATE TABLE {TABLENAME}"
 	 **/
+	@Override
 	void clear();
+
+	/**
+	 * Return the current list of ID keys for fileWorkspaceMap
+	 **/
+	@Override
+	Set<String> keySet();
 
 	// Special iteration support
 	//--------------------------------------------------------------------------

src/main/java/picoded/dstack/jsql/JSql_FileWorkspaceMap.java

@@ -1,6 +1,7 @@
 package picoded.dstack.jsql;
 
 import picoded.dstack.core.Core_FileWorkspaceMap;
+import picoded.core.conv.ListValueConv;
 import picoded.core.file.FileUtil;
 import picoded.core.struct.GenericConvertList;
 import picoded.dstack.connector.jsql.JSql;
@@ -657,4 +658,38 @@ public Set<String> backend_getFileAndFolderPathSet(final String oid, final Strin
 		return backend_filterPathSet(rawSet, folderPath, minDepth, maxDepth, 0);
 	}
 
+	/**
+	 * Return the current list of ID keys for fileWorkspaceMap
+	 **/
+	@Override
+	public Set<String> keySet() {
+		// Search blank "paths" which represents the workspace root
+		JSqlResult r = sqlObj.select(fileWorkspaceTableName, "oID", "path = ?", new Object[] { "" });
+		
+		// Convert it into a set
+		if (r == null || r.get("oID") == null) {
+			return new HashSet<String>();
+		}
+		return ListValueConv.toStringSet(r.getObjectList("oID"));
+	}
+
+	/**
+	 * Gets and return a random object ID
+	 *
+	 * @return  Random object ID
+	 **/
+	public String randomObjectID() {
+		// Get a random ID
+		JSqlResult r = sqlObj.randomSelect(fileWorkspaceTableName, "oID", null, null, 1);
+		
+		// No result : NULL
+		if (r == null || r.get("oID") == null || r.rowCount() <= 0) {
+			return null;
+		}
+		
+		// Return the result
+		return r.getStringArray("oID")[0];
+	}
+	
+
 }

src/main/java/picoded/dstack/struct/simple/StructSimple_FileWorkspaceMap.java

@@ -620,6 +620,14 @@ public Set<String> backend_getFileAndFolderPathSet(final String oid, final Strin
 		}
 	}
 
+	/**
+	 * Return the current list of ID keys for fileWorkspaceMap
+	 **/
+	@Override
+	public Set<String> keySet() {
+		return new HashSet<>(fileContentMap.keySet());
+	}
+
 	//--------------------------------------------------------------------------
 	//
 	// Constructor and maintenance

src/test/java/picoded/dstack/struct/simple/StructSimple_FileWorkspaceMap_test.java

@@ -12,6 +12,7 @@
 import java.io.InputStream;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.Set;
 
 import org.apache.commons.io.IOUtils;
 // Test Case include
@@ -435,4 +436,16 @@ public void deleteWorkspace() {
 		testObj.remove(fileWorkspace._oid());
 		assertNull(testObj.get(fileWorkspace._oid()));
 	}
+
+
+	@Test
+	public void keySetTest() {
+		FileWorkspace fileWorkspace = testObj.newEntry();
+		fileWorkspace.writeByteArray("filepath", "anything".getBytes());
+
+		// Get the workspace keyset
+		Set<String> keyset = testObj.keySet();
+		assertNotNull(keyset);
+		assertTrue( keyset.contains(fileWorkspace._oid()) );
+	}
 }