Remove AWS dependencies

ome · Jun 10, 2022 · a195d7c · a195d7c · imagesc-bot · Aug 22, 2023
1 parent feb1492
commit a195d7c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 312 deletions.
diff --git a/pom.xml b/pom.xml
@@ -75,24 +75,6 @@
       <version>6.8</version>
     </dependency>
 
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-            <artifactId>s3</artifactId>
-      <version>2.13.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>sts</artifactId>
-      <version>2.13.8</version>
-    </dependency>
-
-    <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>bom</artifactId>
-      <version>2.11.10</version>
-      <type>pom</type>
-    </dependency>
     <dependency>
       <!-- NB: We want this, despite warning from dependency:analyze. -->
       <groupId>xalan</groupId>

diff --git a/src/loci/formats/S3FileSystemStore.java b/src/loci/formats/S3FileSystemStore.java
diff --git a/src/loci/formats/in/ZarrReader.java b/src/loci/formats/in/ZarrReader.java
@@ -63,7 +63,6 @@
 import loci.formats.FormatReader;
 import loci.formats.FormatTools;
 import loci.formats.MetadataTools;
-import loci.formats.S3FileSystemStore;
 import loci.formats.meta.MetadataStore;
 import loci.formats.ome.OMEXMLMetadata;
 import loci.formats.services.JZarrServiceImpl;
@@ -833,21 +832,13 @@ public String[] getUsedFiles(boolean noPixels) {
     FormatTools.assertId(currentId, true, 1);
     String zarrRootPath = currentId.substring(0, currentId.indexOf(".zarr") + 5);
     ArrayList<String> usedFiles = new ArrayList<String>();
-    if (!zarrRootPath.toLowerCase().contains("s3:")) {
-      try (Stream<Path> paths = Files.walk(Paths.get(zarrRootPath))) {
-        paths.filter(Files::isRegularFile)
-                .forEach(path -> usedFiles.add(path.toFile().getAbsolutePath()));
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
-    }
-    else {
-      try (S3FileSystemStore s3Store = new S3FileSystemStore(Paths.get(zarrRootPath))) {
-        usedFiles.addAll(s3Store.getFiles());
-      } catch (IOException e) {
-        e.printStackTrace();
-      }
+    try (Stream<Path> paths = Files.walk(Paths.get(zarrRootPath))) {
+      paths.filter(Files::isRegularFile)
+              .forEach(path -> usedFiles.add(path.toFile().getAbsolutePath()));
+    } catch (IOException e) {
+      e.printStackTrace();
     }
+
     String[] fileArr = new String[usedFiles.size()];
     fileArr = usedFiles.toArray(fileArr);
     return fileArr;