From 3a4b5c2b5426bfed495aa4091e2ff30657fda2d5 Mon Sep 17 00:00:00 2001
From: Julian Hochstetter <julian.hochstetter@mni.thm.de>
Date: Tue, 16 Oct 2012 19:59:00 +0200
Subject: [PATCH] update couchdb4j dependency ezmorpher to more recent version
1.0.6 which doesnt throw exceptions if fields are not set. remove info output
---
pom.xml | 6 ++++++
src/main/java/de/thm/arsnova/SessionController.java | 1 -
src/main/java/de/thm/arsnova/dao/CouchDBDao.java | 4 ++--
.../java/de/thm/arsnova/socket/message/Question.java | 9 +++++++++
4 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index adaab57b1..fbf56b2e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,12 @@
<groupId>couchdb4j</groupId>
<artifactId>couchdb4j</artifactId>
<version>0.3.0-i386-1</version>
+
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ezmorph</groupId>
+ <artifactId>ezmorph</artifactId>
+ <version>1.0.6</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/src/main/java/de/thm/arsnova/SessionController.java b/src/main/java/de/thm/arsnova/SessionController.java
index f92414b73..605753daa 100644
--- a/src/main/java/de/thm/arsnova/SessionController.java
+++ b/src/main/java/de/thm/arsnova/SessionController.java
@@ -117,7 +117,6 @@ public class SessionController {
response.setStatus(HttpStatus.NOT_FOUND.value());
return null;
}
- logger.info(questions.toString());
return questions;
}
diff --git a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
index 0436f11b2..6b34e07df 100644
--- a/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
+++ b/src/main/java/de/thm/arsnova/dao/CouchDBDao.java
@@ -195,9 +195,9 @@ public class CouchDBDao implements IDatabaseDao {
ViewResults questions = this.getDatabase().view(view);
List<Question> result = new ArrayList<Question>();
- logger.info(questions.toString());
+
MorpherRegistry morpherRegistry = JSONUtils.getMorpherRegistry();
- Morpher dynaMorpher = new BeanMorpher(PossibleAnswer.class, morpherRegistry);
+ Morpher dynaMorpher = new BeanMorpher(PossibleAnswer.class, morpherRegistry);
morpherRegistry.registerMorpher(dynaMorpher);
for (Document d : questions.getResults()) {
Question q = (Question) JSONObject.toBean(d.getJSONObject().getJSONObject("value"), Question.class);
diff --git a/src/main/java/de/thm/arsnova/socket/message/Question.java b/src/main/java/de/thm/arsnova/socket/message/Question.java
index 5f68be3d7..f4acd6ed1 100644
--- a/src/main/java/de/thm/arsnova/socket/message/Question.java
+++ b/src/main/java/de/thm/arsnova/socket/message/Question.java
@@ -32,6 +32,7 @@ public class Question {
private boolean noCorrect;
private String session;
private int number;
+ private int duration;
public String getType() {
@@ -122,6 +123,14 @@ public class Question {
this.number = number;
}
+ public int getDuration() {
+ return duration;
+ }
+
+ public void setDuration(int duration) {
+ this.duration = duration;
+ }
+
@Override
public String toString() {
return "Question type '" + this.questionType + "': " + this.subject + ";\n" + this.text +
--
GitLab