GitLab wurde erfolgreich aktualisiert. Durch regelmäßige Updates bleibt das THM GitLab sicher. Danke für Ihre Geduld.

Commit 49708cf0 authored by Julian Hochstetter's avatar Julian Hochstetter

update to jackson 2.1.0 and to a recent netty-socketio snapshot

parent 492494ae
......@@ -255,7 +255,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.0.6</version>
<version>2.1.0</version>
</dependency>
</dependencies>
<build>
......
......@@ -15,6 +15,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Required;
import com.corundumstudio.socketio.AckRequest;
import com.corundumstudio.socketio.Configuration;
import com.corundumstudio.socketio.SocketIOClient;
import com.corundumstudio.socketio.SocketIOServer;
......@@ -70,7 +71,7 @@ public class ARSnovaSocketIOServer {
server.addEventListener("setFeedback", Feedback.class,
new DataListener<Feedback>() {
@Override
public void onData(SocketIOClient client, Feedback data) {
public void onData(SocketIOClient client, Feedback data, AckRequest ackSender) {
/**
* do a check if user is in the session, for which he would give a feedback
*/
......@@ -99,7 +100,7 @@ public class ARSnovaSocketIOServer {
server.addEventListener("arsnova/question/create", Question.class, new DataListener<Question>(){
@Override
public void onData(SocketIOClient client, Question question) {
public void onData(SocketIOClient client, Question question, AckRequest ackSender) {
sessionService.saveQuestion(question);
}
});
......
......@@ -20,6 +20,9 @@ package de.thm.arsnova.socket.message;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties({"_id", "_rev"})
public class Question {
private String type;
......@@ -31,6 +34,7 @@ public class Question {
private List<PossibleAnswer> possibleAnswers;
private boolean noCorrect;
private String session;
private int number;
private int duration;
......
......@@ -32,7 +32,7 @@
<bean class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
<property name="messageConverters">
<list>
<bean class="org.springframework.http.converter.json.MappingJacksonHttpMessageConverter" />
<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter" />
</list>
</property>
</bean>
......@@ -55,7 +55,7 @@
</property>
<property name="defaultViews">
<list>
<bean class="org.springframework.web.servlet.view.json.MappingJacksonJsonView">
<bean class="org.springframework.web.servlet.view.json.MappingJackson2JsonView">
<property name="prefixJson" value="false"/>
</bean>
</list>
......
......@@ -108,4 +108,22 @@ public class StubDatabaseDao implements IDatabaseDao {
return stubQuestions.get(session) != null;
}
@Override
public List<Session> getMySessions(String username) {
// TODO Auto-generated method stub
return null;
}
@Override
public List<Question> getSkillQuestions(String session, String sort) {
// TODO Auto-generated method stub
return null;
}
@Override
public int getSkillQuestionCount(String sessionkey) {
// TODO Auto-generated method stub
return 0;
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment