- Add site report generation. mvn site:stage

- Add more tests.

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

@@ -22,7 +22,7 @@ import java.util.Date;
 import java.util.List;
 
 @Controller
-public class MindmapController extends BaseController{
+public class MindmapController extends BaseController {
     @Autowired
     private MindmapService mindmapService;
 
@@ -71,4 +71,27 @@ public class MindmapController extends BaseController{
         mindmapService.updateMindmap(mindMap, minor);
     }
 
+    @RequestMapping(method = RequestMethod.POST, value = "/maps", consumes = {"application/xml", "application/json"}, produces = {"application/json", "text/html", "application/xml"})
+    @ResponseStatus(value = HttpStatus.NO_CONTENT)
+    public void createMap(@RequestBody RestMindmap restMindmap, @PathVariable int id, @RequestParam(required = false) boolean minor) throws IOException, WiseMappingException {
+
+        final MindMap mindMap = mindmapService.getMindmapById(id);
+        final User user = Utils.getUser();
+
+        final String properties = restMindmap.getProperties();
+        mindMap.setProperties(properties);
+
+        final Calendar now = Calendar.getInstance();
+        mindMap.setLastModificationTime(now);
+        mindMap.setLastModifierUser(user.getUsername());
+
+        final Calendar lastModification = Calendar.getInstance();
+        lastModification.setTime(new Date());
+        mindMap.setLastModificationTime(lastModification);
+
+        final String xml = restMindmap.getXml();
+        mindMap.setXmlStr(xml);
+        mindmapService.updateMindmap(mindMap, minor);
+    }
+
 }

wise-webapp/src/test/java/com/wisemapping/test/rest/RestMindmapTCase.java

@@ -0,0 +1,81 @@
+package com.wisemapping.test.rest;
+
+
+import com.wisemapping.rest.model.RestUser;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.http.*;
+import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.security.crypto.codec.Base64;
+import org.springframework.web.client.RestTemplate;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
+
+
+@Test
+public class RestMindmapTCase {
+
+    @NonNls
+    private static final String HOST_PORT = "http://localhost:8080/";
+    private static final String BASE_REST_URL = HOST_PORT + "service";
+
+    private URI createUser(@NotNull HttpHeaders requestHeaders, @NotNull RestTemplate templateRest) {
+        final RestUser restUser = new RestUser();
+        final String email = "foo-to-delete" + System.nanoTime() + "@example.org";
+        restUser.setEmail(email);
+        restUser.setUsername("foo");
+        restUser.setFirstname("foo first name");
+        restUser.setLastname("foo last name");
+        restUser.setPassword("foo password");
+
+        HttpEntity<RestUser> createUserEntity = new HttpEntity<RestUser>(restUser, requestHeaders);
+        return templateRest.postForLocation(BASE_REST_URL + "/admin/users", createUserEntity);
+    }
+
+
+    @Test(dataProvider = "ContentType-Provider-Function")
+    public void createMap(final @NotNull MediaType mediaType) {    // Configure media types ...
+        final HttpHeaders requestHeaders = createHeaders(mediaType);
+        final RestTemplate templateRest = createTemplate();
+
+    }
+
+    private HttpHeaders createHeaders(MediaType mediaType) {
+        List<MediaType> acceptableMediaTypes = new ArrayList<MediaType>();
+        acceptableMediaTypes.add(mediaType);
+        final HttpHeaders requestHeaders = new HttpHeaders();
+        requestHeaders.setAccept(acceptableMediaTypes);
+        requestHeaders.setContentType(mediaType);
+        return requestHeaders;
+    }
+
+    private RestTemplate createTemplate() {
+        SimpleClientHttpRequestFactory s = new SimpleClientHttpRequestFactory() {
+            @Override
+            protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException {
+                super.prepareConnection(connection, httpMethod);
+
+                //Basic Authentication for Police API
+                String authorisation = "admin@wisemapping.org" + ":" + "admin";
+                byte[] encodedAuthorisation = Base64.encode(authorisation.getBytes());
+                connection.setRequestProperty("Authorization", "Basic " + new String(encodedAuthorisation));
+            }
+
+        };
+        return new RestTemplate(s);
+    }
+
+    @DataProvider(name = "ContentType-Provider-Function")
+    public Object[][] contentTypes() {
+        return new Object[][]{{MediaType.APPLICATION_XML}, {MediaType.APPLICATION_JSON}};
+    }
+}