IBM COS & S3: Exists Directory fixes and improvements + UnitTest (#512)

Author: ggallotti

.gitignore

@@ -20,4 +20,5 @@ target/
 *.xlsx
 
 PublicTempStorage/
-PrivateTempStorage/
+PrivateTempStorage/
+gxexternalproviders/resources/

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderIBM.java

@@ -275,25 +275,12 @@ public String getDirectory(String directoryName) {
     }
 
     public boolean existsDirectory(String directoryName) {
-        directoryName = StorageUtils.normalizeDirectoryName(directoryName);
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest()
-            .withBucketName(bucket).withDelimiter(StorageUtils.DELIMITER);
-        List<String> directories = new ArrayList<String>();
-        for (String prefix : client.listObjects(listObjectsRequest).getCommonPrefixes()) {
-            directories.add(prefix);
-            getAllDirectories(prefix, directories);
-        }
-        return directories.contains(directoryName);
-    }
-
-    public void getAllDirectories(String directoryName, List<String> directories) {
-        directoryName = StorageUtils.normalizeDirectoryName(directoryName);
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest()
-            .withBucketName(bucket).withPrefix(directoryName).withDelimiter(StorageUtils.DELIMITER);
-        for (String prefix : client.listObjects(listObjectsRequest).getCommonPrefixes()) {
-            directories.add(prefix);
-            getAllDirectories(prefix, directories);
-        }
+        ListObjectsV2Request listObjectsRequest = new ListObjectsV2Request()
+            .withBucketName(bucket)
+			.withDelimiter(StorageUtils.DELIMITER)
+			.withPrefix(StorageUtils.normalizeDirectoryName(directoryName))
+			.withMaxKeys(1);
+		return client.listObjectsV2(listObjectsRequest).getKeyCount() > 0;
     }
 
     public void createDirectory(String directoryName) {

gxexternalproviders/src/main/java/com/genexus/db/driver/ExternalProviderS3.java

@@ -328,27 +328,14 @@ public String getDirectory(String directoryName) {
         }
     }
 
-    public boolean existsDirectory(String directoryName) {
-        directoryName = StorageUtils.normalizeDirectoryName(directoryName);
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest()
-            .withBucketName(bucket).withDelimiter(StorageUtils.DELIMITER);
-        List<String> directories = new ArrayList<String>();
-        for (String prefix : client.listObjects(listObjectsRequest).getCommonPrefixes()) {
-            directories.add(prefix);
-            getAllDirectories(prefix, directories);
-        }
-        return directories.contains(directoryName);
-    }
-
-    public void getAllDirectories(String directoryName, List<String> directories) {
-        directoryName = StorageUtils.normalizeDirectoryName(directoryName);
-        ListObjectsRequest listObjectsRequest = new ListObjectsRequest()
-            .withBucketName(bucket).withPrefix(directoryName).withDelimiter(StorageUtils.DELIMITER);
-        for (String prefix : client.listObjects(listObjectsRequest).getCommonPrefixes()) {
-            directories.add(prefix);
-            getAllDirectories(prefix, directories);
-        }
-    }
+	public boolean existsDirectory(String directoryName) {
+		ListObjectsV2Request listObjectsRequest = new ListObjectsV2Request()
+			.withBucketName(bucket)
+			.withDelimiter(StorageUtils.DELIMITER)
+			.withPrefix(StorageUtils.normalizeDirectoryName(directoryName))
+			.withMaxKeys(1);
+		return client.listObjectsV2(listObjectsRequest).getKeyCount() > 0;
+	}
 
     public void createDirectory(String directoryName) {
         ensureFolder(directoryName);

gxexternalproviders/src/test/java/com/genexus/db/driver/TestExternalProvider.java

@@ -53,7 +53,7 @@ public void beforeEachTestMethod() {
 		assertTrue(provider != null);
 
 
-		uniqueId = Integer.toString(new Random().nextInt(10000));
+		uniqueId = Integer.toString(new Random().nextInt(5000));
 		testSampleFileName = String.format("text-%s.txt", uniqueId);
 		testSampleFilePath = Paths.get("resources", testSampleFileName).toString();
 
@@ -136,6 +136,19 @@ public void testCopyMethod(){
 		copy(copyFileName, ResourceAccessControlList.PublicRead);
 	}
 
+	@Test
+	public void testExistsDirectory(){
+		String copyFileName = buildRandomTextFileName("tempFolder/f1/f2/test-upload-and-copy");
+		String upload = provider.upload(testSampleFilePath, copyFileName, ResourceAccessControlList.Default);
+		assertTrue("Not found URL: " + upload, urlExists(upload));
+		String folder = "tempFolder";
+		boolean existsDir = provider.existsDirectory(folder);
+		assertTrue("Directory does not exists " + folder + " - " + upload, existsDir);
+		String folderNotExists = "tempFolderNotExists";
+		existsDir = provider.existsDirectory(folder);
+		assertTrue("Directory does not exists " + folderNotExists, existsDir);
+	}
+
 	@Test
 	public void testCopyPrivateMethod(){
 		String copyFileName = buildRandomTextFileName("copy-text-private");