fix VolumeApi

codeabovelab · Feb 17, 2017 · b3f1cb8 · b3f1cb8
1 parent a10b2cf
commit b3f1cb8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/...src/main/java/com/codeabovelab/dm/cluman/cluster/docker/management/DockerServiceImpl.java b/...src/main/java/com/codeabovelab/dm/cluman/cluster/docker/management/DockerServiceImpl.java
@@ -1134,7 +1134,7 @@ public Volume createVolume(CreateVolumeCmd cmd) {
 
     @Override
     public ServiceCallResult removeVolume(RemoveVolumeArg arg) {
-        UriComponentsBuilder ucb = makeBaseUrl().path("volumes");
+        UriComponentsBuilder ucb = makeBaseUrl().path("volumes/");
         ucb.path(arg.getName());
         Boolean force = arg.getForce();
         if(force != null) {
@@ -1154,7 +1154,7 @@ public ServiceCallResult deleteUnusedVolumes(DeleteUnusedVolumesArg arg) {
 
     @Override
     public Volume getVolume(String name) {
-        return getOrNullAction(makeBaseUrl().path("volumes").path(name), Volume.class);
+        return getOrNullAction(makeBaseUrl().path("volumes/").path(name), Volume.class);
     }
 
     @Override

diff --git a/cluster-manager/src/main/java/com/codeabovelab/dm/cluman/ui/VolumeApi.java b/cluster-manager/src/main/java/com/codeabovelab/dm/cluman/ui/VolumeApi.java
@@ -20,15 +20,18 @@
 import com.codeabovelab.dm.cluman.cluster.docker.management.argument.DeleteUnusedVolumesArg;
 import com.codeabovelab.dm.cluman.cluster.docker.management.argument.GetVolumesArg;
 import com.codeabovelab.dm.cluman.cluster.docker.management.argument.RemoveVolumeArg;
+import com.codeabovelab.dm.cluman.cluster.docker.management.result.ServiceCallResult;
 import com.codeabovelab.dm.cluman.cluster.docker.model.CreateVolumeCmd;
 import com.codeabovelab.dm.cluman.cluster.docker.model.Volume;
 import com.codeabovelab.dm.cluman.model.DiscoveryStorage;
 import com.codeabovelab.dm.cluman.model.NodesGroup;
+import com.codeabovelab.dm.cluman.ui.model.UIResult;
 import com.codeabovelab.dm.cluman.ui.model.UiVolume;
 import com.codeabovelab.dm.cluman.validate.ExtendedAssert;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Collection;
@@ -82,20 +85,22 @@ public UiVolume create(@RequestParam("cluster") String clusterName,
     }
 
     @RequestMapping(path = "/delete", method = RequestMethod.DELETE)
-    public void delete(@RequestParam("cluster") String clusterName,
-                       @RequestParam("volume") String volume,
-                       @RequestParam(value = "force", required = false) Boolean force) {
+    public ResponseEntity<?> delete(@RequestParam("cluster") String clusterName,
+                                 @RequestParam("volume") String volume,
+                                 @RequestParam(value = "force", required = false) Boolean force) {
         DockerService docker = getDocker(clusterName);
         RemoveVolumeArg arg = new RemoveVolumeArg();
         arg.setName(volume);
         arg.setForce(force);
-        docker.removeVolume(arg);
+        ServiceCallResult scr = docker.removeVolume(arg);
+        return UiUtils.createResponse(scr);
     }
 
     @RequestMapping(path = "/delete-unused", method = RequestMethod.DELETE)
-    public void deleteUnused(@RequestParam("cluster") String clusterName) {
+    public ResponseEntity<?> deleteUnused(@RequestParam("cluster") String clusterName) {
         DockerService docker = getDocker(clusterName);
         DeleteUnusedVolumesArg arg = new DeleteUnusedVolumesArg();
-        docker.deleteUnusedVolumes(arg);
+        ServiceCallResult scr = docker.deleteUnusedVolumes(arg);
+        return UiUtils.createResponse(scr);
     }
 }