Reorganizing exceptions

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/information-system/resource-registry-api@141526 82a268e6-3cf1-43bd-a215-b396298e98cf

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ElementAlreadyPresent.java

@@ -1,12 +0,0 @@
-/**
- * 
- */
-package org.gcube.informationsystem.resourceregistry.api.exceptions;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- *
- */
-public interface ElementAlreadyPresent {
-
-}

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/ElementNotFound.java

@@ -1,9 +0,0 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- * 
- */
-public interface ElementNotFound {
-	
-}

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/context/ContextNotFoundException.java

@@ -1,12 +1,11 @@
 package org.gcube.informationsystem.resourceregistry.api.exceptions.context;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ElementNotFound;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class ContextNotFoundException extends ContextException implements ElementNotFound {
+public class ContextNotFoundException extends ContextException {
 
 	/**
 	 * Generated Serial Version UID

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityAlreadyPresentException.java

@@ -1,12 +1,12 @@
 package org.gcube.informationsystem.resourceregistry.api.exceptions.entity;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ElementAlreadyPresent;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAlreadyPresentException;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class EntityAlreadyPresentException extends EntityException implements ElementAlreadyPresent {
+public class EntityAlreadyPresentException extends ERAlreadyPresentException {
 
 	/**
 	 * Generated Serial Version UID

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/entity/EntityNotFoundException.java

@@ -1,12 +1,12 @@
 package org.gcube.informationsystem.resourceregistry.api.exceptions.entity;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ElementNotFound;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERNotFoundException;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class EntityNotFoundException extends EntityException implements ElementNotFound {
+public class EntityNotFoundException extends ERNotFoundException {
 
 	/**
 	 * Generated Serial Version UID

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERAlreadyPresentException.java

@@ -0,0 +1,28 @@
+package org.gcube.informationsystem.resourceregistry.api.exceptions.er;
+
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ * 
+ */
+public class ERAlreadyPresentException extends ERException {
+
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = 1129094888903457750L;
+
+	public ERAlreadyPresentException(String message) {
+		super(message);
+	}
+	
+	public ERAlreadyPresentException(Throwable cause) {
+		super(cause);
+	}
+	
+	public ERAlreadyPresentException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERException.java

@@ -1,4 +1,7 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.entity;
+/**
+ * 
+ */
+package org.gcube.informationsystem.resourceregistry.api.exceptions.er;
 
 import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 
@@ -6,24 +9,23 @@ import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegis
  * @author Luca Frosini (ISTI - CNR)
  *
  */
-public class EntityException extends ResourceRegistryException {
+public class ERException extends ResourceRegistryException {
 
 	/**
 	 * Generated Serial Version UID
 	 */
-	private static final long serialVersionUID = -477995165028235952L;
+	private static final long serialVersionUID = -2231802464980906972L;
 
-	public EntityException(String message) {
+	public ERException(String message) {
 		super(message);
 	}
 	
-	public EntityException(Throwable cause) {
+	public ERException(Throwable cause) {
 		super(cause);
 	}
 	
-	public EntityException(String message, Throwable cause) {
+	public ERException(String message, Throwable cause) {
 		super(message, cause);
 	}
 	
-	
 }

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/er/ERNotFoundException.java

@@ -0,0 +1,26 @@
+package org.gcube.informationsystem.resourceregistry.api.exceptions.er;
+
+
+/**
+ * @author Luca Frosini (ISTI - CNR)
+ * 
+ */
+public class ERNotFoundException extends ERException {
+
+	/**
+	 * Generated Serial Version UID
+	 */
+	private static final long serialVersionUID = -1687373446724146351L;
+
+	public ERNotFoundException(String message) {
+		super(message);
+	}
+
+	public ERNotFoundException(Throwable cause) {
+		super(cause);
+	}
+	
+	public ERNotFoundException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/query/InvalidQueryException.java

@@ -1,4 +1,6 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions;
+package org.gcube.informationsystem.resourceregistry.api.exceptions.query;
+
+import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
 
 
 /**

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationAlreadyPresentException.java

@@ -1,12 +1,12 @@
 package org.gcube.informationsystem.resourceregistry.api.exceptions.relation;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ElementAlreadyPresent;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERAlreadyPresentException;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class RelationAlreadyPresentException extends RelationException implements ElementAlreadyPresent {
+public class RelationAlreadyPresentException extends ERAlreadyPresentException {
 
 	/**
 	 * Generated Serial Version UID

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationException.java

@@ -1,28 +0,0 @@
-package org.gcube.informationsystem.resourceregistry.api.exceptions.relation;
-
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ResourceRegistryException;
-
-/**
- * @author Luca Frosini (ISTI - CNR)
- * 
- */
-public class RelationException extends ResourceRegistryException {
-
-	/**
-	 * Generated Serial Version UID
-	 */
-	private static final long serialVersionUID = 626792810204076697L;
-
-	public RelationException(String message) {
-		super(message);
-	}
-
-	public RelationException(Throwable cause) {
-		super(cause);
-	}
-	
-	public RelationException(String message, Throwable cause) {
-		super(message, cause);
-	}
-	
-}

src/main/java/org/gcube/informationsystem/resourceregistry/api/exceptions/relation/RelationNotFoundException.java

@@ -1,12 +1,12 @@
 package org.gcube.informationsystem.resourceregistry.api.exceptions.relation;
 
-import org.gcube.informationsystem.resourceregistry.api.exceptions.ElementNotFound;
+import org.gcube.informationsystem.resourceregistry.api.exceptions.er.ERNotFoundException;
 
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class RelationNotFoundException extends RelationException implements ElementNotFound {
+public class RelationNotFoundException extends ERNotFoundException {
 
 
 	/**

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.ElementNotFound;
-
 /**
  * @author Luca Frosini (ISTI - CNR)
  * 
  */
-public class SchemaNotFoundException extends SchemaException implements ElementNotFound {
+public class SchemaNotFoundException extends SchemaException {
 	
 	/**
 	 * Generated Serial Version UID