From afd8ba1cd9a7910e893919a5105fcb63e3818aa7 Mon Sep 17 00:00:00 2001
From: Christoph Thelen <christoph.thelen@mni.thm.de>
Date: Mon, 16 Mar 2015 11:28:19 +0100
Subject: [PATCH] Enforce jackson version; Use our new CouchDB4J fork
---
pom.xml | 14 +++++++-------
.../java/de/thm/arsnova/dao/CouchDBDao.java | 17 ++++++++---------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index 32a7cf24a..94d908df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,6 +10,7 @@
<org.springframework-version>4.0.9.RELEASE</org.springframework-version>
<org.springframework.security-version>3.2.5.RELEASE</org.springframework.security-version>
<org.springframework.integration-mail-version>4.0.6.RELEASE</org.springframework.integration-mail-version>
+ <com.fasterxml.jackson-version>2.5.1</com.fasterxml.jackson-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.url>https://scm.thm.de/arsnova</project.url>
<sonar.language>java</sonar.language>
@@ -272,7 +273,12 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.4.5</version>
+ <version>${com.fasterxml.jackson-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${com.fasterxml.jackson-version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -294,12 +300,6 @@
<artifactId>spring-aspects</artifactId>
<version>${org.springframework-version}</version>
</dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>2.42.2</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index d1ab8cd62..d5045017d 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -54,6 +54,8 @@ import org.springframework.transaction.annotation.Transactional;
import com.fourspaces.couchdb.Database;
import com.fourspaces.couchdb.Document;
+import com.fourspaces.couchdb.Results;
+import com.fourspaces.couchdb.RowResult;
import com.fourspaces.couchdb.View;
import com.fourspaces.couchdb.ViewResults;
@@ -125,17 +127,14 @@ public class CouchDBDao implements IDatabaseDao, ApplicationEventPublisherAware
view.setStartKeyArray(user.getUsername());
view.setEndKeyArray(user.getUsername(), "{}");
- final ViewResults sessions = getDatabase().view(view);
+ final Results<Session> results = getDatabase().queryView(view, Session.class);
final List<Session> result = new ArrayList<Session>();
- for (final Document d : sessions.getResults()) {
- final Session session = (Session) JSONObject.toBean(
- d.getJSONObject().getJSONObject("value"),
- Session.class
- );
- session.setCreator(d.getJSONObject().getJSONArray("key").getString(0));
- session.setName(d.getJSONObject().getJSONArray("key").getString(1));
- session.set_id(d.getId());
+ for (final RowResult<Session> row : results.getRows()) {
+ final Session session = row.getValue();
+ session.setCreator(row.getKey().getString(0));
+ session.setName(row.getKey().getString(1));
+ session.set_id(row.getId());
result.add(session);
}
return result;
--
GitLab