From 280d77d19368df8969858c447223efc2778d51fb Mon Sep 17 00:00:00 2001 From: Azher2Ali <121898125+Azher2Ali@users.noreply.github.com> Date: Thu, 18 Jul 2024 11:45:49 -0400 Subject: [PATCH] Updated PR with rebasing and renaming --- .../overture/score/client/manifest/DownloadManifest.java | 6 ------ .../main/java/bio/overture/score/fs/StorageFileStore.java | 6 +++--- .../bio/overture/score/fs/StorageFileSystemProvider.java | 2 +- .../main/java/bio/overture/score/fs/StorageFileSystems.java | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/score-client/src/main/java/bio/overture/score/client/manifest/DownloadManifest.java b/score-client/src/main/java/bio/overture/score/client/manifest/DownloadManifest.java index a5104197..a48c330d 100644 --- a/score-client/src/main/java/bio/overture/score/client/manifest/DownloadManifest.java +++ b/score-client/src/main/java/bio/overture/score/client/manifest/DownloadManifest.java @@ -22,12 +22,6 @@ import lombok.Builder; import lombok.NonNull; import lombok.Value; - -/** - * See - * https://wiki.oicr.on.ca/display/DCCSOFT/Uniform+metadata+JSON+document+for+ICGC+Data+Repositories# - * UniformmetadataJSONdocumentforICGCDataRepositories-Manifestfileformatfordownloader - */ @Value public class DownloadManifest { @NonNull private final List entries; diff --git a/score-fs/src/main/java/bio/overture/score/fs/StorageFileStore.java b/score-fs/src/main/java/bio/overture/score/fs/StorageFileStore.java index 4b3129ee..b8aa5c7c 100644 --- a/score-fs/src/main/java/bio/overture/score/fs/StorageFileStore.java +++ b/score-fs/src/main/java/bio/overture/score/fs/StorageFileStore.java @@ -24,11 +24,11 @@ public class StorageFileStore extends FileStore { - public static final String ICGCFS = "icgcfs"; + public static final String SCOREFS = "scorefs"; @Override public String type() { - return ICGCFS; + return SCOREFS; } @Override @@ -43,7 +43,7 @@ public boolean supportsFileAttributeView(Class type @Override public String name() { - return "icgc"; + return "score"; } @Override diff --git a/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystemProvider.java b/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystemProvider.java index 1ff5bf0a..998a8ba2 100644 --- a/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystemProvider.java +++ b/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystemProvider.java @@ -70,7 +70,7 @@ public class StorageFileSystemProvider extends ReadOnlyFileSystemProvider { @Override public String getScheme() { - return "icgc"; + return "score"; } @Override diff --git a/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystems.java b/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystems.java index e853cde4..127111ca 100644 --- a/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystems.java +++ b/score-fs/src/main/java/bio/overture/score/fs/StorageFileSystems.java @@ -38,7 +38,7 @@ public StorageFileSystem newFileSystem(@NonNull StorageContext context) public StorageFileSystem newFileSystem(@NonNull StorageContext context, Map env) throws IOException, URISyntaxException { val provider = new StorageFileSystemProvider(context); - val uri = new URI("icgc://storage"); + val uri = new URI("score://storage"); return (StorageFileSystem) provider.newFileSystem(uri, env); }