From 612499745e98095c33f8552956fb1c16c0567f09 Mon Sep 17 00:00:00 2001 From: "luca.frosini" Date: Mon, 4 Jun 2018 13:08:43 +0000 Subject: [PATCH] Reorganzing Exceptions git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-api@167865 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../api/exceptions/AlreadyPresent.java | 5 ---- .../exceptions/AvailableInAnotherContext.java | 5 ---- .../{er => }/ERAlreadyPresentException.java | 6 ++-- .../ERAvailableInAnotherContextException.java | 6 ++-- .../api/exceptions/ERCreationException.java | 25 ++++++++++++++++ .../api/exceptions/{er => }/ERException.java | 4 +-- .../{er => }/ERNotFoundException.java | 6 ++-- .../api/exceptions/NotFound.java | 5 ---- .../ContextAlreadyPresentException.java | 5 +--- .../context/ContextCreationException.java | 2 +- .../context/ContextNotFoundException.java | 5 +--- .../entity/EntityAlreadyPresentException.java | 5 ++-- ...ityAvailableInAnotherContextException.java | 5 ++-- .../entity/EntityCreationException.java | 27 +++++++++++++++++ .../entity/EntityNotFoundException.java | 5 ++-- .../facet/FacetAlreadyPresentException.java | 3 +- ...cetAvailableInAnotherContextException.java | 3 +- .../entity/facet/FacetCreationException.java | 29 +++++++++++++++++++ .../entity/facet/FacetNotFoundException.java | 3 +- .../ResourceAlreadyPresentException.java | 3 +- ...rceAvailableInAnotherContextException.java | 3 +- .../resource/ResourceCreationException.java | 29 +++++++++++++++++++ .../resource/ResourceNotFoundException.java | 3 +- .../RelationAlreadyPresentException.java | 5 ++-- ...ionAvailableInAnotherContextException.java | 6 ++-- .../relation/RelationCreationException.java | 27 +++++++++++++++++ .../relation/RelationNotFoundException.java | 5 ++-- .../ConsistsOfAlreadyPresentException.java | 3 +- ...sOfAvailableInAnotherContextException.java | 4 +-- .../ConsistsOfCreationException.java | 27 +++++++++++++++++ .../ConsistsOfNotFoundException.java | 3 +- .../IsParentOfAlreadyPresentException.java | 5 +--- .../IsParentOfCreationException.java | 25 ++++++++++++++++ .../isparentof/IsParentOfException.java | 23 +++++++++++++++ .../IsParentOfNotFoundException.java | 5 +--- .../IsRelatedToAlreadyPresentException.java | 3 +- ...dToAvailableInAnotherContextException.java | 4 +-- .../IsRelatedToCreationException.java | 27 +++++++++++++++++ .../IsRelatedToNotFoundException.java | 3 +- .../schema/SchemaAlreadyPresentException.java | 4 +-- .../schema/SchemaNotFoundException.java | 4 +-- .../resourceregistry/api/rest/AccessPath.java | 2 +- .../resourceregistry/api/rest/ERPath.java | 2 +- .../api/rest/httputils/HTTPCall.java | 4 +-- 44 files changed, 281 insertions(+), 102 deletions(-) delete mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AlreadyPresent.java delete mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AvailableInAnotherContext.java rename src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/{er => }/ERAlreadyPresentException.java (72%) rename src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/{er => }/ERAvailableInAnotherContextException.java (79%) create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERCreationException.java rename src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/{er => }/ERException.java (83%) rename src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/{er => }/ERNotFoundException.java (73%) delete mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotFound.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfCreationException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfException.java create mode 100644 src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToCreationException.java diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AlreadyPresent.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AlreadyPresent.java deleted file mode 100644 index 67cf553..0000000 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AlreadyPresent.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions; - -public interface AlreadyPresent { - -} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AvailableInAnotherContext.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AvailableInAnotherContext.java deleted file mode 100644 index c8d4937..0000000 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/AvailableInAnotherContext.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions; - -public interface AvailableInAnotherContext { - -} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAlreadyPresentException.java similarity index 72% rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAlreadyPresentException.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAlreadyPresentException.java index 60a7786..3ecb7ce 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAlreadyPresentException.java @@ -1,12 +1,10 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions.er; - -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; +package org.gcube.informationsystem.resourceregistry.api.exceptions; /** * @author Luca Frosini (ISTI - CNR) * */ -public class ERAlreadyPresentException extends ERException implements AlreadyPresent { +public class ERAlreadyPresentException extends ERException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAvailableInAnotherContextException.java similarity index 79% rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAvailableInAnotherContextException.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAvailableInAnotherContextException.java index be7e4f8..95aea8e 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERAvailableInAnotherContextException.java @@ -1,12 +1,10 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions.er; - -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; +package org.gcube.informationsystem.resourceregistry.api.exceptions; /** * @author Luca Frosini (ISTI - CNR) * */ -public class ERAvailableInAnotherContextException extends ERException implements AvailableInAnotherContext { +public class ERAvailableInAnotherContextException extends ERException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERCreationException.java new file mode 100644 index 0000000..cf91e4d --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERCreationException.java @@ -0,0 +1,25 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class ERCreationException extends ERException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = -6223557776095431118L; + + public ERCreationException(String message) { + super(message); + } + + public ERCreationException(Throwable cause) { + super(cause); + } + + public ERCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERException.java similarity index 83% rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERException.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERException.java index d321bb2..b94124b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERException.java @@ -1,9 +1,7 @@ /** * */ -package org.gcube.informationsystem.resourceregistry.api.exceptions.er; - -import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; +package org.gcube.informationsystem.resourceregistry.api.exceptions; /** * @author Luca Frosini (ISTI - CNR) diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERNotFoundException.java similarity index 73% rename from src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERNotFoundException.java rename to src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERNotFoundException.java index 6cfd961..9182b92 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ERNotFoundException.java @@ -1,12 +1,10 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions.er; - -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; +package org.gcube.informationsystem.resourceregistry.api.exceptions; /** * @author Luca Frosini (ISTI - CNR) * */ -public class ERNotFoundException extends ERException implements NotFound { +public class ERNotFoundException extends ERException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotFound.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotFound.java deleted file mode 100644 index 9c90e27..0000000 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/NotFound.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.gcube.informationsystem.resourceregistry.api.exceptions; - -public interface NotFound { - -} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java index 02fbf4b..b44c11b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextAlreadyPresentException.java @@ -1,12 +1,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.context; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; -import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; - /** * @author Luca Frosini (ISTI - CNR) */ -public class ContextAlreadyPresentException extends EntityAlreadyPresentException implements AlreadyPresent { +public class ContextAlreadyPresentException extends ContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java index e79276c..8ff38af 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextCreationException.java @@ -11,7 +11,7 @@ public class ContextCreationException extends ContextException { /** * Generated Serial Version UID */ - private static final long serialVersionUID = -7235498402448768270L; + private static final long serialVersionUID = 7777044293030289951L; public ContextCreationException(String message) { super(message); diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java index 3ff745b..dc0bde4 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java @@ -1,13 +1,10 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.context; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; -import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityNotFoundException; - /** * @author Luca Frosini (ISTI - CNR) * */ -public class ContextNotFoundException extends EntityNotFoundException implements NotFound { +public class ContextNotFoundException extends ContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java index 14665c8..ad55169 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java @@ -1,13 +1,12 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAlreadyPresentException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERAlreadyPresentException; /** * @author Luca Frosini (ISTI - CNR) * */ -public class EntityAlreadyPresentException extends ERAlreadyPresentException implements AlreadyPresent { +public class EntityAlreadyPresentException extends ERAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAvailableInAnotherContextException.java index 7d87657..0c7ac75 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAvailableInAnotherContextException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAvailableInAnotherContextException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class EntityAvailableInAnotherContextException extends ERAvailableInAnotherContextException implements AvailableInAnotherContext { +public class EntityAvailableInAnotherContextException extends ERAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityCreationException.java new file mode 100644 index 0000000..3d394ea --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityCreationException.java @@ -0,0 +1,27 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.entity; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class EntityCreationException extends ERCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = -4445129394716597536L; + + public EntityCreationException(String message) { + super(message); + } + + public EntityCreationException(Throwable cause) { + super(cause); + } + + public EntityCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java index fde31a7..229c302 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java @@ -1,13 +1,12 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERNotFoundException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERNotFoundException; /** * @author Luca Frosini (ISTI - CNR) * */ -public class EntityNotFoundException extends ERNotFoundException implements NotFound { +public class EntityNotFoundException extends ERNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAlreadyPresentException.java index d3c9db2..0af0aba 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAlreadyPresentException.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; @@ -8,7 +7,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity * @author Luca Frosini (ISTI - CNR) * */ -public class FacetAlreadyPresentException extends EntityAlreadyPresentException implements AlreadyPresent { +public class FacetAlreadyPresentException extends EntityAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAvailableInAnotherContextException.java index 8a14d90..c1831dd 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetAvailableInAnotherContextException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class FacetAvailableInAnotherContextException extends EntityAvailableInAnotherContextException implements AvailableInAnotherContext { +public class FacetAvailableInAnotherContextException extends EntityAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetCreationException.java new file mode 100644 index 0000000..9a85865 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetCreationException.java @@ -0,0 +1,29 @@ +/** + * + */ +package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public class FacetCreationException extends EntityCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = -3065194750535027873L; + + public FacetCreationException(String message) { + super(message); + } + + public FacetCreationException(Throwable cause) { + super(cause); + } + + public FacetCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java index a39fb3d..5a98201 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/facet/FacetNotFoundException.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityNotFoundException; @@ -8,7 +7,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity * @author Luca Frosini (ISTI - CNR) * */ -public class FacetNotFoundException extends EntityNotFoundException implements NotFound { +public class FacetNotFoundException extends EntityNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java index 0eee8f5..661e9f0 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAlreadyPresentException.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAlreadyPresentException; @@ -8,7 +7,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity * @author Luca Frosini (ISTI - CNR) * */ -public class ResourceAlreadyPresentException extends EntityAlreadyPresentException implements AlreadyPresent { +public class ResourceAlreadyPresentException extends EntityAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAvailableInAnotherContextException.java index 5146217..eb6c3b0 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceAvailableInAnotherContextException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class ResourceAvailableInAnotherContextException extends EntityAvailableInAnotherContextException implements AvailableInAnotherContext { +public class ResourceAvailableInAnotherContextException extends EntityAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceCreationException.java new file mode 100644 index 0000000..b83b8fe --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceCreationException.java @@ -0,0 +1,29 @@ +/** + * + */ +package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + */ +public class ResourceCreationException extends EntityCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = 363592815430310293L; + + public ResourceCreationException(String message) { + super(message); + } + + public ResourceCreationException(Throwable cause) { + super(cause); + } + + public ResourceCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java index 6ce985d..f0fa61d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/resource/ResourceNotFoundException.java @@ -1,6 +1,5 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.EntityNotFoundException; @@ -8,7 +7,7 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.Entity * @author Luca Frosini (ISTI - CNR) * */ -public class ResourceNotFoundException extends EntityNotFoundException implements NotFound { +public class ResourceNotFoundException extends EntityNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java index 99c7463..50051cf 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAlreadyPresentException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERAlreadyPresentException; /** * @author Luca Frosini (ISTI - CNR) */ -public class RelationAlreadyPresentException extends ERAlreadyPresentException implements AlreadyPresent { +public class RelationAlreadyPresentException extends ERAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAvailableInAnotherContextException.java index 36962eb..c1dbd6d 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAvailableInAnotherContextException.java @@ -1,13 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAvailableInAnotherContextException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class RelationAvailableInAnotherContextException extends ERAvailableInAnotherContextException - implements AvailableInAnotherContext { +public class RelationAvailableInAnotherContextException extends ERAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationCreationException.java new file mode 100644 index 0000000..f3d0302 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationCreationException.java @@ -0,0 +1,27 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.relation; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class RelationCreationException extends ERCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = 6390564714862731641L; + + public RelationCreationException(String message) { + super(message); + } + + public RelationCreationException(Throwable cause) { + super(cause); + } + + public RelationCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java index 4ac1c20..519c929 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERNotFoundException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERNotFoundException; /** * @author Luca Frosini (ISTI - CNR) */ -public class RelationNotFoundException extends ERNotFoundException implements NotFound { +public class RelationNotFoundException extends ERNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAlreadyPresentException.java index f47d664..a98d057 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAlreadyPresentException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAlreadyPresentException; /** * @author Luca Frosini (ISTI - CNR) */ -public class ConsistsOfAlreadyPresentException extends RelationAlreadyPresentException implements AlreadyPresent { +public class ConsistsOfAlreadyPresentException extends RelationAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAvailableInAnotherContextException.java index 552877e..8c0976b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfAvailableInAnotherContextException.java @@ -1,13 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class ConsistsOfAvailableInAnotherContextException extends RelationAvailableInAnotherContextException - implements AvailableInAnotherContext { +public class ConsistsOfAvailableInAnotherContextException extends RelationAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfCreationException.java new file mode 100644 index 0000000..5ef8741 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfCreationException.java @@ -0,0 +1,27 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class ConsistsOfCreationException extends RelationCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = 5968496386603935430L; + + public ConsistsOfCreationException(String message) { + super(message); + } + + public ConsistsOfCreationException(Throwable cause) { + super(cause); + } + + public ConsistsOfCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfNotFoundException.java index e56a3d0..396ca8b 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/consistsOf/ConsistsOfNotFoundException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.consistsOf; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; /** * @author Luca Frosini (ISTI - CNR) */ -public class ConsistsOfNotFoundException extends RelationNotFoundException implements NotFound { +public class ConsistsOfNotFoundException extends RelationNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfAlreadyPresentException.java index 43a1cfc..0686867 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfAlreadyPresentException.java @@ -1,12 +1,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isparentof; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; -import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAlreadyPresentException; - /** * @author Luca Frosini (ISTI - CNR) */ -public class IsParentOfAlreadyPresentException extends RelationAlreadyPresentException implements AlreadyPresent { +public class IsParentOfAlreadyPresentException extends IsParentOfException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfCreationException.java new file mode 100644 index 0000000..81ed3b8 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfCreationException.java @@ -0,0 +1,25 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isparentof; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class IsParentOfCreationException extends IsParentOfException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = 3455142144592952399L; + + public IsParentOfCreationException(String message) { + super(message); + } + + public IsParentOfCreationException(Throwable cause) { + super(cause); + } + + public IsParentOfCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfException.java new file mode 100644 index 0000000..1aea317 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfException.java @@ -0,0 +1,23 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isparentof; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; + +public class IsParentOfException extends ResourceRegistryException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = -202306809126357795L; + + public IsParentOfException(String message) { + super(message); + } + + public IsParentOfException(Throwable cause) { + super(cause); + } + + public IsParentOfException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfNotFoundException.java index 08c2b84..28fee7a 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isparentof/IsParentOfNotFoundException.java @@ -1,12 +1,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isparentof; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; -import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; - /** * @author Luca Frosini (ISTI - CNR) */ -public class IsParentOfNotFoundException extends RelationNotFoundException implements NotFound { +public class IsParentOfNotFoundException extends IsParentOfException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAlreadyPresentException.java index 66e3c47..63f0796 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAlreadyPresentException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAlreadyPresentException; /** * @author Luca Frosini (ISTI - CNR) */ -public class IsRelatedToAlreadyPresentException extends RelationAlreadyPresentException implements AlreadyPresent { +public class IsRelatedToAlreadyPresentException extends RelationAlreadyPresentException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAvailableInAnotherContextException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAvailableInAnotherContextException.java index d1e9bda..eff8ee7 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAvailableInAnotherContextException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToAvailableInAnotherContextException.java @@ -1,13 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AvailableInAnotherContext; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAvailableInAnotherContextException; /** * @author Luca Frosini (ISTI - CNR) */ -public class IsRelatedToAvailableInAnotherContextException extends RelationAvailableInAnotherContextException - implements AvailableInAnotherContext { +public class IsRelatedToAvailableInAnotherContextException extends RelationAvailableInAnotherContextException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToCreationException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToCreationException.java new file mode 100644 index 0000000..9f93565 --- /dev/null +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToCreationException.java @@ -0,0 +1,27 @@ +package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto; + +import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationCreationException; + +/** + * @author Luca Frosini (ISTI - CNR) + * + */ +public class IsRelatedToCreationException extends RelationCreationException { + + /** + * Generated Serial Version UID + */ + private static final long serialVersionUID = -310747999683731578L; + + public IsRelatedToCreationException(String message) { + super(message); + } + + public IsRelatedToCreationException(Throwable cause) { + super(cause); + } + + public IsRelatedToCreationException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToNotFoundException.java index 0d7be9b..463cbd8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/isrelatedto/IsRelatedToNotFoundException.java @@ -1,12 +1,11 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.relation.isrelatedto; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; /** * @author Luca Frosini (ISTI - CNR) */ -public class IsRelatedToNotFoundException extends RelationNotFoundException implements NotFound { +public class IsRelatedToNotFoundException extends RelationNotFoundException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaAlreadyPresentException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaAlreadyPresentException.java index c44160b..96abad3 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaAlreadyPresentException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaAlreadyPresentException.java @@ -1,11 +1,9 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.schema; -import org.gcube.informationsystem.resourceregistry.api.exceptions.AlreadyPresent; - /** * @author Luca Frosini (ISTI - CNR) */ -public class SchemaAlreadyPresentException extends SchemaException implements AlreadyPresent { +public class SchemaAlreadyPresentException extends SchemaException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java index ecc2a8e..e422d03 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/schema/SchemaNotFoundException.java @@ -1,12 +1,10 @@ package org.gcube.informationsystem.resourceregistry.api.exceptions.schema; -import org.gcube.informationsystem.resourceregistry.api.exceptions.NotFound; - /** * @author Luca Frosini (ISTI - CNR) * */ -public class SchemaNotFoundException extends SchemaException implements NotFound { +public class SchemaNotFoundException extends SchemaException { /** * Generated Serial Version UID diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java index 1e995f3..f101440 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/AccessPath.java @@ -17,7 +17,7 @@ public class AccessPath { public static final int UNBOUNDED = -1; public static final int DEFAULT_LIMIT = 20; - public static final String FACET_PATH_PART = ERPath.FACET_PATH_PART; + public static final String FACETS_PATH_PART = ERPath.FACETS_PATH_PART; public static final String RESOURCE_PATH_PART = ERPath.RESOURCE_PATH_PART; public static final String EMBEDDED_PATH_PART = ERPath.EMBEDDED_PATH_PART; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java index e65552e..5084a33 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/ERPath.java @@ -14,7 +14,7 @@ public class ERPath { protected static final String ENTITY_PATH_PART = "entity"; - public static final String FACET_PATH_PART = "facet"; + public static final String FACETS_PATH_PART = "facet"; public static final String RESOURCE_PATH_PART = "resource"; protected static final String RELATION_PATH_PART = "relation"; diff --git a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPCall.java b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPCall.java index e6c3167..87791b8 100644 --- a/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPCall.java +++ b/src/main/java/org/gcube/informationsystem/resourceregistry/api/rest/httputils/HTTPCall.java @@ -20,14 +20,14 @@ import org.gcube.informationsystem.model.ISManageable; import org.gcube.informationsystem.model.entity.Facet; import org.gcube.informationsystem.model.entity.Resource; import org.gcube.informationsystem.model.relation.Relation; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERAvailableInAnotherContextException; +import org.gcube.informationsystem.resourceregistry.api.exceptions.ERNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.ExceptionMapper; import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.facet.FacetNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.entity.resource.ResourceNotFoundException; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAvailableInAnotherContextException; -import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERNotFoundException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationAvailableInAnotherContextException; import org.gcube.informationsystem.resourceregistry.api.exceptions.relation.RelationNotFoundException; import org.slf4j.Logger;