Implemented delete user-group and member tasks.
Change-Id: Iacb799ca03234fbbd4b6cc06126cb78ed3521aad
diff --git a/core/Changes b/core/Changes
new file mode 100644
index 0000000..c6ff1ba
--- /dev/null
+++ b/core/Changes
@@ -0,0 +1,13 @@
+0.59.10 2018-01-25
+ - updated hibernate and reflection versions (margaretha)
+ - added Changes file (margaretha)
+ - merged BeanConfigBaseTest to BeanConfigTest in /full (margaretha)
+0.59.9 2017-11-08
+ - fixed missing exception in JsonUtils (margaretha)
+ - fixed and restructured KustvaktResponseHandler (margaretha)
+ - updated status code in ParameterChecker (margaretha)
+0.59.8 2017-10-24
+ - restructured Kustvakt and created core project (margaretha)
+ - marked loader classes as deprecated (margaretha)
+ - updated Spring version (margaretha)
+ - moved unnecessary dependencies (margaretha)
\ No newline at end of file
diff --git a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
index 87465aa..ae96327 100644
--- a/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
+++ b/core/src/main/java/de/ids_mannheim/korap/exceptions/StatusCodes.java
@@ -22,6 +22,7 @@
public static final int CONNECTION_ERROR = 106;
public static final int INVALID_ARGUMENT = 107;
public static final int NOT_SUPPORTED = 108;
+ public static final int NOT_ALLOWED = 109;
/**
* 300 status codes for query language and serialization
diff --git a/core/src/main/java/de/ids_mannheim/korap/user/User.java b/core/src/main/java/de/ids_mannheim/korap/user/User.java
index 1de5d5d..8732a21 100644
--- a/core/src/main/java/de/ids_mannheim/korap/user/User.java
+++ b/core/src/main/java/de/ids_mannheim/korap/user/User.java
@@ -1,6 +1,15 @@
package de.ids_mannheim.korap.user;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.joda.time.DateTime;
+
import com.fasterxml.jackson.databind.JsonNode;
+
import de.ids_mannheim.korap.config.Attributes;
import de.ids_mannheim.korap.config.ParamFields;
import de.ids_mannheim.korap.exceptions.KustvaktException;
@@ -11,13 +20,6 @@
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
-import org.joda.time.DateTime;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
@Data
public abstract class User implements Serializable {
@@ -45,7 +47,7 @@
private List<Userdata> userdata;
- private boolean isAdmin;
+ private boolean isSystemAdmin;
// Values for corpusAccess:
public enum CorpusAccess {
diff --git a/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java b/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java
deleted file mode 100644
index 06cefe3..0000000
--- a/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package de.ids_mannheim.korap.config;
-
-import static org.junit.Assert.assertNotNull;
-
-import org.apache.log4j.Logger;
-import org.junit.runner.RunWith;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.model.InitializationError;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import de.ids_mannheim.korap.exceptions.KustvaktException;
-import net.jcip.annotations.NotThreadSafe;
-
-/**
- * @author hanl
- * @date 09/03/2016
- */
-@NotThreadSafe
-@RunWith(BeanConfigBaseTest.SpringExtendedSetupListener.class)
-@ContextConfiguration("classpath:test-config.xml")
-@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public abstract class BeanConfigBaseTest {
-
- private static Logger jlog = Logger.getLogger(BeanConfigBaseTest.class);
- @Autowired
- protected ApplicationContext context;
-
- public void init () throws Exception {
- assertNotNull("Application context must not be null!", this.context);
- jlog.debug("running one-time before init for class "
- + this.getClass().getSimpleName() + " ...");
- BeansFactory.setKustvaktContext(getContext());
- assertNotNull(BeansFactory.getKustvaktContext());
- initMethod();
- }
-
- protected abstract ContextHolder getContext();
-
- public abstract void initMethod () throws KustvaktException;
-
- public void close () {
- BeansFactory.closeApplication();
- }
-
- public static class SpringExtendedSetupListener extends
- SpringJUnit4ClassRunner {
-
- private BeanConfigBaseTest instanceSetupListener;
-
-
- public SpringExtendedSetupListener (Class<?> clazz)
- throws InitializationError {
- super(clazz);
- }
-
-
- @Override
- protected Object createTest () throws Exception {
- Object test = super.createTest();
- // Note that JUnit4 will call this createTest() multiple times for each
- // test method, so we need to ensure to call "beforeClassSetup" only once.
- if (test instanceof BeanConfigBaseTest && instanceSetupListener == null) {
- instanceSetupListener = (BeanConfigBaseTest) test;
- instanceSetupListener.init();
- }
- return test;
- }
-
-
- @Override
- public void run (RunNotifier notifier) {
- super.run(notifier);
- if (instanceSetupListener != null){
- instanceSetupListener.close();
- }
- }
- }
-}