From 8106e478f3f0ec1aca9f91fd66d194b4f08dd70b Mon Sep 17 00:00:00 2001
From: Timm Fitschen <timm.fitschen@ds.mpg.de>
Date: Mon, 10 Dec 2018 15:03:28 +0100
Subject: [PATCH] STY: Formatting
---
.../transaction/DeleteEntityProperties.java | 1 +
.../backend/transaction/DeleteFile.java | 2 +-
.../transaction/DeleteSparseEntity.java | 3 +-
.../backend/transaction/GetChildren.java | 2 +-
.../transaction/GetDependentEntities.java | 2 +-
.../backend/transaction/GetFileIterator.java | 2 +-
.../backend/transaction/GetIDByName.java | 2 +-
.../transaction/InsertEntityDatatype.java | 1 +
.../transaction/InsertEntityProperties.java | 6 +-
.../backend/transaction/InsertFile.java | 4 +-
.../backend/transaction/InsertLogRecord.java | 4 +-
.../transaction/InsertSparseEntity.java | 1 +
.../transaction/RegisterSubDomain.java | 2 +-
.../backend/transaction/RetrieveAll.java | 2 +-
.../RetrieveAllUncheckedFiles.java | 2 +-
.../transaction/RetrieveDatatypes.java | 2 +-
.../transaction/RetrieveFullEntity.java | 2 +-
.../transaction/RetrieveLogRecord.java | 6 +-
.../backend/transaction/RetrieveParents.java | 4 +-
.../transaction/RetrievePermissionRules.java | 4 +-
.../transaction/RetrieveProperties.java | 4 +-
.../backend/transaction/RetrieveRole.java | 2 +-
.../transaction/RetrieveSparseEntity.java | 2 +-
.../RetrieveTransactionHistory.java | 4 +-
.../backend/transaction/RetrieveUser.java | 2 +-
.../backend/transaction/RuleLoader.java | 4 +-
.../transaction/SetPermissionRules.java | 2 +-
.../backend/transaction/UpdateUserRoles.java | 2 +-
.../java/caosdb/server/entity/Entity.java | 22 +++---
.../caosdb/server/entity/EntityInterface.java | 6 +-
.../server/entity/TransactionEntity.java | 8 +--
.../container/TransactionContainer.java | 1 -
.../server/entity/wrapper/EntityWrapper.java | 12 ++--
.../java/caosdb/server/jobs/ContainerJob.java | 3 +-
src/main/java/caosdb/server/jobs/Job.java | 67 ++++++++++---------
.../caosdb/server/jobs/JobAnnotation.java | 2 +-
.../java/caosdb/server/jobs/core/Atomic.java | 2 +-
.../jobs/core/CheckDatatypePresent.java | 2 +-
.../CheckNoAdditionalPropertiesPresent.java | 36 +++++-----
.../jobs/core/CheckNoOverridesPresent.java | 15 +++--
.../java/caosdb/server/jobs/core/PickUp.java | 13 ++--
.../jobs/extension/SQLiteTransaction.java | 10 +--
.../server/transaction/Transaction.java | 26 +++----
.../caosdb/server/utils/ServerMessages.java | 19 ++++--
44 files changed, 166 insertions(+), 154 deletions(-)
diff --git a/src/main/java/caosdb/server/database/backend/transaction/DeleteEntityProperties.java b/src/main/java/caosdb/server/database/backend/transaction/DeleteEntityProperties.java
index addcb4e7..15ace2b9 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/DeleteEntityProperties.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/DeleteEntityProperties.java
@@ -23,6 +23,7 @@
package caosdb.server.database.backend.transaction;
import static caosdb.server.transaction.Transaction.ERROR_INTEGRITY_VIOLATION;
+
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.DeleteEntityPropertiesImpl;
import caosdb.server.database.exceptions.IntegrityException;
diff --git a/src/main/java/caosdb/server/database/backend/transaction/DeleteFile.java b/src/main/java/caosdb/server/database/backend/transaction/DeleteFile.java
index 11235995..82c022be 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/DeleteFile.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/DeleteFile.java
@@ -22,12 +22,12 @@
*/
package caosdb.server.database.backend.transaction;
-import java.io.IOException;
import caosdb.server.CaosDBException;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.Message;
+import java.io.IOException;
public class DeleteFile extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/DeleteSparseEntity.java b/src/main/java/caosdb/server/database/backend/transaction/DeleteSparseEntity.java
index f777a124..4bd6e5b9 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/DeleteSparseEntity.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/DeleteSparseEntity.java
@@ -23,6 +23,7 @@
package caosdb.server.database.backend.transaction;
import static caosdb.server.transaction.Transaction.ERROR_INTEGRITY_VIOLATION;
+
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.DeleteSparseEntityImpl;
import caosdb.server.database.exceptions.IntegrityException;
@@ -38,7 +39,7 @@ public class DeleteSparseEntity extends BackendTransaction {
}
@Override
- protected void execute() {
+ protected void execute() {
RetrieveSparseEntity.removeCached(this.entity.getId());
final DeleteSparseEntityImpl ret = getImplementation(DeleteSparseEntityImpl.class);
diff --git a/src/main/java/caosdb/server/database/backend/transaction/GetChildren.java b/src/main/java/caosdb/server/database/backend/transaction/GetChildren.java
index 2952b985..d476345c 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/GetChildren.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/GetChildren.java
@@ -22,10 +22,10 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.GetChildrenImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.List;
public class GetChildren extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/GetDependentEntities.java b/src/main/java/caosdb/server/database/backend/transaction/GetDependentEntities.java
index 60143ec8..e4e6e96f 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/GetDependentEntities.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/GetDependentEntities.java
@@ -22,10 +22,10 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.GetDependentEntitiesImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.List;
public class GetDependentEntities extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/GetFileIterator.java b/src/main/java/caosdb/server/database/backend/transaction/GetFileIterator.java
index d8f47b18..7e28ff24 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/GetFileIterator.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/GetFileIterator.java
@@ -22,10 +22,10 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.Iterator;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.GetFileIteratorImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.Iterator;
public class GetFileIterator extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/GetIDByName.java b/src/main/java/caosdb/server/database/backend/transaction/GetIDByName.java
index 1adda922..895cd707 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/GetIDByName.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/GetIDByName.java
@@ -22,12 +22,12 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.GetIDByNameImpl;
import caosdb.server.database.exceptions.EntityDoesNotExistException;
import caosdb.server.database.exceptions.EntityWasNotUniqueException;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.List;
public class GetIDByName extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/InsertEntityDatatype.java b/src/main/java/caosdb/server/database/backend/transaction/InsertEntityDatatype.java
index f0f7dbe2..58aa4d88 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/InsertEntityDatatype.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/InsertEntityDatatype.java
@@ -1,6 +1,7 @@
package caosdb.server.database.backend.transaction;
import static caosdb.server.transaction.Transaction.ERROR_INTEGRITY_VIOLATION;
+
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.InsertEntityDatatypeImpl;
import caosdb.server.database.exceptions.IntegrityException;
diff --git a/src/main/java/caosdb/server/database/backend/transaction/InsertEntityProperties.java b/src/main/java/caosdb/server/database/backend/transaction/InsertEntityProperties.java
index d5e32df1..05e4dbce 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/InsertEntityProperties.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/InsertEntityProperties.java
@@ -22,9 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import java.util.Deque;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.DatabaseUtils;
import caosdb.server.database.backend.interfaces.InsertEntityPropertiesImpl;
@@ -38,6 +35,9 @@ import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.Role;
import caosdb.server.entity.StatementStatus;
import caosdb.server.entity.wrapper.Property;
+import java.util.ArrayList;
+import java.util.Deque;
+import java.util.List;
public class InsertEntityProperties extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/InsertFile.java b/src/main/java/caosdb/server/database/backend/transaction/InsertFile.java
index fe479b20..fe9b930e 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/InsertFile.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/InsertFile.java
@@ -22,12 +22,12 @@
*/
package caosdb.server.database.backend.transaction;
-import java.io.IOException;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.Message;
import caosdb.server.utils.EntityStatus;
+import java.io.IOException;
public class InsertFile extends BackendTransaction {
@@ -38,7 +38,7 @@ public class InsertFile extends BackendTransaction {
}
@Override
- public void execute(){
+ public void execute() {
try {
if (this.entity.getEntityStatus() == EntityStatus.QUALIFIED) {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/InsertLogRecord.java b/src/main/java/caosdb/server/database/backend/transaction/InsertLogRecord.java
index c951712a..43a21d48 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/InsertLogRecord.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/InsertLogRecord.java
@@ -22,11 +22,11 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
-import java.util.logging.LogRecord;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.InsertLogRecordImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.List;
+import java.util.logging.LogRecord;
public class InsertLogRecord extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/InsertSparseEntity.java b/src/main/java/caosdb/server/database/backend/transaction/InsertSparseEntity.java
index 1d11d85c..f8711197 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/InsertSparseEntity.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/InsertSparseEntity.java
@@ -23,6 +23,7 @@
package caosdb.server.database.backend.transaction;
import static caosdb.server.transaction.Transaction.ERROR_INTEGRITY_VIOLATION;
+
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.InsertSparseEntityImpl;
import caosdb.server.database.exceptions.IntegrityException;
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RegisterSubDomain.java b/src/main/java/caosdb/server/database/backend/transaction/RegisterSubDomain.java
index f5cd5604..08b999d0 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RegisterSubDomain.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RegisterSubDomain.java
@@ -22,10 +22,10 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.Deque;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.RegisterSubDomainImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.Deque;
public class RegisterSubDomain extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveAll.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveAll.java
index 28f8e344..5820547c 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveAll.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveAll.java
@@ -22,12 +22,12 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveAllImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.entity.RetrieveEntity;
import caosdb.server.entity.container.TransactionContainer;
+import java.util.List;
public class RetrieveAll extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveAllUncheckedFiles.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveAllUncheckedFiles.java
index 192428e7..b9969424 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveAllUncheckedFiles.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveAllUncheckedFiles.java
@@ -22,11 +22,11 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.Iterator;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveAllUncheckedFilesImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.proto.SparseEntity;
+import java.util.Iterator;
public class RetrieveAllUncheckedFiles extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveDatatypes.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveDatatypes.java
index 08eac872..44f8427a 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveDatatypes.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveDatatypes.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveDatatypesImpl;
import caosdb.server.database.exceptions.TransactionException;
@@ -31,6 +30,7 @@ import caosdb.server.entity.Entity;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.RetrieveEntity;
import caosdb.server.entity.container.Container;
+import java.util.ArrayList;
public class RetrieveDatatypes extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java
index 62edee0d..7ac8c159 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveFullEntity.java
@@ -64,7 +64,7 @@ public class RetrieveFullEntity extends BackendTransaction {
}
}
}
-
+
public Container<? extends EntityInterface> getContainer() {
return container;
}
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveLogRecord.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveLogRecord.java
index a08d737f..42211d43 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveLogRecord.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveLogRecord.java
@@ -22,12 +22,12 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveLogRecordImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
public class RetrieveLogRecord extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveParents.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveParents.java
index 0169b087..5d1545d2 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveParents.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveParents.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.database.CacheableBackendTransaction;
@@ -33,6 +31,8 @@ import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.misc.Cache;
import caosdb.server.database.proto.VerySparseEntity;
import caosdb.server.entity.EntityInterface;
+import java.util.ArrayList;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveParents
extends CacheableBackendTransaction<Integer, ArrayList<VerySparseEntity>> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrievePermissionRules.java b/src/main/java/caosdb/server/database/backend/transaction/RetrievePermissionRules.java
index ef99a55b..c0daecbc 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrievePermissionRules.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrievePermissionRules.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.HashSet;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.database.CacheableBackendTransaction;
@@ -31,6 +29,8 @@ import caosdb.server.database.backend.interfaces.RetrievePermissionRulesImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.misc.Cache;
import caosdb.server.permissions.PermissionRule;
+import java.util.HashSet;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrievePermissionRules
extends CacheableBackendTransaction<String, HashSet<PermissionRule>> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveProperties.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveProperties.java
index 98f7994c..b75d91ac 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveProperties.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveProperties.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.database.CacheableBackendTransaction;
@@ -35,6 +33,8 @@ import caosdb.server.database.proto.ProtoProperty;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.Role;
import caosdb.server.entity.wrapper.Property;
+import java.util.ArrayList;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveProperties
extends CacheableBackendTransaction<Integer, ArrayList<ProtoProperty>> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveRole.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveRole.java
index ef5a5ec6..e4587996 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveRole.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveRole.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.accessControl.Role;
@@ -30,6 +29,7 @@ import caosdb.server.database.CacheableBackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveRoleImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.misc.Cache;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveRole extends CacheableBackendTransaction<String, Role> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveSparseEntity.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveSparseEntity.java
index 4d533068..df9f5867 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveSparseEntity.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveSparseEntity.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.database.CacheableBackendTransaction;
@@ -34,6 +33,7 @@ import caosdb.server.database.proto.SparseEntity;
import caosdb.server.entity.Entity;
import caosdb.server.entity.EntityInterface;
import caosdb.server.utils.EntityStatus;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveSparseEntity extends CacheableBackendTransaction<Integer, SparseEntity> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveTransactionHistory.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveTransactionHistory.java
index 795e1691..cb9cdd9e 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveTransactionHistory.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveTransactionHistory.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.datetime.UTCDateTime;
import caosdb.server.database.CacheableBackendTransaction;
import caosdb.server.database.backend.interfaces.RetrieveTransactionHistoryImpl;
@@ -31,6 +29,8 @@ import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.proto.ProtoTransactionLogMessage;
import caosdb.server.entity.EntityInterface;
import caosdb.server.utils.TransactionLogMessage;
+import java.util.ArrayList;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveTransactionHistory
extends CacheableBackendTransaction<Integer, ArrayList<ProtoTransactionLogMessage>> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RetrieveUser.java b/src/main/java/caosdb/server/database/backend/transaction/RetrieveUser.java
index 9ccc4582..7492df38 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RetrieveUser.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RetrieveUser.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.accessControl.Principal;
@@ -31,6 +30,7 @@ import caosdb.server.database.backend.interfaces.RetrieveUserImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.misc.Cache;
import caosdb.server.database.proto.ProtoUser;
+import org.apache.commons.jcs.access.CacheAccess;
public class RetrieveUser extends CacheableBackendTransaction<Principal, ProtoUser> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/RuleLoader.java b/src/main/java/caosdb/server/database/backend/transaction/RuleLoader.java
index 888cefc5..1a8698ac 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/RuleLoader.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/RuleLoader.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import org.apache.commons.jcs.access.CacheAccess;
import caosdb.server.CaosDBServer;
import caosdb.server.ServerProperties;
import caosdb.server.database.CacheableBackendTransaction;
@@ -35,6 +33,8 @@ import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.container.TransactionContainer;
import caosdb.server.jobs.Job;
import caosdb.server.transaction.Transaction;
+import java.util.ArrayList;
+import org.apache.commons.jcs.access.CacheAccess;
public class RuleLoader extends CacheableBackendTransaction<String, ArrayList<Rule>> {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/SetPermissionRules.java b/src/main/java/caosdb/server/database/backend/transaction/SetPermissionRules.java
index 4cb7e852..a632f299 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/SetPermissionRules.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/SetPermissionRules.java
@@ -22,11 +22,11 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.Set;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.SetPermissionRulesImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.permissions.PermissionRule;
+import java.util.Set;
public class SetPermissionRules extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/database/backend/transaction/UpdateUserRoles.java b/src/main/java/caosdb/server/database/backend/transaction/UpdateUserRoles.java
index fc6abf16..359bbb3a 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/UpdateUserRoles.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/UpdateUserRoles.java
@@ -22,11 +22,11 @@
*/
package caosdb.server.database.backend.transaction;
-import java.util.HashSet;
import caosdb.server.accessControl.Principal;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.UpdateUserRolesImpl;
import caosdb.server.database.exceptions.TransactionException;
+import java.util.HashSet;
public class UpdateUserRoles extends BackendTransaction {
diff --git a/src/main/java/caosdb/server/entity/Entity.java b/src/main/java/caosdb/server/entity/Entity.java
index c18d79ec..bf1022da 100644
--- a/src/main/java/caosdb/server/entity/Entity.java
+++ b/src/main/java/caosdb/server/entity/Entity.java
@@ -256,7 +256,7 @@ public class Entity extends AbstractObservable implements EntityInterface {
@Override
public final boolean hasDescription() {
- return !(this.description == null || this.description.isEmpty() || this.description.equals(""));
+ return !(this.description == null || this.description.isEmpty() || this.description.equals(""));
}
@Override
@@ -302,8 +302,9 @@ public class Entity extends AbstractObservable implements EntityInterface {
if (hasEntityStatus() && getEntityStatus() == entityStatus) {
return;
}
- if(this.entityStatus == EntityStatus.UNQUALIFIED ) {
- throw new CaosDBException("It is not allowed to change the state again, once an UNQUALIFIED state has been reached.");
+ if (this.entityStatus == EntityStatus.UNQUALIFIED) {
+ throw new CaosDBException(
+ "It is not allowed to change the state again, once an UNQUALIFIED state has been reached.");
}
this.entityStatus = entityStatus;
notifyObservers(ENTITY_STATUS_CHANGED_EVENT);
@@ -616,8 +617,8 @@ public class Entity extends AbstractObservable implements EntityInterface {
public final boolean hasMessage(final String type) {
for (final ToElementable m : this.messages) {
if (m instanceof Message && ((Message) m).getType().equalsIgnoreCase(type)) {
- return true;
- }
+ return true;
+ }
}
return false;
}
@@ -632,7 +633,7 @@ public class Entity extends AbstractObservable implements EntityInterface {
final LinkedList<Message> ret = new LinkedList<>();
for (final ToElementable m : this.messages) {
if (m instanceof Message && ((Message) m).getType().equalsIgnoreCase(type)) {
- ret.add((Message) m);
+ ret.add((Message) m);
}
}
return ret;
@@ -641,9 +642,11 @@ public class Entity extends AbstractObservable implements EntityInterface {
@Override
public final Message getMessage(final String type, final Integer code) {
for (final ToElementable m : this.messages) {
- if (m instanceof Message&& ((Message) m).getType().equalsIgnoreCase(type) && ((Message) m).getCode() == code) {
- return (Message) m;
- }
+ if (m instanceof Message
+ && ((Message) m).getType().equalsIgnoreCase(type)
+ && ((Message) m).getCode() == code) {
+ return (Message) m;
+ }
}
return null;
}
@@ -748,7 +751,6 @@ public class Entity extends AbstractObservable implements EntityInterface {
this.setDatatype(element.getAttributeValue("datatype"));
} catch (final IllegalArgumentException e) {
addError(ServerMessages.UNKNOWN_DATATYPE);
-
}
}
diff --git a/src/main/java/caosdb/server/entity/EntityInterface.java b/src/main/java/caosdb/server/entity/EntityInterface.java
index 2bfe32a4..76c6c51e 100644
--- a/src/main/java/caosdb/server/entity/EntityInterface.java
+++ b/src/main/java/caosdb/server/entity/EntityInterface.java
@@ -22,9 +22,6 @@
*/
package caosdb.server.entity;
-import java.util.List;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.subject.Subject;
import caosdb.server.database.proto.SparseEntity;
import caosdb.server.database.proto.VerySparseEntity;
import caosdb.server.datatype.AbstractDatatype;
@@ -40,6 +37,9 @@ import caosdb.server.permissions.EntityACL;
import caosdb.server.utils.Observable;
import caosdb.server.utils.TransactionLogMessage;
import caosdb.unit.Unit;
+import java.util.List;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.subject.Subject;
public interface EntityInterface
extends JobTarget, Observable, ToElementable, WriteEntity, TransactionEntity {
diff --git a/src/main/java/caosdb/server/entity/TransactionEntity.java b/src/main/java/caosdb/server/entity/TransactionEntity.java
index 36c581b5..458a1031 100644
--- a/src/main/java/caosdb/server/entity/TransactionEntity.java
+++ b/src/main/java/caosdb/server/entity/TransactionEntity.java
@@ -22,14 +22,14 @@
*/
package caosdb.server.entity;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.jdom2.Element;
import caosdb.server.entity.xml.ToElementStrategy;
import caosdb.server.entity.xml.ToElementable;
import caosdb.server.query.Query.Selection;
import caosdb.server.utils.EntityStatus;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.jdom2.Element;
public interface TransactionEntity {
diff --git a/src/main/java/caosdb/server/entity/container/TransactionContainer.java b/src/main/java/caosdb/server/entity/container/TransactionContainer.java
index 20668f54..58cdb8d9 100644
--- a/src/main/java/caosdb/server/entity/container/TransactionContainer.java
+++ b/src/main/java/caosdb/server/entity/container/TransactionContainer.java
@@ -182,5 +182,4 @@ public class TransactionContainer extends Container<Entity> implements ToElement
public boolean skipJob() {
return false;
}
-
}
diff --git a/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java b/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java
index 8b6ec031..1feeafdb 100644
--- a/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java
+++ b/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java
@@ -22,12 +22,6 @@
*/
package caosdb.server.entity.wrapper;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.subject.Subject;
-import org.jdom2.Element;
import caosdb.server.database.proto.SparseEntity;
import caosdb.server.database.proto.VerySparseEntity;
import caosdb.server.datatype.AbstractDatatype;
@@ -47,6 +41,12 @@ import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.Observer;
import caosdb.server.utils.TransactionLogMessage;
import caosdb.unit.Unit;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.subject.Subject;
+import org.jdom2.Element;
public class EntityWrapper implements EntityInterface {
diff --git a/src/main/java/caosdb/server/jobs/ContainerJob.java b/src/main/java/caosdb/server/jobs/ContainerJob.java
index 6cef06e3..26588b68 100644
--- a/src/main/java/caosdb/server/jobs/ContainerJob.java
+++ b/src/main/java/caosdb/server/jobs/ContainerJob.java
@@ -29,8 +29,7 @@ import caosdb.server.utils.EntityStatus;
public abstract class ContainerJob extends Job {
@Override
- public
- final TransactionContainer getContainer() {
+ public final TransactionContainer getContainer() {
return super.getContainer();
}
diff --git a/src/main/java/caosdb/server/jobs/Job.java b/src/main/java/caosdb/server/jobs/Job.java
index 13209335..5e436627 100644
--- a/src/main/java/caosdb/server/jobs/Job.java
+++ b/src/main/java/caosdb/server/jobs/Job.java
@@ -22,15 +22,6 @@
*/
package caosdb.server.jobs;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.subject.Subject;
-import org.reflections.Reflections;
import caosdb.server.CaosDBException;
import caosdb.server.database.Database;
import caosdb.server.database.backend.transaction.GetIDByName;
@@ -53,6 +44,15 @@ import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.Observable;
import caosdb.server.utils.Observer;
import caosdb.server.utils.ServerMessages;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.subject.Subject;
+import org.reflections.Reflections;
public abstract class Job extends AbstractObservable implements Observer {
private Transaction<? extends TransactionContainer> transaction = null;
@@ -73,8 +73,8 @@ public abstract class Job extends AbstractObservable implements Observer {
protected String getRequestId() {
return getContainer().getRequestId();
}
-
- protected Subject getUser(){
+
+ protected Subject getUser() {
return getTransaction().getTransactor();
}
@@ -121,9 +121,9 @@ public abstract class Job extends AbstractObservable implements Observer {
final EntityInterface entity, final Class<? extends Job> jobclass) {
getTransaction().getSchedule().runJob(entity, jobclass);
}
-
- protected void runJobFromSchedule(ScheduledJob job){
- getTransaction().getSchedule().runJob(job);
+
+ protected void runJobFromSchedule(ScheduledJob job) {
+ getTransaction().getSchedule().runJob(job);
}
public EntityInterface getEntity() {
@@ -156,7 +156,8 @@ public abstract class Job extends AbstractObservable implements Observer {
}
protected final boolean isValidSubTypeNoCache(final int child, final int parent) {
- return child==parent || Database.execute(new IsSubType(child, parent), getTransaction().getAccess()).isSubType();
+ return child == parent
+ || Database.execute(new IsSubType(child, parent), getTransaction().getAccess()).isSubType();
}
protected final EntityInterface retrieveValidSparseEntityByName(final String name)
@@ -173,9 +174,12 @@ public abstract class Job extends AbstractObservable implements Observer {
return ret;
}
- protected final EntityInterface retrieveValidEntity(Integer id){
- return Database.execute(new RetrieveFullEntity(id), getTransaction().getAccess()).getContainer().get(0);
+ protected final EntityInterface retrieveValidEntity(Integer id) {
+ return Database.execute(new RetrieveFullEntity(id), getTransaction().getAccess())
+ .getContainer()
+ .get(0);
}
+
protected final Integer retrieveValidIDByName(final String name) {
return Database.execute(new GetIDByName(name), getTransaction().getAccess()).getId();
}
@@ -215,7 +219,7 @@ public abstract class Job extends AbstractObservable implements Observer {
}
private static void scanJobClasspath() {
-
+
if (allClasses == null || loadAlways == null) {
allClasses = new HashMap<>();
loadAlways = new ArrayList<>();
@@ -240,7 +244,7 @@ public abstract class Job extends AbstractObservable implements Observer {
if (flagName.length() > 0) {
allClasses.put(flagName.toLowerCase(), c);
}
- if (c.getAnnotation(JobAnnotation.class).loadAlways()){
+ if (c.getAnnotation(JobAnnotation.class).loadAlways()) {
loadAlways.add(c);
}
}
@@ -253,8 +257,7 @@ public abstract class Job extends AbstractObservable implements Observer {
}
public static List<Job> loadDataTypeSpecificJobs(
- final EntityInterface entity,
- final Transaction<? extends TransactionContainer> transaction) {
+ final EntityInterface entity, final Transaction<? extends TransactionContainer> transaction) {
return loadDataTypeSpecificJobs(entity.getDatatype(), entity, transaction);
}
@@ -281,17 +284,16 @@ public abstract class Job extends AbstractObservable implements Observer {
}
public static List<Job> loadStandardJobs(
- final EntityInterface entity,
- final Transaction<? extends TransactionContainer> transaction) {
+ final EntityInterface entity, final Transaction<? extends TransactionContainer> transaction) {
- final ArrayList<Job> jobs = new ArrayList<>();
+ final ArrayList<Job> jobs = new ArrayList<>();
// load permanent jobs
for (Class<? extends Job> j : loadAlways) {
- if(j.getAnnotation(JobAnnotation.class).transaction().isInstance(transaction)){
+ if (j.getAnnotation(JobAnnotation.class).transaction().isInstance(transaction)) {
jobs.add(getJob(j, Mode.MUST, entity, transaction));
}
}
-
+
// load general rules
{
final RuleLoader t = new RuleLoader(0, 0, entity, transaction);
@@ -300,8 +302,7 @@ public abstract class Job extends AbstractObservable implements Observer {
// load Role specific rules
if (entity.hasRole()) {
- final RuleLoader t =
- new RuleLoader(0, entity.getRole().getId(), entity, transaction);
+ final RuleLoader t = new RuleLoader(0, entity.getRole().getId(), entity, transaction);
jobs.addAll(Database.execute(t, transaction.getAccess()).getJobs());
}
@@ -311,11 +312,14 @@ public abstract class Job extends AbstractObservable implements Observer {
return jobs;
}
- private static Job getJob(Class<? extends Job> jobClass, Mode mode, EntityInterface entity,
+ private static Job getJob(
+ Class<? extends Job> jobClass,
+ Mode mode,
+ EntityInterface entity,
Transaction<? extends TransactionContainer> transaction) {
Job ret;
try {
-
+
if (jobClass != null) {
ret = jobClass.newInstance();
ret.init(mode, entity, transaction);
@@ -328,8 +332,7 @@ public abstract class Job extends AbstractObservable implements Observer {
}
public static List<Job> loadJobs(
- final EntityInterface entity,
- final Transaction<? extends TransactionContainer> transaction) {
+ final EntityInterface entity, final Transaction<? extends TransactionContainer> transaction) {
final LinkedList<Job> jobs = new LinkedList<>();
// general rules, role rules, data type rules
diff --git a/src/main/java/caosdb/server/jobs/JobAnnotation.java b/src/main/java/caosdb/server/jobs/JobAnnotation.java
index 97263aeb..96f4afcd 100644
--- a/src/main/java/caosdb/server/jobs/JobAnnotation.java
+++ b/src/main/java/caosdb/server/jobs/JobAnnotation.java
@@ -50,7 +50,7 @@ public @interface JobAnnotation {
/**
* Load for every transaction that is a subclass of 'transaction'.
- *
+ *
* @return false per default.
*/
boolean loadAlways() default false;
diff --git a/src/main/java/caosdb/server/jobs/core/Atomic.java b/src/main/java/caosdb/server/jobs/core/Atomic.java
index cf6d99a0..f41eba28 100644
--- a/src/main/java/caosdb/server/jobs/core/Atomic.java
+++ b/src/main/java/caosdb/server/jobs/core/Atomic.java
@@ -37,7 +37,7 @@ public class Atomic extends ContainerJob {
private boolean doCheck() {
if (getContainer().getStatus() == EntityStatus.QUALIFIED) {
for (final EntityInterface entity : getContainer()) {
- if(entity.getEntityStatus() == EntityStatus.UNQUALIFIED) {
+ if (entity.getEntityStatus() == EntityStatus.UNQUALIFIED) {
getContainer().setStatus(EntityStatus.UNQUALIFIED);
getContainer().addMessage(ServerMessages.ATOMICITY_ERROR);
// job done. remove observer.
diff --git a/src/main/java/caosdb/server/jobs/core/CheckDatatypePresent.java b/src/main/java/caosdb/server/jobs/core/CheckDatatypePresent.java
index ca6ced6e..7948900d 100644
--- a/src/main/java/caosdb/server/jobs/core/CheckDatatypePresent.java
+++ b/src/main/java/caosdb/server/jobs/core/CheckDatatypePresent.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.jobs.core;
-import java.util.List;
import caosdb.server.database.exceptions.EntityDoesNotExistException;
import caosdb.server.database.exceptions.EntityWasNotUniqueException;
import caosdb.server.datatype.AbstractCollectionDatatype;
@@ -36,6 +35,7 @@ import caosdb.server.jobs.Job;
import caosdb.server.permissions.EntityPermission;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
+import java.util.List;
/**
* Check whether the entity has a data type. Assign the data type of the abstract property if
diff --git a/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java b/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
index 1557401d..7904e47d 100644
--- a/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
+++ b/src/main/java/caosdb/server/jobs/core/CheckNoAdditionalPropertiesPresent.java
@@ -1,48 +1,49 @@
package caosdb.server.jobs.core;
-import java.util.HashSet;
-import java.util.Set;
import caosdb.server.entity.EntityInterface;
import caosdb.server.entity.Message;
import caosdb.server.jobs.EntityJob;
import caosdb.server.jobs.JobAnnotation;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
+import java.util.HashSet;
+import java.util.Set;
-@JobAnnotation(flag="noAdditionalProperties", description="Fail if this entity has any property which has not been defined by the parents of this entity.")
+@JobAnnotation(
+ flag = "noAdditionalProperties",
+ description =
+ "Fail if this entity has any property which has not been defined by the parents of this entity.")
public class CheckNoAdditionalPropertiesPresent extends EntityJob {
private Set<EntityInterface> used = new HashSet<>();
@Override
protected void run() {
-
+
// validate all parents and properties
runJobFromSchedule(getEntity(), CheckParOblPropPresent.class);
-
-
- if(getEntity().getEntityStatus() == EntityStatus.QUALIFIED && getEntity().hasProperties()){
- for(EntityInterface property : getEntity().getProperties()){
+
+ if (getEntity().getEntityStatus() == EntityStatus.QUALIFIED && getEntity().hasProperties()) {
+ for (EntityInterface property : getEntity().getProperties()) {
checkProperty(property);
}
}
-
}
-
- public void checkProperty(EntityInterface property){
- for(EntityInterface parent : getEntity().getParents()){
- for(EntityInterface parentProperty : parent.getProperties()){
- if(sameProperty(property, parentProperty) && !used.contains(parentProperty)){
- used .add(parentProperty);
+
+ public void checkProperty(EntityInterface property) {
+ for (EntityInterface parent : getEntity().getParents()) {
+ for (EntityInterface parentProperty : parent.getProperties()) {
+ if (sameProperty(property, parentProperty) && !used.contains(parentProperty)) {
+ used.add(parentProperty);
}
}
// not found!
- addMessage(property,ServerMessages.ADDITIONAL_PROPERTY);
+ addMessage(property, ServerMessages.ADDITIONAL_PROPERTY);
}
}
private void addMessage(EntityInterface property, Message message) {
- if(getMode()==Mode.MUST) {
+ if (getMode() == Mode.MUST) {
property.addError(message);
} else {
property.addWarning(message);
@@ -52,5 +53,4 @@ public class CheckNoAdditionalPropertiesPresent extends EntityJob {
private boolean sameProperty(EntityInterface property, EntityInterface parentProperty) {
return property.getId() == parentProperty.getId();
}
-
}
diff --git a/src/main/java/caosdb/server/jobs/core/CheckNoOverridesPresent.java b/src/main/java/caosdb/server/jobs/core/CheckNoOverridesPresent.java
index d640f19f..c6b16210 100644
--- a/src/main/java/caosdb/server/jobs/core/CheckNoOverridesPresent.java
+++ b/src/main/java/caosdb/server/jobs/core/CheckNoOverridesPresent.java
@@ -6,31 +6,32 @@ import caosdb.server.jobs.EntityJob;
import caosdb.server.jobs.JobAnnotation;
import caosdb.server.utils.ServerMessages;
-@JobAnnotation(flag="noOverrides", description="Fail if this entity has any properties with overrides.")
+@JobAnnotation(
+ flag = "noOverrides",
+ description = "Fail if this entity has any properties with overrides.")
public class CheckNoOverridesPresent extends EntityJob {
@Override
protected void run() {
runJobFromSchedule(this.getEntity(), CheckPropValid.class);
- for(Property p : getEntity().getProperties()){
- if(p.isDatatypeOverride()){
+ for (Property p : getEntity().getProperties()) {
+ if (p.isDatatypeOverride()) {
addMessage(p, ServerMessages.PROPERTY_WITH_DATATYPE_OVERRIDE);
}
- if(p.isNameOverride()){
+ if (p.isNameOverride()) {
addMessage(p, ServerMessages.PROPERTY_WITH_NAME_OVERRIDE);
}
- if(p.isDescOverride()){
+ if (p.isDescOverride()) {
addMessage(p, ServerMessages.PROPERTY_WITH_DESC_OVERRIDE);
}
}
}
private void addMessage(Property p, Message message) {
- if(getMode()==Mode.MUST){
+ if (getMode() == Mode.MUST) {
p.addError(message);
} else {
p.addWarning(message);
}
}
-
}
diff --git a/src/main/java/caosdb/server/jobs/core/PickUp.java b/src/main/java/caosdb/server/jobs/core/PickUp.java
index 8d200ac5..542e7ee5 100644
--- a/src/main/java/caosdb/server/jobs/core/PickUp.java
+++ b/src/main/java/caosdb/server/jobs/core/PickUp.java
@@ -70,11 +70,14 @@ public class PickUp extends EntityJob {
@Override
public boolean notifyObserver(final String e, final Observable o) {
- if (e == Entity.ENTITY_STATUS_CHANGED_EVENT && o == getEntity() && this.rollBack && getEntity().getEntityStatus() == EntityStatus.UNQUALIFIED) {
- final File target = new File(FileSystem.getDropOffBox() + this.dropOffBoxPath);
- getEntity().getFileProperties().getFile().renameTo(target);
- this.rollBack = false;
- return false;
+ if (e == Entity.ENTITY_STATUS_CHANGED_EVENT
+ && o == getEntity()
+ && this.rollBack
+ && getEntity().getEntityStatus() == EntityStatus.UNQUALIFIED) {
+ final File target = new File(FileSystem.getDropOffBox() + this.dropOffBoxPath);
+ getEntity().getFileProperties().getFile().renameTo(target);
+ this.rollBack = false;
+ return false;
}
return true;
}
diff --git a/src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java b/src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java
index 17125669..907700ee 100644
--- a/src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java
+++ b/src/main/java/caosdb/server/jobs/extension/SQLiteTransaction.java
@@ -22,6 +22,11 @@
*/
package caosdb.server.jobs.extension;
+import caosdb.server.CaosDBException;
+import caosdb.server.entity.FileProperties;
+import caosdb.server.entity.Message;
+import caosdb.server.jobs.EntityJob;
+import caosdb.server.utils.FileUtils;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.sql.Connection;
@@ -34,11 +39,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.locks.ReentrantLock;
-import caosdb.server.CaosDBException;
-import caosdb.server.entity.FileProperties;
-import caosdb.server.entity.Message;
-import caosdb.server.jobs.EntityJob;
-import caosdb.server.utils.FileUtils;
public class SQLiteTransaction extends EntityJob {
private static HashMap<String, ReentrantLock> lockedTables = new HashMap<String, ReentrantLock>();
diff --git a/src/main/java/caosdb/server/transaction/Transaction.java b/src/main/java/caosdb/server/transaction/Transaction.java
index 396cf061..9e03b775 100644
--- a/src/main/java/caosdb/server/transaction/Transaction.java
+++ b/src/main/java/caosdb/server/transaction/Transaction.java
@@ -22,9 +22,6 @@
*/
package caosdb.server.transaction;
-import java.util.HashMap;
-import java.util.List;
-import org.apache.shiro.subject.Subject;
import caosdb.datetime.UTCDateTime;
import caosdb.server.accessControl.AuthenticationUtils;
import caosdb.server.accessControl.Principal;
@@ -49,6 +46,9 @@ import caosdb.server.jobs.core.PickUp;
import caosdb.server.utils.AbstractObservable;
import caosdb.server.utils.Info;
import caosdb.server.utils.Observer;
+import java.util.HashMap;
+import java.util.List;
+import org.apache.shiro.subject.Subject;
public abstract class Transaction<C extends TransactionContainer> extends AbstractObservable
implements TransactionInterface {
@@ -66,11 +66,10 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
protected Transaction(final C container) {
this(container, Info.getInstance());
}
-
- protected Transaction(C container, Observer o){
+
+ protected Transaction(C container, Observer o) {
this.container = container;
- if(o!=null)
- acceptObserver(o);
+ if (o != null) acceptObserver(o);
}
public static DatabaseMonitor getMonitor() {
@@ -83,21 +82,16 @@ public abstract class Transaction<C extends TransactionContainer> extends Abstra
protected void makeSchedule() throws Exception {
// load flag jobs
- final Job loadContainerFlags =
- Job.getJob("LoadContainerFlagJobs", Mode.MUST, null, this);
+ final Job loadContainerFlags = Job.getJob("LoadContainerFlagJobs", Mode.MUST, null, this);
this.schedule.add(loadContainerFlags);
this.schedule.runJob(loadContainerFlags);
// all transactions are atomic
- this.schedule.add(
- Job.getJob(Atomic.class.getSimpleName(), Mode.MUST, null, this));
+ this.schedule.add(Job.getJob(Atomic.class.getSimpleName(), Mode.MUST, null, this));
// AccessControl
- this.schedule.add(
- Job.getJob(AccessControl.class.getSimpleName(), Mode.MUST, null, this));
- this.schedule.add(
- Job.getJob(
- CheckEntityACLRoles.class.getSimpleName(), Mode.MUST, null, this));
+ this.schedule.add(Job.getJob(AccessControl.class.getSimpleName(), Mode.MUST, null, this));
+ this.schedule.add(Job.getJob(CheckEntityACLRoles.class.getSimpleName(), Mode.MUST, null, this));
for (final EntityInterface e : getContainer()) {
final List<Job> loadJobs = Job.loadJobs(e, this);
diff --git a/src/main/java/caosdb/server/utils/ServerMessages.java b/src/main/java/caosdb/server/utils/ServerMessages.java
index d4a0f713..ac1d47a3 100644
--- a/src/main/java/caosdb/server/utils/ServerMessages.java
+++ b/src/main/java/caosdb/server/utils/ServerMessages.java
@@ -419,11 +419,18 @@ public class ServerMessages {
public static final Message SERVER_SIDE_SCRIPT_MISSING_CALL =
new Message(MessageType.Error, 400, "You must specify the `call` field.");
- public static final Message ADDITIONAL_PROPERTY = new Message(MessageType.Warning,0,"This property is an additional property which has no corresponding properties among the properties of the parents.");
+ public static final Message ADDITIONAL_PROPERTY =
+ new Message(
+ MessageType.Warning,
+ 0,
+ "This property is an additional property which has no corresponding properties among the properties of the parents.");
+
+ public static final Message PROPERTY_WITH_DATATYPE_OVERRIDE =
+ new Message(MessageType.Warning, 0, "This property overrides the datatype.");
+
+ public static final Message PROPERTY_WITH_DESC_OVERRIDE =
+ new Message(MessageType.Warning, 0, "This property overrides the description.");
- public static final Message PROPERTY_WITH_DATATYPE_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the datatype.");
-
- public static final Message PROPERTY_WITH_DESC_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the description.");
-
- public static final Message PROPERTY_WITH_NAME_OVERRIDE = new Message(MessageType.Warning,0,"This property overrides the name.");
+ public static final Message PROPERTY_WITH_NAME_OVERRIDE =
+ new Message(MessageType.Warning, 0, "This property overrides the name.");
}
--
GitLab