Skip to content
Snippets Groups Projects
Verified Commit 27ecb031 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

formatting

parent 5d5907e2
No related branches found
No related tags found
1 merge request!21Release v0.4.0
......@@ -22,10 +22,10 @@
*/
package caosdb.server.entity.container;
import caosdb.server.entity.FileProperties;
import java.util.HashMap;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import caosdb.server.entity.FileProperties;
public class WritableContainer extends TransactionContainer {
private static final long serialVersionUID = -4097777313518959519L;
......@@ -38,13 +38,10 @@ public class WritableContainer extends TransactionContainer {
super(user, timestamp, srid, flags);
}
public WritableContainer() {
this(SecurityUtils.getSubject(), System.currentTimeMillis(), null, null);
}
@Override
public void addFile(final String uploadId, final FileProperties fileProperties) {
super.addFile(uploadId, fileProperties);
......
......@@ -22,7 +22,6 @@
*/
package caosdb.server.jobs.core;
import java.util.ArrayList;
import caosdb.server.database.backend.transaction.RetrieveFullEntity;
import caosdb.server.entity.Entity;
import caosdb.server.entity.EntityInterface;
......@@ -33,6 +32,7 @@ import caosdb.server.entity.UpdateEntity;
import caosdb.server.entity.wrapper.Property;
import caosdb.server.jobs.EntityJob;
import caosdb.server.utils.EntityStatus;
import java.util.ArrayList;
public class Inheritance extends EntityJob {
......@@ -81,7 +81,8 @@ public class Inheritance extends EntityJob {
// collect
// properties to be transfered
for (final EntityInterface parProperty : parent.getProperties()) {
switch (inheritance) { case ALL:
switch (inheritance) {
case ALL:
transfer.add(parProperty);
break;
case RECOMMENDED:
......@@ -220,6 +221,5 @@ public class Inheritance extends EntityJob {
}
}
}
}
}
......@@ -22,8 +22,6 @@
*/
package caosdb.server.transaction;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import caosdb.server.CaosDBException;
import caosdb.server.database.DatabaseMonitor;
import caosdb.server.database.access.Access;
......@@ -36,6 +34,8 @@ import caosdb.server.entity.FileProperties;
import caosdb.server.entity.Message;
import caosdb.server.entity.container.WritableContainer;
import caosdb.server.utils.FileUtils;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
/**
* Retrieves all file without a checksum, calculates one and stores it to the database (method
......@@ -43,7 +43,8 @@ import caosdb.server.utils.FileUtils;
*
* @author tf
*/
public class ChecksumUpdater extends WriteTransaction implements Runnable, WriteTransactionInterface {
public class ChecksumUpdater extends WriteTransaction
implements Runnable, WriteTransactionInterface {
private Boolean running = false;
private static final ChecksumUpdater instance = new ChecksumUpdater();
......
......@@ -19,13 +19,6 @@
*/
package caosdb.server.transaction;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.AuthorizationException;
import caosdb.server.CaosDBException;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.transaction.DeleteEntityTransaction;
......@@ -48,6 +41,13 @@ import caosdb.server.permissions.EntityPermission;
import caosdb.server.permissions.Permission;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.AuthorizationException;
public class WriteTransaction extends Transaction<WritableContainer>
implements WriteTransactionInterface {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment