From c0e377db155651466672382ba5cbd8252735cd2c Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 23 Jan 2020 11:47:54 +0100
Subject: [PATCH] MAINT: formatting and update webui
---
caosdb-webui | 2 +-
src/main/java/caosdb/server/CaosDBServer.java | 86 +++++++++----------
.../server/database/BackendTransaction.java | 2 +-
.../caosdb/server/database/DatabaseUtils.java | 41 +++++----
.../MySQL/MySQLGetAllNames.java | 12 ++-
.../MySQL/MySQLRetrieveSparseEntity.java | 6 +-
.../backend/interfaces/GetAllNamesImpl.java | 3 +-
.../backend/transaction/GetAllNames.java | 9 +-
.../java/caosdb/server/entity/Entity.java | 26 +++---
.../caosdb/server/entity/EntityInterface.java | 10 +--
.../container/TransactionContainer.java | 13 +--
.../server/entity/wrapper/EntityWrapper.java | 12 +--
.../caosdb/server/jobs/core/ResolveNames.java | 4 +-
.../server/jobs/core/RetriveAllNames.java | 3 +-
.../server/jobs/extension/AWIBoxLoan.java | 11 +--
.../transaction/EntityNamesResource.java | 5 +-
.../handlers/GetNamesRequestHandler.java | 1 -
.../caosdb/server/transaction/Update.java | 12 +--
.../backend/transactions/TestGetAllNames.java | 31 +++----
19 files changed, 140 insertions(+), 149 deletions(-)
diff --git a/caosdb-webui b/caosdb-webui
index 7d67a76f..f0af8343 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit 7d67a76f1ceede440a2d4dad4db8dcbd0d61b9ed
+Subproject commit f0af834392a581de36b9aa4490a382b8afdc1091
diff --git a/src/main/java/caosdb/server/CaosDBServer.java b/src/main/java/caosdb/server/CaosDBServer.java
index caf67c77..fc693306 100644
--- a/src/main/java/caosdb/server/CaosDBServer.java
+++ b/src/main/java/caosdb/server/CaosDBServer.java
@@ -19,49 +19,6 @@
*/
package caosdb.server;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.time.ZoneId;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.TimeZone;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.config.Ini;
-import org.apache.shiro.config.Ini.Section;
-import org.apache.shiro.config.IniSecurityManagerFactory;
-import org.apache.shiro.mgt.SecurityManager;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.Factory;
-import org.apache.shiro.util.ThreadContext;
-import org.restlet.Application;
-import org.restlet.Component;
-import org.restlet.Context;
-import org.restlet.Request;
-import org.restlet.Response;
-import org.restlet.Restlet;
-import org.restlet.Server;
-import org.restlet.data.CookieSetting;
-import org.restlet.data.Parameter;
-import org.restlet.data.Protocol;
-import org.restlet.data.Reference;
-import org.restlet.data.ServerInfo;
-import org.restlet.data.Status;
-import org.restlet.engine.Engine;
-import org.restlet.routing.Route;
-import org.restlet.routing.Router;
-import org.restlet.routing.Template;
-import org.restlet.routing.TemplateRoute;
-import org.restlet.routing.Variable;
-import org.restlet.util.Series;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import caosdb.server.accessControl.AnonymousRealm;
import caosdb.server.accessControl.AuthenticationUtils;
import caosdb.server.accessControl.CaosDBAuthorizingRealm;
@@ -107,6 +64,49 @@ import caosdb.server.utils.FileUtils;
import caosdb.server.utils.Initialization;
import caosdb.server.utils.NullPrintStream;
import caosdb.server.utils.Utils;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.config.Ini;
+import org.apache.shiro.config.Ini.Section;
+import org.apache.shiro.config.IniSecurityManagerFactory;
+import org.apache.shiro.mgt.SecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.Factory;
+import org.apache.shiro.util.ThreadContext;
+import org.restlet.Application;
+import org.restlet.Component;
+import org.restlet.Context;
+import org.restlet.Request;
+import org.restlet.Response;
+import org.restlet.Restlet;
+import org.restlet.Server;
+import org.restlet.data.CookieSetting;
+import org.restlet.data.Parameter;
+import org.restlet.data.Protocol;
+import org.restlet.data.Reference;
+import org.restlet.data.ServerInfo;
+import org.restlet.data.Status;
+import org.restlet.engine.Engine;
+import org.restlet.routing.Route;
+import org.restlet.routing.Router;
+import org.restlet.routing.Template;
+import org.restlet.routing.TemplateRoute;
+import org.restlet.routing.Variable;
+import org.restlet.util.Series;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CaosDBServer extends Application {
diff --git a/src/main/java/caosdb/server/database/BackendTransaction.java b/src/main/java/caosdb/server/database/BackendTransaction.java
index f3c5c33e..bdace0c9 100644
--- a/src/main/java/caosdb/server/database/BackendTransaction.java
+++ b/src/main/java/caosdb/server/database/BackendTransaction.java
@@ -22,7 +22,6 @@
*/
package caosdb.server.database;
-import java.util.HashMap;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.implementation.MySQL.MySQLDeleteEntityProperties;
import caosdb.server.database.backend.implementation.MySQL.MySQLDeletePassword;
@@ -127,6 +126,7 @@ import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.misc.TransactionBenchmark;
import caosdb.server.utils.UndoHandler;
import caosdb.server.utils.Undoable;
+import java.util.HashMap;
public abstract class BackendTransaction implements Undoable {
diff --git a/src/main/java/caosdb/server/database/DatabaseUtils.java b/src/main/java/caosdb/server/database/DatabaseUtils.java
index 621c9814..5fcc2682 100644
--- a/src/main/java/caosdb/server/database/DatabaseUtils.java
+++ b/src/main/java/caosdb/server/database/DatabaseUtils.java
@@ -22,12 +22,6 @@
*/
package caosdb.server.database;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import com.google.common.base.Objects;
import caosdb.server.database.proto.FlatProperty;
import caosdb.server.database.proto.ProtoProperty;
import caosdb.server.database.proto.SparseEntity;
@@ -44,6 +38,12 @@ import caosdb.server.entity.StatementStatus;
import caosdb.server.entity.wrapper.Domain;
import caosdb.server.entity.wrapper.Parent;
import caosdb.server.entity.wrapper.Property;
+import com.google.common.base.Objects;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
public class DatabaseUtils {
@@ -185,8 +185,8 @@ public class DatabaseUtils {
}
return ret;
}
-
- public static SparseEntity parseNameRoleACL(ResultSet rs) throws SQLException {
+
+ public static SparseEntity parseNameRoleACL(ResultSet rs) throws SQLException {
final SparseEntity ret = new SparseEntity();
ret.role = bytes2UTF8(rs.getBytes("EntityRole"));
ret.name = bytes2UTF8(rs.getBytes("EntityName"));
@@ -195,20 +195,19 @@ public class DatabaseUtils {
}
public static SparseEntity parseEntityResultSet(final ResultSet rs) throws SQLException {
- SparseEntity ret = parseNameRoleACL(rs);
- ret.id = rs.getInt("EntityID");
- ret.description = bytes2UTF8(rs.getBytes("EntityDesc"));
- ret.datatype = bytes2UTF8(rs.getBytes("Datatype"));
- ret.collection = bytes2UTF8(rs.getBytes("Collection"));
-
- final String path = bytes2UTF8(rs.getBytes("FilePath"));
- if (!rs.wasNull()) {
- ret.filePath = path;
- ret.fileSize = rs.getLong("FileSize");
- ret.fileHash = bytes2UTF8(rs.getBytes("FileHash"));
- }
- return ret;
+ SparseEntity ret = parseNameRoleACL(rs);
+ ret.id = rs.getInt("EntityID");
+ ret.description = bytes2UTF8(rs.getBytes("EntityDesc"));
+ ret.datatype = bytes2UTF8(rs.getBytes("Datatype"));
+ ret.collection = bytes2UTF8(rs.getBytes("Collection"));
+ final String path = bytes2UTF8(rs.getBytes("FilePath"));
+ if (!rs.wasNull()) {
+ ret.filePath = path;
+ ret.fileSize = rs.getLong("FileSize");
+ ret.fileHash = bytes2UTF8(rs.getBytes("FileHash"));
+ }
+ return ret;
}
public static ArrayList<VerySparseEntity> parseParentResultSet(final ResultSet rs)
diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
index 97d57964..6f69f343 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLGetAllNames.java
@@ -1,15 +1,15 @@
package caosdb.server.database.backend.implementation.MySQL;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
import caosdb.server.database.DatabaseUtils;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.interfaces.GetAllNamesImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.proto.SparseEntity;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
public class MySQLGetAllNames extends MySQLTransaction implements GetAllNamesImpl {
@@ -42,6 +42,4 @@ public class MySQLGetAllNames extends MySQLTransaction implements GetAllNamesImp
return ret;
}
-
-
}
diff --git a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
index 02da3e78..ebe2aa5f 100644
--- a/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
+++ b/src/main/java/caosdb/server/database/backend/implementation/MySQL/MySQLRetrieveSparseEntity.java
@@ -22,14 +22,14 @@
*/
package caosdb.server.database.backend.implementation.MySQL;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import caosdb.server.database.DatabaseUtils;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.interfaces.RetrieveSparseEntityImpl;
import caosdb.server.database.exceptions.TransactionException;
import caosdb.server.database.proto.SparseEntity;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
public class MySQLRetrieveSparseEntity extends MySQLTransaction
implements RetrieveSparseEntityImpl {
diff --git a/src/main/java/caosdb/server/database/backend/interfaces/GetAllNamesImpl.java b/src/main/java/caosdb/server/database/backend/interfaces/GetAllNamesImpl.java
index 8f028cff..dfd5bd75 100644
--- a/src/main/java/caosdb/server/database/backend/interfaces/GetAllNamesImpl.java
+++ b/src/main/java/caosdb/server/database/backend/interfaces/GetAllNamesImpl.java
@@ -1,10 +1,9 @@
package caosdb.server.database.backend.interfaces;
-import java.util.List;
import caosdb.server.database.proto.SparseEntity;
+import java.util.List;
public interface GetAllNamesImpl extends BackendTransactionImpl {
List<SparseEntity> execute();
-
}
diff --git a/src/main/java/caosdb/server/database/backend/transaction/GetAllNames.java b/src/main/java/caosdb/server/database/backend/transaction/GetAllNames.java
index 52007ba2..f30ec5b2 100644
--- a/src/main/java/caosdb/server/database/backend/transaction/GetAllNames.java
+++ b/src/main/java/caosdb/server/database/backend/transaction/GetAllNames.java
@@ -1,12 +1,12 @@
package caosdb.server.database.backend.transaction;
-import java.util.ArrayList;
-import java.util.List;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.backend.interfaces.GetAllNamesImpl;
import caosdb.server.database.proto.SparseEntity;
import caosdb.server.entity.Entity;
import caosdb.server.entity.EntityInterface;
+import java.util.ArrayList;
+import java.util.List;
public class GetAllNames extends BackendTransaction {
@@ -18,13 +18,12 @@ public class GetAllNames extends BackendTransaction {
this.entities = t.execute();
}
-
+
public List<EntityInterface> getEntities() {
ArrayList<EntityInterface> ret = new ArrayList<>();
- for(SparseEntity e : entities) {
+ for (SparseEntity e : entities) {
ret.add(new Entity().parseSparseEntity(e));
}
return ret;
}
-
}
diff --git a/src/main/java/caosdb/server/entity/Entity.java b/src/main/java/caosdb/server/entity/Entity.java
index 98bef931..19cd9307 100644
--- a/src/main/java/caosdb/server/entity/Entity.java
+++ b/src/main/java/caosdb/server/entity/Entity.java
@@ -22,17 +22,6 @@
*/
package caosdb.server.entity;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.authz.AuthorizationException;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.subject.Subject;
-import org.jdom2.Element;
import caosdb.server.CaosDBException;
import caosdb.server.database.proto.SparseEntity;
import caosdb.server.database.proto.VerySparseEntity;
@@ -58,6 +47,17 @@ import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
import caosdb.server.utils.TransactionLogMessage;
import caosdb.unit.Unit;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.authz.AuthorizationException;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.subject.Subject;
+import org.jdom2.Element;
public class Entity extends AbstractObservable implements EntityInterface {
@@ -116,13 +116,13 @@ public class Entity extends AbstractObservable implements EntityInterface {
final Subject subject = SecurityUtils.getSubject();
checkPermission(subject, permission);
}
-
+
@Override
public boolean hasPermission(Permission permission) {
final Subject subject = SecurityUtils.getSubject();
return hasPermission(subject, permission);
}
-
+
@Override
public boolean hasPermission(Subject subject, Permission permission) {
return this.entityACL.isPermitted(subject, permission);
diff --git a/src/main/java/caosdb/server/entity/EntityInterface.java b/src/main/java/caosdb/server/entity/EntityInterface.java
index b8cfe43a..fc88f428 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 {
@@ -170,9 +170,9 @@ public interface EntityInterface
public abstract void checkPermission(Subject subject, Permission permission);
public abstract void checkPermission(Permission permission);
-
+
public abstract boolean hasPermission(Permission permission);
-
+
public abstract boolean hasPermission(Subject subject, Permission permission);
public abstract boolean hasEntityACL();
diff --git a/src/main/java/caosdb/server/entity/container/TransactionContainer.java b/src/main/java/caosdb/server/entity/container/TransactionContainer.java
index b8c42a4a..79b6f844 100644
--- a/src/main/java/caosdb/server/entity/container/TransactionContainer.java
+++ b/src/main/java/caosdb/server/entity/container/TransactionContainer.java
@@ -22,11 +22,6 @@
*/
package caosdb.server.entity.container;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import org.apache.shiro.subject.Subject;
-import org.jdom2.Element;
import caosdb.server.CaosDBServer;
import caosdb.server.database.misc.TransactionBenchmark;
import caosdb.server.entity.EntityInterface;
@@ -34,8 +29,14 @@ import caosdb.server.entity.FileProperties;
import caosdb.server.entity.xml.ToElementable;
import caosdb.server.jobs.JobTarget;
import caosdb.server.utils.EntityStatus;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import org.apache.shiro.subject.Subject;
+import org.jdom2.Element;
-public class TransactionContainer extends Container<EntityInterface> implements ToElementable, JobTarget {
+public class TransactionContainer extends Container<EntityInterface>
+ implements ToElementable, JobTarget {
private EntityStatus status = EntityStatus.QUALIFIED;
private final Subject owner;
diff --git a/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java b/src/main/java/caosdb/server/entity/wrapper/EntityWrapper.java
index 49e730ec..4d419bbf 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/core/ResolveNames.java b/src/main/java/caosdb/server/jobs/core/ResolveNames.java
index 526a4102..a7781fb4 100644
--- a/src/main/java/caosdb/server/jobs/core/ResolveNames.java
+++ b/src/main/java/caosdb/server/jobs/core/ResolveNames.java
@@ -22,8 +22,6 @@
*/
package caosdb.server.jobs.core;
-import java.util.ArrayList;
-import java.util.List;
import caosdb.server.database.backend.transaction.GetIDByName;
import caosdb.server.database.exceptions.EntityDoesNotExistException;
import caosdb.server.entity.Entity;
@@ -32,6 +30,8 @@ import caosdb.server.entity.container.TransactionContainer;
import caosdb.server.jobs.ContainerJob;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
+import java.util.ArrayList;
+import java.util.List;
public class ResolveNames extends ContainerJob {
diff --git a/src/main/java/caosdb/server/jobs/core/RetriveAllNames.java b/src/main/java/caosdb/server/jobs/core/RetriveAllNames.java
index f13764d6..955bb5aa 100644
--- a/src/main/java/caosdb/server/jobs/core/RetriveAllNames.java
+++ b/src/main/java/caosdb/server/jobs/core/RetriveAllNames.java
@@ -16,11 +16,10 @@ public class RetriveAllNames extends FlagJob {
GetAllNames t = execute(new GetAllNames());
for (EntityInterface e : t.getEntities()) {
- if(e.hasPermission(EntityPermission.RETRIEVE_ENTITY)) {
+ if (e.hasPermission(EntityPermission.RETRIEVE_ENTITY)) {
this.getContainer().add(e);
e.setEntityStatus(EntityStatus.VALID);
}
}
}
-
}
diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java
index 60a4df4d..30dd77e0 100644
--- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java
+++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java
@@ -1,11 +1,7 @@
package caosdb.server.jobs.extension;
import static caosdb.server.permissions.Role.ANONYMOUS_ROLE;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Objects;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
import caosdb.server.accessControl.UserSources;
import caosdb.server.database.exceptions.EntityDoesNotExistException;
import caosdb.server.datatype.SingleValue;
@@ -25,6 +21,11 @@ import caosdb.server.transaction.Update;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
import caosdb.server.utils.Utils;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@JobAnnotation(transaction = caosdb.server.transaction.WriteTransaction.class, loadAlways = true)
public class AWIBoxLoan extends AWIBoxLoanModel {
diff --git a/src/main/java/caosdb/server/resource/transaction/EntityNamesResource.java b/src/main/java/caosdb/server/resource/transaction/EntityNamesResource.java
index 02a65078..2bfca90b 100644
--- a/src/main/java/caosdb/server/resource/transaction/EntityNamesResource.java
+++ b/src/main/java/caosdb/server/resource/transaction/EntityNamesResource.java
@@ -5,15 +5,14 @@ import caosdb.server.resource.transaction.handlers.GetNamesRequestHandler;
import caosdb.server.resource.transaction.handlers.RequestHandler;
public class EntityNamesResource extends EntityResource {
-
+
public EntityNamesResource() {
// only get is allowed
super(true, false, false, false);
}
-
+
@Override
protected RequestHandler<RetrieveContainer> getGetRequestHandler() {
return new GetNamesRequestHandler();
}
-
}
diff --git a/src/main/java/caosdb/server/resource/transaction/handlers/GetNamesRequestHandler.java b/src/main/java/caosdb/server/resource/transaction/handlers/GetNamesRequestHandler.java
index cbbf6b73..3c941b7f 100644
--- a/src/main/java/caosdb/server/resource/transaction/handlers/GetNamesRequestHandler.java
+++ b/src/main/java/caosdb/server/resource/transaction/handlers/GetNamesRequestHandler.java
@@ -9,5 +9,4 @@ public class GetNamesRequestHandler extends RequestHandler<RetrieveContainer> {
public void handle(EntityResource t, RetrieveContainer container) throws Exception {
container.getFlags().put("names", null);
}
-
}
diff --git a/src/main/java/caosdb/server/transaction/Update.java b/src/main/java/caosdb/server/transaction/Update.java
index 1f7c964a..b9e6e8de 100644
--- a/src/main/java/caosdb/server/transaction/Update.java
+++ b/src/main/java/caosdb/server/transaction/Update.java
@@ -22,12 +22,6 @@
*/
package caosdb.server.transaction;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.shiro.authz.AuthorizationException;
-import com.google.common.base.Objects;
import caosdb.server.CaosDBException;
import caosdb.server.database.access.Access;
import caosdb.server.database.backend.transaction.RetrieveFullEntity;
@@ -44,6 +38,12 @@ import caosdb.server.permissions.EntityPermission;
import caosdb.server.permissions.Permission;
import caosdb.server.utils.EntityStatus;
import caosdb.server.utils.ServerMessages;
+import com.google.common.base.Objects;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashSet;
+import java.util.Set;
+import org.apache.shiro.authz.AuthorizationException;
public class Update extends WriteTransaction<UpdateContainer> {
diff --git a/src/test/java/caosdb/server/database/backend/transactions/TestGetAllNames.java b/src/test/java/caosdb/server/database/backend/transactions/TestGetAllNames.java
index f3e62c0f..1c67d5cb 100644
--- a/src/test/java/caosdb/server/database/backend/transactions/TestGetAllNames.java
+++ b/src/test/java/caosdb/server/database/backend/transactions/TestGetAllNames.java
@@ -1,11 +1,7 @@
package caosdb.server.database.backend.transactions;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import org.junit.BeforeClass;
-import org.junit.Test;
+
import caosdb.server.CaosDBServer;
import caosdb.server.database.BackendTransaction;
import caosdb.server.database.access.Access;
@@ -14,13 +10,18 @@ import caosdb.server.database.backend.transaction.GetAllNames;
import caosdb.server.database.misc.TransactionBenchmark;
import caosdb.server.database.proto.SparseEntity;
import caosdb.server.entity.EntityInterface;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class TestGetAllNames {
-
+
public static class GetAllNamesBackend implements GetAllNamesImpl {
@Override
- public void setTransactionBenchmark(TransactionBenchmark b) { }
+ public void setTransactionBenchmark(TransactionBenchmark b) {}
@Override
public TransactionBenchmark getBenchmark() {
@@ -30,10 +31,9 @@ public class TestGetAllNames {
@Override
public List<SparseEntity> execute() {
ArrayList<SparseEntity> ret = new ArrayList<>();
-
-
- for (int i = 0; i<10; i++) {
-
+
+ for (int i = 0; i < 10; i++) {
+
SparseEntity e = new SparseEntity();
e.role = "RecordType";
e.name = "Test" + Integer.toString(i);
@@ -42,12 +42,10 @@ public class TestGetAllNames {
}
return ret;
}
-
- public GetAllNamesBackend(Access access) {
- }
-
+
+ public GetAllNamesBackend(Access access) {}
}
-
+
@BeforeClass
public static void setup() throws IOException {
CaosDBServer.initServerProperties();
@@ -64,5 +62,4 @@ public class TestGetAllNames {
EntityInterface first = entities.get(0);
assertEquals(first.getName(), "Test0");
}
-
}
--
GitLab