Added storing authorization code and access token in cache; fixed bugs.
Change-Id: Ibc555ed65ebec8e7b40a76521311680a63c11a09
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java b/full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
index 574efc9..29a5e29 100644
--- a/full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/BeanInjectTest.java
@@ -1,20 +1,19 @@
package de.ids_mannheim.korap.config;
-import de.ids_mannheim.korap.handlers.DocumentDao;
-import de.ids_mannheim.korap.handlers.ResourceDao;
-import de.ids_mannheim.korap.handlers.UserDetailsDao;
-import de.ids_mannheim.korap.handlers.UserSettingsDao;
-import de.ids_mannheim.korap.resources.Document;
-import de.ids_mannheim.korap.resources.KustvaktResource;
-import de.ids_mannheim.korap.user.UserDetails;
-import de.ids_mannheim.korap.user.UserSettings;
-import org.junit.Test;
-import org.springframework.aop.support.AopUtils;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import java.util.Collection;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.Test;
+import org.springframework.aop.support.AopUtils;
+
+import de.ids_mannheim.korap.handlers.DocumentDao;
+import de.ids_mannheim.korap.handlers.UserDetailsDao;
+import de.ids_mannheim.korap.handlers.UserSettingsDao;
+import de.ids_mannheim.korap.resources.Document;
+import de.ids_mannheim.korap.user.UserDetails;
+import de.ids_mannheim.korap.user.UserSettings;
/**
* Created by hanl on 03.06.16.
@@ -48,9 +47,6 @@
Document.class);
assertEquals(DocumentDao.class, AopUtils.getTargetClass(o));
- o = BeansFactory.getTypeFactory().getTypeInterfaceBean(coll,
- KustvaktResource.class);
- assertEquals(ResourceDao.class, AopUtils.getTargetClass(o));
BeansFactory.closeApplication();
}
}
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java b/full/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java
deleted file mode 100644
index 4222f88..0000000
--- a/full/src/test/java/de/ids_mannheim/korap/config/KustvaktResourceTest.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.ids_mannheim.korap.config;
-
-import de.ids_mannheim.korap.resources.KustvaktResource;
-import de.ids_mannheim.korap.resources.VirtualCollection;
-
-/**
- * @author hanl
- * @date 11/02/2016
- */
-public class KustvaktResourceTest {
-
-
- public void testIDCreation () {
- KustvaktResource resource = new VirtualCollection(1);
- resource.addField("field_1", "data");
-
- }
-
-
- public void testNullableData () {
-
- }
-
-
- public void testWrongDataType () {
-
- }
-
-
-
-}
diff --git a/full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java b/full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java
index 765e8f4..3e73104 100644
--- a/full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/TestHelper.java
@@ -1,14 +1,10 @@
package de.ids_mannheim.korap.config;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import java.io.File;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.NoSuchAlgorithmException;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Arrays;
@@ -28,15 +24,11 @@
import org.springframework.jdbc.datasource.SingleConnectionDataSource;
import de.ids_mannheim.korap.authentication.KustvaktAuthenticationManager;
-import de.ids_mannheim.korap.exceptions.EmptyResultException;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.handlers.JDBCClient;
-import de.ids_mannheim.korap.handlers.ResourceDao;
-import de.ids_mannheim.korap.interfaces.EncryptionIface;
import de.ids_mannheim.korap.interfaces.EntityHandlerIface;
import de.ids_mannheim.korap.interfaces.KustvaktBaseDaoInterface;
import de.ids_mannheim.korap.interfaces.db.PersistenceClient;
-import de.ids_mannheim.korap.resources.KustvaktResource;
import de.ids_mannheim.korap.user.User;
import de.ids_mannheim.korap.utils.TimeUtils;
@@ -223,36 +215,6 @@
return new HashMap<>(data);
}
- public int setupResource (KustvaktResource resource)
- throws KustvaktException {
- ResourceDao dao = new ResourceDao(
- (PersistenceClient) getBean(ContextHolder.KUSTVAKT_DB));
- return dao.storeResource(resource, getUser());
- }
-
-
- public KustvaktResource getResource (String name) throws KustvaktException {
- ResourceDao dao = new ResourceDao(
- (PersistenceClient) getBean(ContextHolder.KUSTVAKT_DB));
- KustvaktResource res = dao.findbyId(name, getUser());
- if (res == null)
- throw new RuntimeException("resource with name " + name
- + " not found ...");
- return res;
- }
-
-
- public TestHelper dropResource (String ... names) throws KustvaktException {
- ResourceDao dao = new ResourceDao(
- (PersistenceClient) getBean(ContextHolder.KUSTVAKT_DB));
- if (names == null || names.length == 0)
- dao.truncate();
- for (String name : names)
- dao.deleteResource(name, null);
- return this;
- }
-
-
public void close () {
BeansFactory.closeApplication();
}