diff --git a/pom.xml b/pom.xml index adaab57b16e98bddeb2b17f3cf0116cf73cc9764..fbf56b2e2607ff895fda7b1877f033e68cef0587 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 f92414b7356e86243955d40069477492cf06a67c..605753daa1c655c98ea7c4dd51075709f715767d 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 0436f11b2fd1d19080ceabbb47c1ee45ae0cd02b..6b34e07df976402e324bcbd7d57ff1f7d621da41 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 5f68be3d7c64cce1a4ab1a2b8ba7270d0182c764..f4acd6ed1a6ebd0b6c698917829d8d752d3aac36 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 +