From 8e90fb4a90565baf6389bbfbbca64e5724114ebc Mon Sep 17 00:00:00 2001 From: lucio Date: Fri, 19 Jan 2024 11:56:04 +0100 Subject: [PATCH] storage backend classes updated --- .classpath | 1 + pom.xml | 17 +---------------- .../common/storagehub/model/Constants.java | 2 +- .../model/exceptions/BackendGenericError.java | 2 -- .../model/exceptions/IdNotFoundException.java | 3 --- .../model/exceptions/InvalidCallParameters.java | 3 --- .../model/exceptions/InvalidItemException.java | 3 --- .../exceptions/ItemAlreadyExistsException.java | 3 --- .../model/exceptions/ItemLockedException.java | 3 --- .../PluginInitializationException.java | 3 --- .../exceptions/PluginNotFoundException.java | 3 --- .../model/exceptions/StorageHubException.java | 3 --- .../exceptions/UserNotAuthorizedException.java | 3 --- .../storagehub/model/items/ExternalFolder.java | 1 + .../storagehub/model/items/FolderItem.java | 2 +- .../model/storages/StorageBackendFactory.java | 4 ++++ .../model/storages/StorageDescriptor.java | 16 ++++++++++++++++ 17 files changed, 25 insertions(+), 47 deletions(-) create mode 100644 src/main/java/org/gcube/common/storagehub/model/storages/StorageDescriptor.java diff --git a/.classpath b/.classpath index b8c44f6..502bd4a 100644 --- a/.classpath +++ b/.classpath @@ -16,6 +16,7 @@ + diff --git a/pom.xml b/pom.xml index 5efe3d9..6a36d39 100644 --- a/pom.xml +++ b/pom.xml @@ -42,13 +42,9 @@ org.projectlombok lombok + provided - - org.gcube.core - common-clients - - com.fasterxml.jackson.core jackson-annotations @@ -74,15 +70,4 @@ - - - - maven-compiler-plugin - - 1.8 - 1.8 - - - - diff --git a/src/main/java/org/gcube/common/storagehub/model/Constants.java b/src/main/java/org/gcube/common/storagehub/model/Constants.java index 83aaad2..b994bf6 100644 --- a/src/main/java/org/gcube/common/storagehub/model/Constants.java +++ b/src/main/java/org/gcube/common/storagehub/model/Constants.java @@ -8,7 +8,7 @@ public class Constants { public static final String versionPrefix = "_v"; public static final String MONGO_STORAGE = "gcube-mongo"; - public static final String DEFAULT_MINIO_STORAGE = "default-gcube-minio"; + public static final String DEFAULT_S3_STORAGE = "default-gcube-s3"; } diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/BackendGenericError.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/BackendGenericError.java index cae59b3..050f68d 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/BackendGenericError.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/BackendGenericError.java @@ -1,8 +1,6 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; -@Unrecoverable public class BackendGenericError extends StorageHubException{ /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/IdNotFoundException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/IdNotFoundException.java index cde8315..b08fb3c 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/IdNotFoundException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/IdNotFoundException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class IdNotFoundException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidCallParameters.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidCallParameters.java index c7713f4..d0fc43b 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidCallParameters.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidCallParameters.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class InvalidCallParameters extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidItemException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidItemException.java index bef8780..de23465 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidItemException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/InvalidItemException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class InvalidItemException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemAlreadyExistsException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemAlreadyExistsException.java index 988695b..18fa388 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemAlreadyExistsException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemAlreadyExistsException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class ItemAlreadyExistsException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemLockedException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemLockedException.java index 0c84f82..e5865be 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemLockedException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/ItemLockedException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class ItemLockedException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginInitializationException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginInitializationException.java index a6222b7..c78f3c9 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginInitializationException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginInitializationException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class PluginInitializationException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginNotFoundException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginNotFoundException.java index 6583281..8824466 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginNotFoundException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/PluginNotFoundException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class PluginNotFoundException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/StorageHubException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/StorageHubException.java index 7a603bd..6b3764b 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/StorageHubException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/StorageHubException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public abstract class StorageHubException extends Exception { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/exceptions/UserNotAuthorizedException.java b/src/main/java/org/gcube/common/storagehub/model/exceptions/UserNotAuthorizedException.java index 12a26af..9961c59 100644 --- a/src/main/java/org/gcube/common/storagehub/model/exceptions/UserNotAuthorizedException.java +++ b/src/main/java/org/gcube/common/storagehub/model/exceptions/UserNotAuthorizedException.java @@ -1,8 +1,5 @@ package org.gcube.common.storagehub.model.exceptions; -import org.gcube.common.clients.delegates.Unrecoverable; - -@Unrecoverable public class UserNotAuthorizedException extends StorageHubException { /** diff --git a/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java b/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java index 1429259..b727858 100644 --- a/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java +++ b/src/main/java/org/gcube/common/storagehub/model/items/ExternalFolder.java @@ -12,4 +12,5 @@ import lombok.Setter; @RootNode("nthl:externalFolder") public class ExternalFolder extends FolderItem { + } diff --git a/src/main/java/org/gcube/common/storagehub/model/items/FolderItem.java b/src/main/java/org/gcube/common/storagehub/model/items/FolderItem.java index 98dabd4..d92fe27 100644 --- a/src/main/java/org/gcube/common/storagehub/model/items/FolderItem.java +++ b/src/main/java/org/gcube/common/storagehub/model/items/FolderItem.java @@ -18,6 +18,6 @@ import lombok.Setter; public class FolderItem extends Item { @NodeAttribute(value= PAYLOADBACKEND) - PayloadBackend backend = new PayloadBackend(Constants.DEFAULT_MINIO_STORAGE, null); + PayloadBackend backend = new PayloadBackend(Constants.DEFAULT_S3_STORAGE, null); } diff --git a/src/main/java/org/gcube/common/storagehub/model/storages/StorageBackendFactory.java b/src/main/java/org/gcube/common/storagehub/model/storages/StorageBackendFactory.java index 7cd2adc..860ece7 100644 --- a/src/main/java/org/gcube/common/storagehub/model/storages/StorageBackendFactory.java +++ b/src/main/java/org/gcube/common/storagehub/model/storages/StorageBackendFactory.java @@ -7,6 +7,10 @@ public interface StorageBackendFactory { String getName(); + default boolean isSystemStorage() { + return false; + } + StorageBackend create(PayloadBackend payloadConfiguration) throws InvalidCallParameters; diff --git a/src/main/java/org/gcube/common/storagehub/model/storages/StorageDescriptor.java b/src/main/java/org/gcube/common/storagehub/model/storages/StorageDescriptor.java new file mode 100644 index 0000000..7f62d65 --- /dev/null +++ b/src/main/java/org/gcube/common/storagehub/model/storages/StorageDescriptor.java @@ -0,0 +1,16 @@ +package org.gcube.common.storagehub.model.storages; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class StorageDescriptor { + + String name; +}