diff --git a/dbrepo-metadata-db/setup-schema.sql b/dbrepo-metadata-db/setup-schema.sql
index 1f46bf29cfefc395882f69e9f9cc460f1b77aec1..0b3a6c132db85e7454de153332c318d13cee2d6f 100644
--- a/dbrepo-metadata-db/setup-schema.sql
+++ b/dbrepo-metadata-db/setup-schema.sql
@@ -221,7 +221,7 @@ CREATE TABLE IF NOT EXISTS `mdb_constraints_foreign_key`
on_delete VARCHAR(50) NULL,
position INT NULL,
PRIMARY KEY (fkid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id),
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE,
FOREIGN KEY (rtid) REFERENCES mdb_tables (id)
) WITH SYSTEM VERSIONING;
@@ -243,7 +243,7 @@ CREATE TABLE IF NOT EXISTS `mdb_constraints_unique`
tid BIGINT NOT NULL,
position INT NULL,
PRIMARY KEY (uid),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id)
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
);
CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
@@ -253,7 +253,7 @@ CREATE TABLE IF NOT EXISTS `mdb_constraints_unique_columns`
cid BIGINT NOT NULL,
PRIMARY KEY (id),
FOREIGN KEY (uid) REFERENCES mdb_constraints_unique (uid),
- FOREIGN KEY (cid) REFERENCES mdb_columns (id)
+ FOREIGN KEY (cid) REFERENCES mdb_columns (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
@@ -262,7 +262,7 @@ CREATE TABLE IF NOT EXISTS `mdb_constraints_checks`
tid BIGINT NOT NULL,
checks VARCHAR(255) NOT NULL,
PRIMARY KEY (id),
- FOREIGN KEY (tid) REFERENCES mdb_tables (id)
+ FOREIGN KEY (tid) REFERENCES mdb_tables (id) ON DELETE CASCADE
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `mdb_concepts`
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessDeniedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessDeniedException.java
index 84169f32e08a9580d23b3590bb7a5691dcfe3975..a13b3f6016bfb60fb5b23c47ffb320e43c0f8165 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessDeniedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AccessDeniedException.java
@@ -13,7 +13,7 @@ public class AccessDeniedException extends IOException {
}
public AccessDeniedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public AccessDeniedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AmqpException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AmqpException.java
index da70a16dd326cb81616e6f25a27b59151d57f33c..68da501b06ebb5c8009dad4179ea3d39e6bbe56a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AmqpException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/AmqpException.java
@@ -11,7 +11,7 @@ public class AmqpException extends Exception {
}
public AmqpException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public AmqpException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ArbitraryPrimaryKeysException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ArbitraryPrimaryKeysException.java
index 0b644444233b141d76b0c4bd321c1bf50ed6880c..68bdb7647042cf0927640df62324fdca99456819 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ArbitraryPrimaryKeysException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ArbitraryPrimaryKeysException.java
@@ -11,7 +11,7 @@ public class ArbitraryPrimaryKeysException extends Exception {
}
public ArbitraryPrimaryKeysException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ArbitraryPrimaryKeysException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BannerMessageNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BannerMessageNotFoundException.java
index e4587b14539c329f409be25e5e67b2651771be88..75693577cbeae6499f65faa5e4e32ca29a613a71 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BannerMessageNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BannerMessageNotFoundException.java
@@ -11,7 +11,7 @@ public class BannerMessageNotFoundException extends Exception {
}
public BannerMessageNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public BannerMessageNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerMalformedException.java
index 975982aeac0f57b8bb5abfa1067e3483d25acb91..a448be46065f1568d7efb69839e98aa3805ae7cc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerMalformedException.java
@@ -13,7 +13,7 @@ public class BrokerMalformedException extends IOException {
}
public BrokerMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public BrokerMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java
index 922462d2ee95b4cfea228b64cab7f80e40fa7661..0d3a1b988b7e389b73c5c69f5474c8ae0afa27f7 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java
@@ -11,7 +11,7 @@ public class BrokerRemoteException extends Exception {
}
public BrokerRemoteException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public BrokerRemoteException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostGrantException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostGrantException.java
index 43c9b928a6250d8db190bfc5104557ac659fb594..4e06e3f843bc46561b5dc733d9f93093571f416d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostGrantException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostGrantException.java
@@ -11,7 +11,7 @@ public class BrokerVirtualHostGrantException extends Exception {
}
public BrokerVirtualHostGrantException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public BrokerVirtualHostGrantException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java
index a9fda0c9d43ffc61ff5205c5f4eabf0ebadd32f0..5f7420d056bf5ea2712d5d3c7523af803e8d50d8 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java
@@ -11,7 +11,7 @@ public class BrokerVirtualHostModificationException extends Exception {
}
public BrokerVirtualHostModificationException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public BrokerVirtualHostModificationException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ColumnParseException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ColumnParseException.java
index c0c1e109de740d33646d7b91bb1a68ebabdc7616..8b81d044522ccf054c6f611314f5b042e811472d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ColumnParseException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ColumnParseException.java
@@ -11,7 +11,7 @@ public class ColumnParseException extends Exception {
}
public ColumnParseException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ColumnParseException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java
index f85cd6846a63acdd0e93d3828fcff57781b979bf..490b3c78dc2f48b2c9f61d16dd3c074e9e178aad 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ConceptNotFoundException.java
@@ -11,7 +11,7 @@ public class ConceptNotFoundException extends Exception {
}
public ConceptNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ConceptNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
index 85d49d4cb34b20b15fdc1441c69cbab0fe0a34f3..40fc0dd4e17db6dcd9f8aa09d73e4fc91bf5d921 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerNotFoundException.java
@@ -11,7 +11,7 @@ public class ContainerNotFoundException extends Exception {
}
public ContainerNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ContainerNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerStillRunningException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
index 0eeceada67c3de08ffdf717b9cea24df0fc30d0a..7799caa84fd8b0b1c7f16cae86980c48b2c7aec1 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ContainerStillRunningException.java
@@ -10,12 +10,12 @@ public class ContainerStillRunningException extends Exception {
super(msg);
}
- public ContainerStillRunningException(String msg, Throwable e) {
- super(msg, e);
+ public ContainerStillRunningException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
- public ContainerStillRunningException(Throwable e) {
- super(e);
+ public ContainerStillRunningException(Throwable thr) {
+ super(thr);
}
}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataDbSidecarException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataDbSidecarException.java
index 036b23f6314fd6e230ca98b1ef8c08138a3f49e0..7258ad17555dc07e5f2896feee5e96d2c9ff8627 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataDbSidecarException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataDbSidecarException.java
@@ -13,7 +13,7 @@ public class DataDbSidecarException extends IOException {
}
public DataDbSidecarException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DataDbSidecarException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataProcessingException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataProcessingException.java
index 873eb5d2820bebea680f55ad94d9350c88f77905..fd86efc2b2d2b2e211e3d12c236225c03afbdc44 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataProcessingException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DataProcessingException.java
@@ -11,7 +11,7 @@ public class DataProcessingException extends Exception {
}
public DataProcessingException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DataProcessingException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseConnectionException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
index 1296c643711ff9ed7bcaea35789201156c239ee8..a1d8dc0d26e3dfbe3a8ef67731e66f2f30f4b935 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseConnectionException.java
@@ -11,7 +11,7 @@ public class DatabaseConnectionException extends Exception {
}
public DatabaseConnectionException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DatabaseConnectionException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
index 1775380783119b43ab6a716d4a152be9298ca4fa..1f9b8295c743efd358ca2781a66edf5663b19a82 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseMalformedException.java
@@ -13,7 +13,7 @@ public class DatabaseMalformedException extends IOException {
}
public DatabaseMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DatabaseMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNameExistsException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNameExistsException.java
index 68e194813806a1a5f3ecd8c36983e6e6a798acfc..86926b70167aa46aed6bdd234909fef38ea6808b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNameExistsException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNameExistsException.java
@@ -13,7 +13,7 @@ public class DatabaseNameExistsException extends IOException {
}
public DatabaseNameExistsException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DatabaseNameExistsException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
index 3c22d6ea357d69865bba2e827209426ec78a6d11..d3c463cd9a5daf336f74d1cecbdb9d731f51f969 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DatabaseNotFoundException.java
@@ -11,7 +11,7 @@ public class DatabaseNotFoundException extends Exception {
}
public DatabaseNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DatabaseNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java
index 4530e1e9967f91f1d86ae4b3eff347ee0e28c224..dc03edf81e473b266843cec7607533ece0e5371c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/DoiNotFoundException.java
@@ -11,7 +11,7 @@ public class DoiNotFoundException extends Exception {
}
public DoiNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public DoiNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java
index fdaa0e3cfd64758d1f31ec8991e2312de00814b1..8b6620fed5bcb6cd520a512764f81269fee6359c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ExchangeNotFoundException.java
@@ -11,7 +11,7 @@ public class ExchangeNotFoundException extends Exception {
}
public ExchangeNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ExchangeNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FileStorageException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FileStorageException.java
index 21968a6e680f88e85ec1406936dc973c20c5c09b..9ec3f4f0df7a4019cffb14d32e1ccb6d1b6a9609 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FileStorageException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FileStorageException.java
@@ -11,7 +11,7 @@ public class FileStorageException extends Exception {
}
public FileStorageException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public FileStorageException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java
index 7364f797a3f48666b6836f7f2154fb48d32dad68..3fb79090130824b40f734928343cd4cb42e38a81 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/FilterBadRequestException.java
@@ -11,7 +11,7 @@ public class FilterBadRequestException extends Exception {
}
public FilterBadRequestException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public FilterBadRequestException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/HeaderInvalidException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/HeaderInvalidException.java
index 87b7da4e97813da498f3ce6e8fd9b8584fb72ea2..ca6e829d3b9b41c0b5e571b58c6250677be5cba3 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/HeaderInvalidException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/HeaderInvalidException.java
@@ -11,7 +11,7 @@ public class HeaderInvalidException extends Exception {
}
public HeaderInvalidException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public HeaderInvalidException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyExistsException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyExistsException.java
index e913485aad24e30b1fc67cf4d493b7233a02c33f..706eeac06d4db44295d052e8439f4f112e01c084 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyExistsException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyExistsException.java
@@ -11,7 +11,7 @@ public class IdentifierAlreadyExistsException extends Exception {
}
public IdentifierAlreadyExistsException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierAlreadyExistsException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyPublishedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyPublishedException.java
index fefe477205e7fd431997e35b94d2ccba0e4bbd54..e8c23984b2390b9f6c527dca7cd9f12254ba9908 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyPublishedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierAlreadyPublishedException.java
@@ -11,7 +11,7 @@ public class IdentifierAlreadyPublishedException extends Exception {
}
public IdentifierAlreadyPublishedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierAlreadyPublishedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java
index 9a844d7651439a897041f060709c242e3dbf9332..c4c2ead188086d6193041934cb9eb06aeae209b2 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierNotFoundException.java
@@ -11,7 +11,7 @@ public class IdentifierNotFoundException extends Exception {
}
public IdentifierNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierPublishingNotAllowedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierPublishingNotAllowedException.java
index b2748cb9a71fee96982605c4833c3edf11f8d012..9623c55919f126c7a0b11ae05c68e8330b319be3 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierPublishingNotAllowedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierPublishingNotAllowedException.java
@@ -11,7 +11,7 @@ public class IdentifierPublishingNotAllowedException extends Exception {
}
public IdentifierPublishingNotAllowedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierPublishingNotAllowedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierRequestException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierRequestException.java
index ef20713d6f95170564908c42707cdea075cd3197..3999c47bc93ab0cfedd5d5ce2ba2d955dd91dc20 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierRequestException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierRequestException.java
@@ -11,7 +11,7 @@ public class IdentifierRequestException extends Exception {
}
public IdentifierRequestException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierRequestException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierUpdateBadFormException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierUpdateBadFormException.java
index 884a5d4bc5e0c3edf69eb98833405fd073f1582d..b71955e757a84bc7c001a0995c015e76f69d1e47 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierUpdateBadFormException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/IdentifierUpdateBadFormException.java
@@ -11,7 +11,7 @@ public class IdentifierUpdateBadFormException extends Exception {
}
public IdentifierUpdateBadFormException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public IdentifierUpdateBadFormException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
index 9b52af25ff35893279889643ba06f7ae8db242c8..ff6d236fc40e30b90b2b011679599e88d0916e25 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageAlreadyExistsException.java
@@ -10,12 +10,12 @@ public class ImageAlreadyExistsException extends Exception {
super(msg);
}
- public ImageAlreadyExistsException(String msg, Throwable e) {
- super(msg, e);
+ public ImageAlreadyExistsException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
- public ImageAlreadyExistsException(Throwable e) {
- super(e);
+ public ImageAlreadyExistsException(Throwable thr) {
+ super(thr);
}
}
\ No newline at end of file
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java
index 5cfc720a4ca3f6c236f58380fae9c520591bde8f..93a7a30912de66767c6270def780399a7e7c9e19 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageInvalidException.java
@@ -10,12 +10,12 @@ public class ImageInvalidException extends Exception {
super(msg);
}
- public ImageInvalidException(String msg, Throwable e) {
- super(msg, e);
+ public ImageInvalidException(String msg, Throwable thr) {
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
- public ImageInvalidException(Throwable e) {
- super(e);
+ public ImageInvalidException(Throwable thr) {
+ super(thr);
}
}
\ No newline at end of file
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotSupportedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
index 1d293e03e5be0ba929f933187d1cbab9bb42a446..c37d2d07a441ed950ac6e3a0ed898478f7fc8e1f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ImageNotSupportedException.java
@@ -11,7 +11,7 @@ public class ImageNotSupportedException extends Exception {
}
public ImageNotSupportedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ImageNotSupportedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/InvalidPrefixException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/InvalidPrefixException.java
index d14264a53c75c5b36143aeb1747082d30d2670f3..0a51bf42b0b2186e5e9c9a448bdf0041701ae1a6 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/InvalidPrefixException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/InvalidPrefixException.java
@@ -11,7 +11,7 @@ public class InvalidPrefixException extends Exception {
}
public InvalidPrefixException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public InvalidPrefixException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
index 6616739278b0b02b8160d09e94c87f304f809628..f4898eba1e0be444043186e7eabf21fabf7add06 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
@@ -11,7 +11,7 @@ public class KeycloakRemoteException extends Exception {
}
public KeycloakRemoteException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public KeycloakRemoteException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java
index b1521fe9402ed022ac69d33f48b704b643fc62da..f7bc6f69f7244da3f892d8f0bec02ed76be6e05b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/NotAllowedException.java
@@ -11,7 +11,7 @@ public class NotAllowedException extends Exception {
}
public NotAllowedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public NotAllowedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java
index cb82fc0b9acc02f7e27faa3fa4f4efdeee8d6532..df590e0669d1d08edfee445d102e051529306f68 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OntologyNotFoundException.java
@@ -11,7 +11,7 @@ public class OntologyNotFoundException extends Exception {
}
public OntologyNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public OntologyNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java
index 0f87985305d93294f1dcbfc1648d3f13a74113de..13414f10e1f89d193512ed23993d4e025edaa281 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/OrcidNotFoundException.java
@@ -11,7 +11,7 @@ public class OrcidNotFoundException extends Exception {
}
public OrcidNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public OrcidNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java
index 9d56aec9c2752c2c37e7b31f227950ad94c95ef3..11b8aecc8757f4d3b7a5c776d963101725eb75cc 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PaginationException.java
@@ -11,7 +11,7 @@ public class PaginationException extends Exception {
}
public PaginationException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public PaginationException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PersistenceException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PersistenceException.java
index 92c1d6f4b9ed8fa7ab2e69e6d11871fe9ed176dd..44bf9da7ed2703897ce79acfbb8f6b4a24e8a5ba 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PersistenceException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/PersistenceException.java
@@ -11,7 +11,7 @@ public class PersistenceException extends Exception {
}
public PersistenceException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public PersistenceException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryAlreadyPersistedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryAlreadyPersistedException.java
index 48d3bb0ad9ec2fb1f7c6b9727f2a3e700291cbc6..4192625527eccc87620e5bb927b5a3ed4963b80f 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryAlreadyPersistedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryAlreadyPersistedException.java
@@ -11,7 +11,7 @@ public class QueryAlreadyPersistedException extends Exception {
}
public QueryAlreadyPersistedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public QueryAlreadyPersistedException(Throwable thr) { super(thr);
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
index 6d3d2bc052a734dd49bf58e309b063c11f55292a..18fdc50074fe7384465de8fb31b9e2cb55372846 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryMalformedException.java
@@ -11,7 +11,7 @@ public class QueryMalformedException extends Exception {
}
public QueryMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public QueryMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java
index a5e90754898f19f6cce8938d2385f3f9fecd43e4..003a85046b5da45eea6ccf9e8f211d4ed0c227d9 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryNotFoundException.java
@@ -11,7 +11,7 @@ public class QueryNotFoundException extends Exception {
}
public QueryNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public QueryNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreException.java
index d07cd0df4aa239005ecfdefec438d9305dcfa818..388a35a85f10ca0457d0929a4053724b696c64d7 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueryStoreException.java
@@ -11,7 +11,7 @@ public class QueryStoreException extends Exception {
}
public QueryStoreException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public QueryStoreException(Throwable thr) { super(thr);
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java
index b5c6aed7ffa34baa9b10d7db3b083eb47223b3ff..7ee465aab5baa05fb272c45daa1067525e43c15b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/QueueNotFoundException.java
@@ -11,7 +11,7 @@ public class QueueNotFoundException extends Exception {
}
public QueueNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public QueueNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RealmNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RealmNotFoundException.java
index 1750cfb525c2947f8f13837b5e89ed7ddc46f8fd..1b69a01df8d5b6598e8eaf12a2d74547cf305759 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RealmNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RealmNotFoundException.java
@@ -11,7 +11,7 @@ public class RealmNotFoundException extends Exception {
}
public RealmNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public RealmNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
index 3f6700d06b277d59ccbf812136faec277261357d..3c2a17743989080140758a016e8900ceac87af7a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RemoteUnavailableException.java
@@ -11,7 +11,7 @@ public class RemoteUnavailableException extends Exception {
}
public RemoteUnavailableException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public RemoteUnavailableException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RoleNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RoleNotFoundException.java
index 8430d64d76c7a422a6e17752398c491cf6f78cd3..21caf8b8bda96729d77fd3b70a4568c66b56e749 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RoleNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RoleNotFoundException.java
@@ -11,7 +11,7 @@ public class RoleNotFoundException extends Exception {
}
public RoleNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public RoleNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java
index e22cad5c36bc4d116c41cffb613a7b3419a9fb79..f6a188e1858eaf1a1b0c2166e40cf02a4011249e 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/RorNotFoundException.java
@@ -11,7 +11,7 @@ public class RorNotFoundException extends Exception {
}
public RorNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public RorNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java
index 70098f61dacc02ff101b4c99724eb83d4b1c636a..2903da9a48fd101e3b1e1aca237d96f9c83d5f4b 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityNotFoundException.java
@@ -11,7 +11,7 @@ public class SemanticEntityNotFoundException extends Exception {
}
public SemanticEntityNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public SemanticEntityNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityPersistException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityPersistException.java
index e33560e942a30c38e1a027c2d1ce1a5a98aa978a..a46ae85be041d29c171fda8278f333c485618c75 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityPersistException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SemanticEntityPersistException.java
@@ -11,7 +11,7 @@ public class SemanticEntityPersistException extends Exception {
}
public SemanticEntityPersistException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public SemanticEntityPersistException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java
index 7415590ad637461baac4c9bf1d68b7d411054b19..b15e055793aa302bfd39685b6e4ae911009412f7 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/SortException.java
@@ -11,7 +11,7 @@ public class SortException extends Exception {
}
public SortException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public SortException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableColumnNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableColumnNotFoundException.java
index e83abd5eef61384fce6292ec2870b76ebcf70481..1de886ca193ae1de15976382ccafe081f5f1301c 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableColumnNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableColumnNotFoundException.java
@@ -11,7 +11,7 @@ public class TableColumnNotFoundException extends Exception {
}
public TableColumnNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public TableColumnNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
index fb232e7155d519be931d0aaa1641a576480ca183..d4de12d91bf2647dd082a74c19a5e22819784cf9 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableMalformedException.java
@@ -11,7 +11,7 @@ public class TableMalformedException extends Exception {
}
public TableMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public TableMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNameExistsException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNameExistsException.java
index e1251f4b5f7eb6889be6cbb21f5085d3f1c0d718..6650c0ac3117720bb6ec0ec097c2ce19aed8367a 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNameExistsException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNameExistsException.java
@@ -11,7 +11,7 @@ public class TableNameExistsException extends Exception {
}
public TableNameExistsException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public TableNameExistsException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java
index 89fa3ed467e76998431c2b366bceb83804824f38..57146ca8c6ba2e92ee20ecb2521eb60872355281 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TableNotFoundException.java
@@ -11,7 +11,7 @@ public class TableNotFoundException extends Exception {
}
public TableNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public TableNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TupleDeleteException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TupleDeleteException.java
index 87e5e4a483f9dfe38f9563be9a9d275415b5a0d9..55b034c7b39407c890cb91f1717e0060a619664e 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TupleDeleteException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/TupleDeleteException.java
@@ -11,7 +11,7 @@ public class TupleDeleteException extends Exception {
}
public TupleDeleteException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public TupleDeleteException(Throwable thr) { super(thr);
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java
index 6a5e1ddf6065a0469c1322a2e37a86c46871b328..2d67d3bc5e2b131626dbcca56aa90ff1d75974b6 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UnitNotFoundException.java
@@ -11,7 +11,7 @@ public class UnitNotFoundException extends Exception {
}
public UnitNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public UnitNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java
index 92f102fb569beec5c45eb6ed8a2043dabe702610..b8867960749e6ac98b122040851849180671a795 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UriMalformedException.java
@@ -11,7 +11,7 @@ public class UriMalformedException extends Exception {
}
public UriMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public UriMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserAttributeNotFoundException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserAttributeNotFoundException.java
index f0d3249868a20ff1211226b4fefd2eade255f3db..2ceb33a0f702fe21702d37ec1e2acc03c6ab8556 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserAttributeNotFoundException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/UserAttributeNotFoundException.java
@@ -11,7 +11,7 @@ public class UserAttributeNotFoundException extends Exception {
}
public UserAttributeNotFoundException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public UserAttributeNotFoundException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
index 5dfdaf170eaccc76da2290673448be19511e4fab..fc96d29c32955a93317387cdf7772569bc791f72 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/ViewMalformedException.java
@@ -11,7 +11,7 @@ public class ViewMalformedException extends Exception {
}
public ViewMalformedException(String msg, Throwable thr) {
- super(msg, thr);
+ super(msg + ": " + thr.getLocalizedMessage(), thr);
}
public ViewMalformedException(Throwable thr) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/mdb/TableRepository.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/mdb/TableRepository.java
index 314c23ab0b8b02432a0d98a8622fc8e6f512bfe0..4ee22add4f56a40ea89428b060e1223324ae7bb0 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/mdb/TableRepository.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/mdb/TableRepository.java
@@ -26,6 +26,8 @@ public interface TableRepository extends JpaRepository<Table, Long> {
*/
List<Table> findByDatabaseOrderByCreatedDesc(Database database);
+ List<Table> findByInternalName(String internalName);
+
/**
* Finds a table with given database and internal name.
*
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
index 681f4efebcc5f254cffcf79107a752ea12fc33f2..21762fad93390459ccf89d2bc87d4542b7ad6b45 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/TableEndpointUnitTest.java
@@ -349,6 +349,35 @@ public class TableEndpointUnitTest extends BaseUnitTest {
assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
}
+ @Test
+ @WithMockUser(username = USER_1_USERNAME, authorities = "delete-table")
+ public void delete_privateHasRoleForeignTable_fails() throws DatabaseNotFoundException, TableNotFoundException {
+
+ /* mock */
+ when(tableService.find(DATABASE_1_ID, TABLE_2_ID))
+ .thenReturn(TABLE_2);
+
+ /* test */
+ assertThrows(NotAllowedException.class, () -> {
+ generic_delete(DATABASE_1_ID, TABLE_2_ID, DATABASE_1, TABLE_2, USER_1_PRINCIPAL);
+ });
+ }
+
+ @Test
+ @WithMockUser(username = USER_2_USERNAME, authorities = "delete-foreign-table")
+ public void delete_privateHasRoleForeignTable_succeeds() throws DatabaseNotFoundException, TableNotFoundException,
+ NotAllowedException, TableMalformedException, QueryMalformedException, ImageNotSupportedException,
+ ContainerNotFoundException, DataProcessingException {
+
+ /* mock */
+ when(tableService.find(DATABASE_1_ID, TABLE_1_ID))
+ .thenReturn(TABLE_1);
+
+ /* test */
+ final ResponseEntity<?> response = generic_delete(DATABASE_1_ID, TABLE_1_ID, DATABASE_1, TABLE_1, USER_2_PRINCIPAL);
+ assertEquals(HttpStatus.ACCEPTED, response.getStatusCode());
+ }
+
@Test
@WithMockUser(username = USER_4_USERNAME)
public void delete_publicNoRole_fails() {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
index c3149bd713ea0fe616724f72468e7d7774dc7417..cf4f5f86edb5f5f0b0f963174d647255ff9c3678 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationWriteTest.java
@@ -97,6 +97,9 @@ public class TableServiceIntegrationWriteTest extends BaseUnitTest {
databaseRepository.save(DATABASE_1_SIMPLE);
tableRepository.save(TABLE_1_SIMPLE);
tableRepository.save(TABLE_2_SIMPLE);
+ /* missing pointers */
+ TABLE_1.setConstraints(TABLE_1_CONSTRAINTS);
+ TABLE_2.setConstraints(TABLE_2_CONSTRAINTS);
}
@Test
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
index ef99379904afbbbc2bacf1b2c625c0c0a474435a..7b37e4d8b94f6a542401ad22313ca3a0ea5fd321 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/TableService.java
@@ -15,8 +15,8 @@ public interface TableService {
/**
* Find a table in the metadata database by database-table id tuple
*
- * @param databaseId The database id.
- * @param tableId The table id.
+ * @param databaseId The database id.
+ * @param tableId The table id.
* @return The database.
* @throws DatabaseNotFoundException The database is not found.
* @throws TableNotFoundException The table is not found.
@@ -33,21 +33,22 @@ public interface TableService {
/**
* Find the table history.
*
- * @param databaseId The database id.
- * @param tableId The table id.
- * @param principal The user principal.
+ * @param databaseId The database id.
+ * @param tableId The table id.
+ * @param principal The user principal.
* @return The history as a list, if successful.
* @throws QueryMalformedException The query is malformed.
* @throws DatabaseNotFoundException The database is not found.
* @throws TableNotFoundException The table is not found.
*/
List<TableHistoryDto> findHistory(Long databaseId, Long tableId, Principal principal)
- throws DatabaseNotFoundException, QueryMalformedException, TableNotFoundException, DatabaseConnectionException, QueryStoreException, UserNotFoundException;
+ throws DatabaseNotFoundException, QueryMalformedException, TableNotFoundException,
+ DatabaseConnectionException, QueryStoreException, UserNotFoundException;
/**
* Select all tables from the metadata database.
*
- * @param databaseId The database id.
+ * @param databaseId The database id.
* @return The list of tables.
*/
List<Table> findAll(Long databaseId) throws DatabaseNotFoundException;
@@ -55,8 +56,8 @@ public interface TableService {
/**
* Deletes a table for a fiven database-table id pair.
*
- * @param databaseId The database id.
- * @param tableId The table id.
+ * @param databaseId The database id.
+ * @param tableId The table id.
* @throws TableNotFoundException The table was not found in the metadata database.
* @throws DatabaseNotFoundException The database was not found in the metadata database.
* @throws ImageNotSupportedException The image is not supported.
@@ -70,8 +71,8 @@ public interface TableService {
/**
* Find a table by database-table id pair
*
- * @param databaseId The database id.
- * @param tableId The table id.
+ * @param databaseId The database id.
+ * @param tableId The table id.
* @return The table.
* @throws TableNotFoundException The table was not found in the metadata database.
* @throws DatabaseNotFoundException The database was not found in the metadata database.
@@ -83,9 +84,9 @@ public interface TableService {
/**
* Creates a table for a database id with given schema as data
*
- * @param databaseId The database id.
- * @param createDto The schema (as data).
- * @param principal The principal.
+ * @param databaseId The database id.
+ * @param createDto The schema (as data).
+ * @param principal The principal.
* @return The created table.
* @throws ImageNotSupportedException The image is not supported.
* @throws DatabaseNotFoundException The database was not found in the metadata database.
@@ -101,10 +102,10 @@ public interface TableService {
/**
* Updates a table column
*
- * @param databaseId The database id.
- * @param tableId The table id.
- * @param columnId The column id.
- * @param updateDto The update data containing unit and concept uris.
+ * @param databaseId The database id.
+ * @param tableId The table id.
+ * @param columnId The column id.
+ * @param updateDto The update data containing unit and concept uris.
* @return The updated table column, if successful.
* @throws TableNotFoundException The table was not found in the metadata database.
* @throws DatabaseNotFoundException The database was not found in the metadata database.
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index 769348786ea1a3637f82cf884526e0341f16da37..50547102ad7c45cc3a2b4568873a228cf63c4595 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -160,10 +160,10 @@ public abstract class BaseTest {
public final static String[] ESCALATED_QUERY_HANDLING = new String[]{"escalated-query-handling"};
public final static String[] DEFAULT_TABLE_HANDLING = new String[]{"default-table-handling",
- "list-tables", "create-table", "modify-table-column-semantics", "find-table"};
+ "list-tables", "create-table", "modify-table-column-semantics", "find-table", "delete-table"};
public final static String[] ESCALATED_TABLE_HANDLING = new String[]{"escalated-table-handling",
- "delete-table"};
+ "delete-foreign-table"};
public final static String[] DEFAULT_USER_HANDLING = new String[]{"default-user-handling", "modify-user-theme",
"modify-user-information"};
@@ -3518,7 +3518,10 @@ public abstract class BaseTest {
ForeignKeyReference.builder().column(TABLE_1_COLUMNS.get(2)).referencedColumn(TABLE_1_COLUMNS.get(0)).build())
).build()
))
- .uniques(List.of(Unique.builder().columns(List.of(TABLE_1_COLUMNS.get(1))).build()))
+ .uniques(List.of(Unique.builder().columns(List.of(
+ TABLE_1_COLUMNS.get(0),
+ TABLE_1_COLUMNS.get(1)
+ )).build()))
.checks(Set.of("`mintemp` > 0"))
.build();
diff --git a/dbrepo-ui/api/analyse.service.js b/dbrepo-ui/api/analyse.service.js
index a244759d628563e92f0e5666237532c7f9eda7dc..b25b051571f70c5bc3a70fc69f0a19f42d146c7e 100644
--- a/dbrepo-ui/api/analyse.service.js
+++ b/dbrepo-ui/api/analyse.service.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import api from '@/api'
+import api, { displayError } from '@/api'
class AnalyseService {
determineDataTypes (filename, separator) {
@@ -15,9 +14,7 @@ class AnalyseService {
resolve(analysis)
})
.catch((error) => {
- const { code, message } = error
- console.error('Failed to load analysis', error)
- Vue.$toast.error(`[${code}] Failed to load analysis: ${message}`)
+ displayError('Failed to load analysis', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/container.service.js b/dbrepo-ui/api/container.service.js
index 2d6021c89f6bf75e0f15b4a1950faf4d626ab933..168716512cefaa4adbc78f92bbff2d7a94010b3c 100644
--- a/dbrepo-ui/api/container.service.js
+++ b/dbrepo-ui/api/container.service.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import api from '@/api'
+import api, { displayError } from '@/api'
class ContainerService {
findAll (limit = 100) {
@@ -11,9 +10,7 @@ class ContainerService {
resolve(containers)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load containers', error)
- Vue.$toast.error(`[${code}] Failed to load containers: ${message}`)
+ displayError('Failed to load container', error)
reject(error)
})
})
@@ -28,9 +25,7 @@ class ContainerService {
resolve(container)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load container', error)
- Vue.$toast.error(`[${code}] Failed to load container: ${message}`)
+ displayError('Failed to load container', error)
reject(error)
})
})
@@ -45,9 +40,7 @@ class ContainerService {
resolve(image)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load image', error)
- Vue.$toast.error(`[${code}] Failed to load image: ${message}`)
+ displayError('Failed to load image', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/identifier.service.js b/dbrepo-ui/api/identifier.service.js
index c377aa03264748308cff834555cf8a5622527660..a214c6d9e7c6a5590bee4ff8fd0be3618ceaf5ce 100644
--- a/dbrepo-ui/api/identifier.service.js
+++ b/dbrepo-ui/api/identifier.service.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import api from '@/api'
+import api, { displayError } from '@/api'
class IdentifierService {
findAll (databaseId, type) {
@@ -12,9 +11,7 @@ class IdentifierService {
resolve(identifiers)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load identifiers', error)
- Vue.$toast.error(`[${code}] Failed to load identifiers: ${message}`)
+ displayError('Failed to load identifiers', error)
reject(error)
})
})
@@ -41,9 +38,7 @@ class IdentifierService {
}
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load identifier metadata', error)
- Vue.$toast.error(`[${code}] Failed to load identifier metadata: ${message}`)
+ displayError('Failed to load identifier', error)
reject(error)
})
})
@@ -58,9 +53,7 @@ class IdentifierService {
resolve(identifier)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load identifier', error)
- Vue.$toast.error(`[${code}] Failed to load identifier: ${message}`)
+ displayError('Failed to load citation recommendation', error)
reject(error)
})
})
@@ -75,9 +68,7 @@ class IdentifierService {
resolve(identifier)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to create identifier', error)
- Vue.$toast.error(`[${code}] Failed to create identifier: ${message}`)
+ displayError('Failed to create identifier', error)
reject(error)
})
})
@@ -92,9 +83,7 @@ class IdentifierService {
resolve(identifier)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to update identifier', error)
- Vue.$toast.error(`[${code}] Failed to update identifier: ${message}`)
+ displayError('Failed to update identifier', error)
reject(error)
})
})
@@ -109,9 +98,7 @@ class IdentifierService {
resolve(identifier)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to export identifier', error)
- Vue.$toast.error(`[${code}] Failed to export identifier: ${message}`)
+ displayError('Failed to export identifier', error)
reject(error)
})
})
@@ -122,9 +109,7 @@ class IdentifierService {
api.delete(`/api/pid/${pid}`, { headers: { Accept: 'application/json' } })
.then(() => resolve())
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to delete identifier', error)
- Vue.$toast.error(`[${code}] Failed to delete identifier: ${message}`)
+ displayError('Failed to delete identifier', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/index.js b/dbrepo-ui/api/index.js
index c56e45b3ddd33a95128133fb6966ec9dbd6ca6e6..c562536197686dcdeb8ce7266963fef3003574fa 100644
--- a/dbrepo-ui/api/index.js
+++ b/dbrepo-ui/api/index.js
@@ -11,15 +11,15 @@ const instance = axios.create({
baseURL: baseUrl
})
-function displayError (error, warning) {
+function displayError (altMessage, error) {
const { code, message } = error.response.data
if (code && message) {
- console.error(warning, error)
- Vue.$toast.error(`[${code}] ${warning}: ${message}`)
+ console.error(error)
+ Vue.$toast.error(message)
return
}
- console.error(warning, error)
- Vue.$toast.error(`[${error.code}] ${warning}: ${error.message}`)
+ console.error(altMessage, error)
+ Vue.$toast.error(`[${error.code}] ${altMessage}: ${error.message}`)
}
export default instance
diff --git a/dbrepo-ui/api/metadata.service.js b/dbrepo-ui/api/metadata.service.js
index c49d1d952da0b0865d6c42c3affd35ed737f1c94..9954f9ca91fb3f20f2fc3fcc9bff3e6ffd0bdad6 100644
--- a/dbrepo-ui/api/metadata.service.js
+++ b/dbrepo-ui/api/metadata.service.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import api from '@/api'
+import api, { displayError } from '@/api'
class MetadataService {
findAllMessages () {
@@ -11,9 +10,7 @@ class MetadataService {
resolve(messages)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load messages', error)
- Vue.$toast.error(`[${code}] Failed to load messages: ${message}`)
+ displayError('Failed to load maintenance messages', error)
reject(error)
})
})
@@ -28,9 +25,7 @@ class MetadataService {
resolve(messages)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to create message', error)
- Vue.$toast.error(`[${code}] Failed to create message: ${message}`)
+ displayError('Failed to create maintenance message', error)
reject(error)
})
})
@@ -45,9 +40,7 @@ class MetadataService {
resolve(messages)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to find message', error)
- Vue.$toast.error(`[${code}] Failed to find message: ${message}`)
+ displayError('Failed to find maintenance message', error)
reject(error)
})
})
@@ -62,9 +55,7 @@ class MetadataService {
resolve(messages)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to update message', error)
- Vue.$toast.error(`[${code}] Failed to update message: ${message}`)
+ displayError('Failed to update maintenance message', error)
reject(error)
})
})
@@ -75,9 +66,7 @@ class MetadataService {
api.delete(`/api/maintenance/message/${id}`, { headers: { Accept: 'application/json' } })
.then(() => resolve())
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to delete message', error)
- Vue.$toast.error(`[${code}] Failed to delete message: ${message}`)
+ displayError('Failed to delete maintenance message', error)
reject(error)
})
})
@@ -92,9 +81,7 @@ class MetadataService {
resolve(messages)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load active messages', error)
- Vue.$toast.error(`[${code}] Failed to load active messages: ${message}`)
+ displayError('Failed to load active maintenance messages', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/middleware.service.js b/dbrepo-ui/api/middleware.service.js
index be56c223bb2fc12365eca24b246fd40262a5d80b..11377428ee1068854619fc90c2db2a992173d8e0 100644
--- a/dbrepo-ui/api/middleware.service.js
+++ b/dbrepo-ui/api/middleware.service.js
@@ -1,5 +1,5 @@
-import Vue from 'vue'
import axios from 'axios'
+import { displayError } from '@/api/index'
class MiddlewareService {
buildQuery (data) {
@@ -11,9 +11,7 @@ class MiddlewareService {
resolve(file)
})
.catch((error) => {
- const { code, message } = error
- console.error('Failed to build query', error)
- Vue.$toast.error(`[${code}] Failed to build query: ${message}`)
+ displayError('Failed to build query', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/query.service.js b/dbrepo-ui/api/query.service.js
index 8f8488d6478611c671b62b8bd36fcf36dd92d538..5029b562ae80013b9f8e7a6a6ca9800183eac679 100644
--- a/dbrepo-ui/api/query.service.js
+++ b/dbrepo-ui/api/query.service.js
@@ -1,5 +1,4 @@
-import Vue from 'vue'
-import api from '@/api'
+import api, { displayError } from '@/api'
class QueryService {
findAll (databaseId, persisted) {
@@ -11,9 +10,7 @@ class QueryService {
resolve(queries)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load queries', error)
- Vue.$toast.error(`[${code}] Failed to load queries: ${message}`)
+ displayError('Failed to load queries', error)
reject(error)
})
})
@@ -27,9 +24,7 @@ class QueryService {
console.debug('response query', query)
resolve(query)
}).catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to load query', error)
- Vue.$toast.error(`[${code}] Failed to load query: ${message}`)
+ displayError('Failed to load query', error)
reject(error)
})
})
@@ -44,9 +39,7 @@ class QueryService {
resolve(query)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to persist query', error)
- Vue.$toast.error(`[${code}] Failed to persist query: ${message}`)
+ displayError('Failed to persist query', error)
reject(error)
})
})
@@ -61,9 +54,7 @@ class QueryService {
resolve(table)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to import csv to table', error)
- Vue.$toast.error(`[${code}] Failed to import csv to table: ${message}`)
+ displayError('Failed to import csv to table', error)
reject(error)
})
})
@@ -78,14 +69,7 @@ class QueryService {
resolve(tuple)
})
.catch((error) => {
- const { status } = error
- const { code, message } = error.response.data
- if (status === 423) {
- console.error('Database failed to accept tuple', error)
- } else {
- console.error('Failed to insert tuple', error)
- }
- Vue.$toast.error(`[${code}] Failed to insert tuple: ${message}`)
+ displayError('Failed to insert tuple', error)
reject(error)
})
})
@@ -100,14 +84,7 @@ class QueryService {
resolve(tuple)
})
.catch((error) => {
- const { status } = error
- const { code, message } = error.response.data
- if (status === 423) {
- console.error('Database failed to accept tuple', error)
- } else {
- console.error('Failed to update tuple', error)
- }
- Vue.$toast.error(`[${code}] Failed to update tuple: ${message}`)
+ displayError('Failed to update tuple', error)
reject(error)
})
})
@@ -122,9 +99,7 @@ class QueryService {
resolve(subset)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to export query', error)
- Vue.$toast.error(`[${code}] Failed to export query: ${message}`)
+ displayError('Failed to export subset', error)
reject(error)
})
})
@@ -139,9 +114,7 @@ class QueryService {
resolve(metadata)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to export metadata', error)
- Vue.$toast.error(`[${code}] Failed to export metadata: ${message}`)
+ displayError('Failed to export metadata', error)
reject(error)
})
})
@@ -156,9 +129,7 @@ class QueryService {
resolve(result)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to execute statement', error)
- Vue.$toast.error(`[${code}] Failed to execute statement: ${message}`)
+ displayError('Failed to execute query', error)
reject(error)
})
})
@@ -173,9 +144,7 @@ class QueryService {
resolve(result)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to re-execute query', error)
- Vue.$toast.error(`[${code}] Failed to re-execute query: ${message}`)
+ displayError('Failed to re-execute query', error)
reject(error)
})
})
@@ -190,9 +159,7 @@ class QueryService {
resolve(count)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to re-execute query count', error)
- Vue.$toast.error(`[${code}] Failed to re-execute query count: ${message}`)
+ displayError('Failed to re-execute query and count results', error)
reject(error)
})
})
@@ -207,9 +174,7 @@ class QueryService {
resolve(result)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to re-execute view', error)
- Vue.$toast.error(`[${code}] Failed to re-execute view: ${message}`)
+ displayError('Failed to re-execute view', error)
reject(error)
})
})
@@ -224,9 +189,7 @@ class QueryService {
resolve(count)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to re-execute view count', error)
- Vue.$toast.error(`[${code}] Failed to re-execute view count: ${message}`)
+ displayError('Failed to re-execute view and count results', error)
reject(error)
})
})
@@ -241,9 +204,7 @@ class QueryService {
resolve(view)
})
.catch((error) => {
- const { code, message } = error.response.data
- console.error('Failed to find view', error)
- Vue.$toast.error(`[${code}] Failed to find view: ${message}`)
+ displayError('Failed to find view', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/search.service.js b/dbrepo-ui/api/search.service.js
index c037199f366e90cc4702d8cda73d909c90097a36..b30c79b6fee7a1b419bdc6be3764570f97be6475 100644
--- a/dbrepo-ui/api/search.service.js
+++ b/dbrepo-ui/api/search.service.js
@@ -1,19 +1,16 @@
-import Vue from 'vue'
-import axios from 'axios'
+import api, { displayError } from '@/api/index'
class SearchService {
getFields (type) {
return new Promise((resolve, reject) => {
- axios.get(`/api/search/${type}/fields`, { headers: { Accept: 'application/json' } })
+ api.get(`/api/search/${type}/fields`, { headers: { Accept: 'application/json' } })
.then((response) => {
const json = response.data
console.debug('fields result', json)
resolve(json)
})
.catch((error) => {
- const { code, message } = error
- console.error(`Failed to load ${type} fields`, error)
- Vue.$toast.error(`[${code}] Failed to load ${type} fields: ${message}`)
+ displayError('Failed to load fields', error)
reject(error)
})
})
@@ -36,16 +33,14 @@ class SearchService {
field_value_pairs: { ...localSearchData }
}
return new Promise((resolve, reject) => {
- axios.post(`/api/search${index ? `/${index}` : ''}`, payload, { headers: { Accept: 'application/json' } })
+ api.post(`/api/search${index ? `/${index}` : ''}`, payload, { headers: { Accept: 'application/json' } })
.then((response) => {
const { hits } = response.data
console.debug('advanced search response', hits.hits)
resolve(hits.hits)
})
.catch((error) => {
- const { code, message } = error
- console.error('Failed to load search results', error)
- Vue.$toast.error(`[${code}] Failed to load search results: ${message}`)
+ displayError('Failed to load search results', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/semantic.service.js b/dbrepo-ui/api/semantic.service.js
index 662106eb5416aa2943c458f3cbcc797e89615e3e..0935727a57640aa119b633596f3e6df8058740b4 100644
--- a/dbrepo-ui/api/semantic.service.js
+++ b/dbrepo-ui/api/semantic.service.js
@@ -10,7 +10,7 @@ class SemanticService {
resolve(ontologies)
})
.catch((error) => {
- displayError(error, 'Failed to load ontologies')
+ displayError('Failed to load ontologies', error)
reject(error)
})
})
@@ -25,7 +25,7 @@ class SemanticService {
resolve(concepts)
})
.catch((error) => {
- displayError(error, 'Failed to load concepts')
+ displayError('Failed to load concepts', error)
reject(error)
})
})
@@ -40,7 +40,7 @@ class SemanticService {
resolve(concept)
})
.catch((error) => {
- displayError(error, 'Failed to update concept')
+ displayError('Failed to update concept', error)
reject(error)
})
})
@@ -55,7 +55,7 @@ class SemanticService {
resolve(units)
})
.catch((error) => {
- displayError(error, 'Failed to load units')
+ displayError('Failed to load units', error)
reject(error)
})
})
@@ -70,7 +70,7 @@ class SemanticService {
resolve(unit)
})
.catch((error) => {
- displayError(error, 'Failed to update unit')
+ displayError('Failed to update unit', error)
reject(error)
})
})
@@ -85,7 +85,7 @@ class SemanticService {
resolve(ontology)
})
.catch((error) => {
- displayError(error, 'Failed to find ontology')
+ displayError('Failed to find ontology', error)
reject(error)
})
})
@@ -100,7 +100,7 @@ class SemanticService {
resolve(ontology)
})
.catch((error) => {
- displayError(error, 'Failed to register ontology')
+ displayError('Failed to register ontology', error)
reject(error)
})
})
@@ -115,7 +115,7 @@ class SemanticService {
resolve(ontology)
})
.catch((error) => {
- displayError(error, 'Failed to update ontology')
+ displayError('Failed to update ontology', error)
reject(error)
})
})
@@ -126,7 +126,7 @@ class SemanticService {
api.delete(`/api/semantic/ontology/${id}`, { headers: { Accept: 'application/json' } })
.then(() => resolve())
.catch((error) => {
- displayError(error, 'Failed to unregister ontology')
+ displayError('Failed to unregister ontology', error)
reject(error)
})
})
@@ -141,7 +141,7 @@ class SemanticService {
resolve(semantics)
})
.catch((error) => {
- displayError(error, 'Failed to suggest table column semantic')
+ displayError('Failed to suggest table column semantic', error)
reject(error)
})
})
diff --git a/dbrepo-ui/api/table.mapper.js b/dbrepo-ui/api/table.mapper.js
index 2f2c69c5529474d1dd7fbe354be6f7895f5b8f92..2150619bf4f65b7c69b75afba724dffe2bc574fd 100644
--- a/dbrepo-ui/api/table.mapper.js
+++ b/dbrepo-ui/api/table.mapper.js
@@ -39,6 +39,16 @@ class TableMapper {
}
})
}
+
+ tableNameToInternalName (name) {
+ return name.toString()
+ .normalize('NFKD')
+ .toLowerCase()
+ .trim()
+ .replace(/\s+/g, '-')
+ .replace(/[^\w-]+/g, '')
+ .replace(/--+/g, '_')
+ }
}
export default new TableMapper()
diff --git a/dbrepo-ui/api/table.service.js b/dbrepo-ui/api/table.service.js
index d2ddf42b6343ff4092d5b314d91290217b8cb5d3..0b3c7d3d5a0d771df354cbc7732836717392a4a8 100644
--- a/dbrepo-ui/api/table.service.js
+++ b/dbrepo-ui/api/table.service.js
@@ -41,6 +41,19 @@ class TableService {
})
}
+ findByName (databaseId, name) {
+ return new Promise((resolve, reject) => {
+ this.findAll(databaseId)
+ .then((tables) => {
+ const filter = tables.filter(t => t.name === name)
+ if (filter.length === 1) {
+ resolve(filter[0])
+ }
+ reject(new Error('Failed to find table with name ' + name + ' in database with id ' + databaseId))
+ })
+ })
+ }
+
updateColumn (databaseId, tableId, columnId, data) {
return new Promise((resolve, reject) => {
api.put(`/api/database/${databaseId}/table/${tableId}/column/${columnId}`, data, { headers: { Accept: 'application/json' } })
@@ -164,6 +177,7 @@ class TableService {
return new Promise((resolve, reject) => {
api.delete(`/api/database/${databaseId}/table/${tableId}`, { headers: { Accept: 'application/json' } })
.then(() => {
+ console.info('Deleted table with id', tableId)
resolve()
})
.catch((error) => {
diff --git a/dbrepo-ui/components/TableSchema.vue b/dbrepo-ui/components/TableSchema.vue
index d2447f2e277bedb67a13950177532e499915337d..4714f76275fef000439ed373a582883ff861d26f 100644
--- a/dbrepo-ui/components/TableSchema.vue
+++ b/dbrepo-ui/components/TableSchema.vue
@@ -109,7 +109,7 @@
<v-btn v-if="back" class="mt-10 mr-2 mb-1" @click="stepBack()">
Back
</v-btn>
- <v-btn color="primary" :loading="localLoading" class="mt-10 mb-1" @click="submit">
+ <v-btn color="primary" :loading="loading" class="mt-10 mb-1" @click="submit">
Continue
</v-btn>
</div>
@@ -134,23 +134,11 @@ export default {
default () {
return false
}
- },
- error: {
- type: Boolean,
- default () {
- return false
- }
- },
- loading: {
- type: Boolean,
- default () {
- return false
- }
}
},
data () {
return {
- localLoading: false,
+ loading: false,
dateFormats: [],
valid: true,
finished: false,
@@ -163,13 +151,7 @@ export default {
return this.columns.filter(c => c.primary_key).length === 0
}
},
- watch: {
- loading () {
- this.localLoading = this.loading
- }
- },
mounted () {
- this.localLoading = this.loading
this.loadDateFormats()
},
methods: {
@@ -194,12 +176,12 @@ export default {
const database = await DatabaseService.findOne(this.$route.params.database_id)
this.dateFormats = database.image.date_formats
} finally {
- this.localLoading = false
+ this.loading = false
}
},
submit () {
this.finished = true
- this.localLoading = true
+ this.loading = true
this.$emit('close', { success: true })
},
setOthers (column) {
diff --git a/dbrepo-ui/components/TableToolbar.vue b/dbrepo-ui/components/TableToolbar.vue
index c4ebefe8e1efb5827d52890cb4216a846df43bfa..90720a6ff2914c9da7e0fe3cd752d19f979ef963 100644
--- a/dbrepo-ui/components/TableToolbar.vue
+++ b/dbrepo-ui/components/TableToolbar.vue
@@ -53,7 +53,6 @@
</v-dialog>
<v-dialog
v-model="dropTableDialog"
- persistent
max-width="640">
<DropTable @close="closed" />
</v-dialog>
diff --git a/dbrepo-ui/pages/database/_database_id/table/import.vue b/dbrepo-ui/pages/database/_database_id/table/import.vue
index a64bcc54f605e3fea0fbec97d47eee6b41451241..ad767f43152c0fc179858d0e422fdaa0e12c398e 100644
--- a/dbrepo-ui/pages/database/_database_id/table/import.vue
+++ b/dbrepo-ui/pages/database/_database_id/table/import.vue
@@ -183,7 +183,7 @@
Table Schema
</v-stepper-step>
<v-stepper-content step="4">
- <TableSchema :back="true" :error="error" :loading="loading" :columns="tableCreate.columns" @close="schemaClose" />
+ <TableSchema ref="schema" :back="true" :columns="tableCreate.columns" @close="schemaClose" />
</v-stepper-content>
<v-stepper-step
:complete="step > 5"
@@ -251,7 +251,7 @@ export default {
required: value => !!value || 'Required'
},
dateFormats: [],
- tableNames: [],
+ tables: [],
tableCreate: {
name: null,
description: null,
@@ -284,6 +284,9 @@ export default {
roles () {
return this.$store.state.roles
},
+ database () {
+ return this.$store.state.database
+ },
validTableName () {
if (this.tableCreate.name === null) {
return true
@@ -291,13 +294,13 @@ export default {
if (this.tableCreate.name.length < 3) {
return true
}
- return !this.tableNames.includes(this.tableCreate.name.toString()
- .normalize('NFKD')
- .toLowerCase()
- .trim()
- .replace(/\s+/g, '-')
- .replace(/[^\w-]+/g, '')
- .replace(/--+/g, '_'))
+ if (!this.database || !('tables' in this.database)) {
+ return false
+ }
+ return !this.database
+ .tables
+ .map(t => t.internal_name)
+ .includes(TableMapper.tableNameToInternalName(this.tableCreate.name))
},
canInsertTableData () {
if (!this.roles) {
@@ -308,7 +311,6 @@ export default {
},
mounted () {
this.loadDateFormats()
- this.listTables()
},
methods: {
notEmpty,
@@ -379,16 +381,6 @@ export default {
this.loading = false
})
},
- listTables () {
- this.loading = true
- TableService.findAll(this.$route.params.database_id)
- .then((tables) => {
- this.tableNames = tables.map(t => t.internal_name)
- })
- .finally(() => {
- this.loading = false
- })
- },
schemaClose (event) {
console.debug('schema closed', event)
if (!event.success) {
@@ -396,7 +388,7 @@ export default {
return
}
this.validStep4 = true
- this.createTable()
+ this.createEmptyTableAndImport()
},
async loadDateFormats () {
this.loading = true
@@ -404,10 +396,10 @@ export default {
const database = await DatabaseService.findOne(this.$route.params.database_id)
this.dateFormats = database.container.image.date_formats
} finally {
- this.localLoading = false
+ this.loading = false
}
},
- createTable () {
+ createEmptyTableAndImport () {
/* make enum values to array */
const validColumns = this.tableCreate.columns.map((column) => {
// validate `id` column: must be a PK
@@ -420,6 +412,24 @@ export default {
// bail out if there is a problem with one of the columns
if (!validColumns.every(Boolean)) { return }
const table = TableMapper.tableCreateToTableCreateDto(this.tableCreate)
+ // check if table already exists (e.g. due to previous fail to import)
+ TableService.findByName(this.$route.params.database_id, this.tableCreate.name)
+ .then((table) => {
+ console.warn('There exists already a table with name', this.tableCreate.name, 'in database: attempt to delete table with id', table.id)
+ TableService.delete(this.$route.params.database_id, table.id)
+ .then(() => {
+ this.$store.dispatch('reloadDatabase')
+ })
+ })
+ .catch(() => {
+ /* ignore, table does not (yet) exist */
+ })
+ .finally(() => {
+ // finally create the table and import csv
+ this.createTableAndImport(table)
+ })
+ },
+ createTableAndImport (table) {
TableService.create(this.$route.params.database_id, table)
.then((table) => {
this.newTableId = table.id
@@ -429,11 +439,17 @@ export default {
await this.$store.dispatch('reloadDatabase')
this.step = 5
})
+ .catch(() => {
+ this.$refs.schema.loading = false
+ })
.finally(() => {
this.loading = false
})
})
.catch(() => {
+ this.$refs.schema.loading = false
+ })
+ .finally(() => {
this.loading = false
})
}