- First REST operation working

wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java

@@ -0,0 +1,44 @@
+package com.wisemapping.rest;
+
+
+import com.wisemapping.model.MindMap;
+import com.wisemapping.service.MindmapService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller
+public class MindmapController {
+    private MindmapService mindmapService;
+
+    public void setMindmapService(MindmapService mindmapService) {
+        this.mindmapService = mindmapService;
+    }
+
+    @RequestMapping(method = RequestMethod.GET, value = "/map/{id}")
+    public
+    @ResponseBody
+    Map<String, Object> getMindmap(@PathVariable int id) throws IOException {
+        final Map<String, Object> result = new HashMap<String, Object>();
+        final MindMap mindMap = mindmapService.getMindmapById(id);
+        result.put("xml", mindMap.getNativeXml());
+        result.put("creationTime", mindMap.getCreationTime());
+        result.put("description", mindMap.getDescription());
+        result.put("lastModification", mindMap.getLastModificationDate());
+        result.put("owner", mindMap.getOwner().getUsername());
+        return result;
+    }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/map/{id}")
+    public void updateMindmap(@PathVariable int id) throws IOException {
+
+    }
+
+
+}

wise-webapp/src/main/java/com/wisemapping/rest/UserController.java

@@ -1,30 +0,0 @@
-package com.wisemapping.rest;
-
-
-import com.wisemapping.model.User;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.oxm.jaxb.Jaxb2Marshaller;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-public class UserController {
-    private Jaxb2Marshaller jaxb2Mashaller;
-
-    public void setJaxb2Mashaller(@NotNull final Jaxb2Marshaller jaxb2Mashaller) {
-        this.jaxb2Mashaller = jaxb2Mashaller;
-    }
-
-    private static final String XML_VIEW_NAME = "users";
-
-    @RequestMapping(method = RequestMethod.GET, value = "/employee/{id}")
-    public ModelAndView getEmployee(@PathVariable String id) {
-        User user = new User();
-        return new ModelAndView(XML_VIEW_NAME, "object", user);
-    }
-
-
-}

wise-webapp/src/main/java/com/wisemapping/security/AuthenticationProvider.java

@@ -21,6 +21,7 @@ public class AuthenticationProvider implements org.springframework.security.auth
     public Authentication authenticate(@NotNull final Authentication auth) throws AuthenticationException {
 
         // All your user authentication needs
+
         final String email = auth.getName();
         final User user = userManager.getUserBy(email);
         final String credentials = (String) auth.getCredentials();

wise-webapp/src/main/java/com/wisemapping/security/CustomPasswordEncoder.java

@@ -25,8 +25,7 @@ import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 
 public class CustomPasswordEncoder
-    implements PasswordEncoder
-{
+        implements PasswordEncoder {
     private PasswordEncoder delegateEncoder = new ShaPasswordEncoder();
 
     private static final String ENC_PREFIX = "ENC:";
@@ -34,9 +33,8 @@ public class CustomPasswordEncoder
     public String encodePassword(@NotNull String rawPass, @Nullable Object salt) throws DataAccessException {
 
         String password = rawPass;
-        if (!rawPass.startsWith(ENC_PREFIX))
-        {
-            password = ENC_PREFIX + delegateEncoder.encodePassword(rawPass,salt);
+        if (!rawPass.startsWith(ENC_PREFIX)) {
+            password = ENC_PREFIX + delegateEncoder.encodePassword(rawPass, salt);
         }
 
         return password;
@@ -47,11 +45,10 @@ public class CustomPasswordEncoder
         String pass1 = "" + encPass;
         String pass2 = rawPass;
 
-        if (pass1.startsWith(ENC_PREFIX))
-        {
+        if (pass1.startsWith(ENC_PREFIX)) {
 
             pass2 = encodePassword(rawPass, salt);
         }
-      return pass1.equals(pass2);
+        return pass1.equals(pass2);
     }
 }

wise-webapp/src/main/java/com/wisemapping/security/UserDetailService.java

@@ -21,11 +21,11 @@ package com.wisemapping.security;
 import com.wisemapping.dao.UserManager;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.dao.DataAccessException;
-import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
 
-public class DatabaseUserDetailService
-        implements UserDetailsService {
+
+public class UserDetailService
+        implements org.springframework.security.core.userdetails.UserDetailsService {
     private UserManager userManager;
 
     @Override