diff --git a/src/main/java/caosdb/server/accessControl/AuthenticationUtils.java b/src/main/java/caosdb/server/accessControl/AuthenticationUtils.java index 0cbaf9ef0b6a61d66ffe9b2687c0501710ae2be9..bc78d6df6116c40fc551f53313b11cbf25faff9a 100644 --- a/src/main/java/caosdb/server/accessControl/AuthenticationUtils.java +++ b/src/main/java/caosdb/server/accessControl/AuthenticationUtils.java @@ -44,7 +44,6 @@ import org.restlet.data.CookieSetting; */ public class AuthenticationUtils { - public static final String ONE_TIME_TOKEN_COOKIE = "OneTimeToken"; public static final String SESSION_TOKEN_COOKIE = "SessionToken"; public static final String SESSION_TIMEOUT_COOKIE = "SessionTimeOut"; diff --git a/src/test/java/caosdb/server/permissions/EntityACLTest.java b/src/test/java/caosdb/server/permissions/EntityACLTest.java index 1953896719c5cf5eb202cf48c186a8192c4136db..6aae2257e5623d072c5f60e5991a5cb0248ecf74 100644 --- a/src/test/java/caosdb/server/permissions/EntityACLTest.java +++ b/src/test/java/caosdb/server/permissions/EntityACLTest.java @@ -24,17 +24,7 @@ package caosdb.server.permissions; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.IOException; -import java.util.BitSet; -import java.util.HashSet; -import java.util.LinkedList; -import org.apache.shiro.SecurityUtils; -import org.apache.shiro.subject.Subject; -import org.jdom2.Element; -import org.jdom2.JDOMException; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; + import caosdb.server.CaosDBServer; import caosdb.server.accessControl.AnonymousAuthenticationToken; import caosdb.server.accessControl.AuthenticationUtils; @@ -50,6 +40,17 @@ import caosdb.server.database.misc.TransactionBenchmark; import caosdb.server.resource.AbstractCaosDBServerResource; import caosdb.server.resource.AbstractCaosDBServerResource.XMLParser; import caosdb.server.utils.Utils; +import java.io.IOException; +import java.util.BitSet; +import java.util.HashSet; +import java.util.LinkedList; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; +import org.jdom2.Element; +import org.jdom2.JDOMException; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; public class EntityACLTest { diff --git a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java index e9a7cffc66e4c18551ea3375a87489e2b15dc279..59f0a1d5812b1127ea0ff4514520bc30039af5cd 100644 --- a/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java +++ b/src/test/java/caosdb/server/resource/TestAbstractCaosDBServerResource.java @@ -2,6 +2,21 @@ package caosdb.server.resource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; + +import caosdb.server.CaosDBException; +import caosdb.server.CaosDBServer; +import caosdb.server.ServerProperties; +import caosdb.server.accessControl.AnonymousAuthenticationToken; +import caosdb.server.accessControl.AnonymousRealm; +import caosdb.server.accessControl.Role; +import caosdb.server.database.BackendTransaction; +import caosdb.server.database.access.Access; +import caosdb.server.database.backend.implementation.MySQL.ConnectionException; +import caosdb.server.database.backend.interfaces.RetrievePermissionRulesImpl; +import caosdb.server.database.backend.interfaces.RetrieveRoleImpl; +import caosdb.server.database.exceptions.TransactionException; +import caosdb.server.database.misc.TransactionBenchmark; +import caosdb.server.permissions.PermissionRule; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -18,20 +33,6 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.restlet.data.Reference; import org.restlet.representation.Representation; -import caosdb.server.CaosDBException; -import caosdb.server.CaosDBServer; -import caosdb.server.ServerProperties; -import caosdb.server.accessControl.AnonymousAuthenticationToken; -import caosdb.server.accessControl.AnonymousRealm; -import caosdb.server.accessControl.Role; -import caosdb.server.database.BackendTransaction; -import caosdb.server.database.access.Access; -import caosdb.server.database.backend.implementation.MySQL.ConnectionException; -import caosdb.server.database.backend.interfaces.RetrievePermissionRulesImpl; -import caosdb.server.database.backend.interfaces.RetrieveRoleImpl; -import caosdb.server.database.exceptions.TransactionException; -import caosdb.server.database.misc.TransactionBenchmark; -import caosdb.server.permissions.PermissionRule; public class TestAbstractCaosDBServerResource {