Remove deprecated interface

git-svn-id: https://svn.argeo.org/commons/trunk@3202 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
index 31d2d0581797c1377edd3361a34e34dbec7f1f1d..4f9c723fb150474b827dafff097e4d233aa2a5bc 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/UsersRolesController.java
@@ -7,10 +7,9 @@ import org.argeo.security.ArgeoSecurityService;
 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.ServerDeserializer;
 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;
@@ -23,7 +22,7 @@ public class UsersRolesController implements MvcConstants {
 
        private ArgeoSecurityService securityService;
 
-       private ServerDeserializer userDeserializer = null;
+       private Deserializer userDeserializer = null;
 
        /* USER */
 
@@ -67,7 +66,7 @@ public class UsersRolesController implements MvcConstants {
        @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());
@@ -76,7 +75,7 @@ public class UsersRolesController implements MvcConstants {
        @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());
        }
@@ -150,7 +149,7 @@ public class UsersRolesController implements MvcConstants {
        // user.getUserNatures().clear();
        // }
 
-       public void setUserDeserializer(ServerDeserializer userDeserializer) {
+       public void setUserDeserializer(Deserializer userDeserializer) {
                this.userDeserializer = userDeserializer;
        }
 

diff --git a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerDeserializer.java b/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerDeserializer.java
deleted file mode 100644 (file)
index 082604d..0000000
--- a/server/runtime/org.argeo.server.core/src/main/java/org/argeo/server/ServerDeserializer.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.argeo.server;
-
-import java.io.Reader;
-
-/** @deprecated use {@link Deserializer} instead */
-public interface ServerDeserializer {
-       public Object deserialize(Reader str);
-}

diff --git a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
index 25b9f8d1753218d342427d18b9ef474afd1f1c87..6b73336a204740a03a2543527710bab30751d6b5 100644 (file)
--- a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
+++ b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/JsonServerMapper.java
@@ -11,7 +11,6 @@ import org.apache.commons.logging.Log;
 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;
@@ -21,7 +20,7 @@ import org.codehaus.jackson.map.deser.StdDeserializerProvider;
 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;

diff --git a/server/runtime/org.argeo.server.osgi/src/main/java/org/argeo/server/osgi/mvc/ListBundlesController.java b/server/runtime/org.argeo.server.osgi/src/main/java/org/argeo/server/osgi/mvc/ListBundlesController.java
index 37a66521e08c0d9ffd04727096c4654c7bb5b6eb..cbc83f51f741d4b23bcfb7e2c7eca0bd5a0f596c 100644 (file)
--- a/server/runtime/org.argeo.server.osgi/src/main/java/org/argeo/server/osgi/mvc/ListBundlesController.java
+++ b/server/runtime/org.argeo.server.osgi/src/main/java/org/argeo/server/osgi/mvc/ListBundlesController.java
@@ -15,7 +15,7 @@ public class ListBundlesController extends AbstractController implements
        @Override
        protected ModelAndView handleRequestInternal(HttpServletRequest request,
                        HttpServletResponse response) throws Exception {
-               // TODO Auto-generated method stub
+               bundleContext.getBundles();
                return null;
        }