Api change, code improvement

Author: SimpleMethod

src/main/java/pl/simplemethod/codebin/githubOauth/GithubRestController.java

@@ -10,7 +10,7 @@
 
 
 @RestController
-@RequestMapping("v1.0")
+@RequestMapping("github")
 public class GithubRestController {
 
     @Autowired

src/main/java/pl/simplemethod/codebin/srv/SrvClient.java

@@ -246,6 +246,32 @@ protected org.json.JSONObject restartContainer(String id) {
             return body;
         }
     }
+    /**
+     * The method returns container data
+     *
+     * @param id Container ID
+     * @return Json object with status
+     */
+    protected String infoContainer(String id) {
+        org.json.JSONObject body = new org.json.JSONObject();
+        try {
+            HttpResponse<String> logsContainer = Unirest.get(SERVER_URL + "/v1.0/containers/" + id + "/json")
+                    .header("accept", "application/json").header("Content-Type", "application/json").asString();
+            if (logsContainer.getStatus() != 200) {
+                body.put("message", "Something went wrong ");
+                body.put("status", logsContainer.getStatus());
+                return body.toString();
+            } else {
+                return logsContainer.getBody();
+            }
+
+        } catch (NullPointerException | org.json.JSONException | UnirestException e) {
+            body.put("message", "Something went wrong " + e);
+            body.put("status", 510);
+            return body.toString();
+        }
+    }
+
 
     /**
      * The method returns container logs

src/main/java/pl/simplemethod/codebin/srv/SrvRestController.java

@@ -9,7 +9,7 @@
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("v1.0")
+@RequestMapping("srv")
 public class SrvRestController {
 
     @Autowired
@@ -26,7 +26,7 @@ public class SrvRestController {
      * @param diskQuota    Maximum amount of allocated memory on the disk
      * @return Json object with data
      */
-    @PostMapping("/srv/container/create")
+    @PostMapping("container/create")
     public @ResponseBody
     ResponseEntity createContainer(@RequestParam("dockerimage") String dockerImage, @RequestParam("exposedports") Integer exposedPorts, @RequestParam("hostport") Integer hostPort, @RequestParam("name") String name, @RequestParam("rammemory") Long ramMemory, @RequestParam("diskquota") Long diskQuota) {
         HttpHeaders headers = new HttpHeaders();
@@ -47,7 +47,7 @@ ResponseEntity createContainer(@RequestParam("dockerimage") String dockerImage,
      * @param containerId Container ID
      * @return Json object as response
      */
-    @PostMapping("/srv/container/{ID}/restart")
+    @PostMapping("container/{ID}/restart")
     public @ResponseBody
     ResponseEntity restartContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
@@ -57,10 +57,12 @@ ResponseEntity restartContainer(@PathVariable(value = "ID") String containerId)
     }
 
     /**
+     * Stop the container with the specified ID
+     *
      * @param containerId Container ID
      * @return Json object as response
      */
-    @PostMapping("/srv/container/{ID}/stop")
+    @PostMapping("container/{ID}/stop")
     public @ResponseBody
     ResponseEntity stopContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
@@ -75,7 +77,7 @@ ResponseEntity stopContainer(@PathVariable(value = "ID") String containerId) {
      * @param containerId Container ID
      * @return Json object as response
      */
-    @PostMapping("/srv/container/{ID}/start")
+    @PostMapping("container/{ID}/start")
     public @ResponseBody
     ResponseEntity startContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
@@ -90,7 +92,7 @@ ResponseEntity startContainer(@PathVariable(value = "ID") String containerId) {
      * @param containerId Container ID
      * @return Json object as response
      */
-    @GetMapping("/srv/container/{ID}/logs")
+    @GetMapping("container/{ID}/logs")
     public @ResponseBody
     ResponseEntity logsContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
@@ -101,12 +103,26 @@ ResponseEntity logsContainer(@PathVariable(value = "ID") String containerId) {
         return new ResponseEntity<>(replaceString, headers, HttpStatus.valueOf(201));
     }
 
+    /**
+     * The method returns information about the container
+     * @param containerId Container ID
+     * @return Json object as response
+     */
+    @GetMapping("container/{ID}/info")
+    public @ResponseBody
+    ResponseEntity infoContainer(@PathVariable(value = "ID") String containerId) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        String response = srvClient.infoContainer(containerId);
+        return new ResponseEntity<>(response, headers, HttpStatus.valueOf(200));
+    }
+
     /**
      * The method returns information about the docker server
      *
      * @return Json object as response
      */
-    @GetMapping("/srv/info")
+    @GetMapping("info")
     public @ResponseBody
     ResponseEntity infoDocker() {
         HttpHeaders headers = new HttpHeaders();
@@ -121,7 +137,7 @@ ResponseEntity infoDocker() {
      * @param containerId Container ID
      * @return Json object as response
      */
-    @DeleteMapping("/srv/container/{ID}/delete")
+    @DeleteMapping("container/{ID}/delete")
     public @ResponseBody
     ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
         HttpHeaders headers = new HttpHeaders();
@@ -138,7 +154,7 @@ ResponseEntity deleteContainer(@PathVariable(value = "ID") String containerId) {
      * @param arguments   Argument to execute
      * @return Json object as response
      */
-    @PostMapping("/srv/container/{ID}/exec")
+    @PostMapping("container/{ID}/exec")
     public @ResponseBody
     ResponseEntity execContainer(@PathVariable(value = "ID") String containerId, @RequestParam("path") String path, @RequestParam("argument") String arguments) {
         HttpHeaders headers = new HttpHeaders();

src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=8080
+server.port=80
 spring.main.allow-bean-definition-overriding=true
 
 spring.security.oauth2.client.registration.github.client-id=2f5c2010372081b036ff