import org.argeo.security.ArgeoUser;
import org.argeo.security.SimpleArgeoUser;
import org.argeo.server.BooleanAnswer;
import org.argeo.security.ArgeoUser;
import org.argeo.security.SimpleArgeoUser;
import org.argeo.server.BooleanAnswer;
+import org.argeo.server.Deserializer;
import org.argeo.server.ServerAnswer;
import org.argeo.server.ServerAnswer;
-import org.argeo.server.ServerDeserializer;
import org.argeo.server.mvc.MvcConstants;
import org.argeo.server.mvc.MvcConstants;
-import org.springframework.security.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
private ArgeoSecurityService securityService;
private ArgeoSecurityService securityService;
- private ServerDeserializer userDeserializer = null;
+ private Deserializer userDeserializer = null;
@RequestMapping("/createUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(Reader reader) {
@RequestMapping("/createUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser createUser(Reader reader) {
- ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
+ ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
// cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
// cleanUserBeforeCreate(user);
securityService.newUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
@RequestMapping("/updateUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser updateUser(Reader reader) {
@RequestMapping("/updateUser.security")
@ModelAttribute(ANSWER_MODEL_KEY)
public ArgeoUser updateUser(Reader reader) {
- ArgeoUser user = (ArgeoUser) userDeserializer.deserialize(reader);
+ ArgeoUser user = userDeserializer.deserialize(reader, ArgeoUser.class);
securityService.updateUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
securityService.updateUser(user);
return securityService.getSecurityDao().getUser(user.getUsername());
}
// user.getUserNatures().clear();
// }
// user.getUserNatures().clear();
// }
- public void setUserDeserializer(ServerDeserializer userDeserializer) {
+ public void setUserDeserializer(Deserializer userDeserializer) {
this.userDeserializer = userDeserializer;
}
this.userDeserializer = userDeserializer;
}
+++ /dev/null
-package org.argeo.server;
-
-import java.io.Reader;
-
-/** @deprecated use {@link Deserializer} instead */
-public interface ServerDeserializer {
- public Object deserialize(Reader str);
-}
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
import org.argeo.server.Deserializer;
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
import org.argeo.server.Deserializer;
-import org.argeo.server.ServerDeserializer;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.DeserializationProblemHandler;
import org.codehaus.jackson.JsonProcessingException;
import org.codehaus.jackson.map.DeserializationContext;
import org.codehaus.jackson.map.DeserializationProblemHandler;
import org.springframework.beans.factory.InitializingBean;
public class JsonServerMapper extends JsonServerSerializer implements
import org.springframework.beans.factory.InitializingBean;
public class JsonServerMapper extends JsonServerSerializer implements
- ServerDeserializer, Deserializer, InitializingBean {
+ Deserializer, InitializingBean {
private final static Log log = LogFactory.getLog(JsonServerMapper.class);
private Class<?> targetClass;
private final static Log log = LogFactory.getLog(JsonServerMapper.class);
private Class<?> targetClass;
@Override
protected ModelAndView handleRequestInternal(HttpServletRequest request,
HttpServletResponse response) throws Exception {
@Override
protected ModelAndView handleRequestInternal(HttpServletRequest request,
HttpServletResponse response) throws Exception {
- // TODO Auto-generated method stub
+ bundleContext.getBundles();