AMBARI-11735. Automatically creates user's trash directory on hdfs if does not exist (Erik Bergenholtz via rlevas)

contrib/views/files/pom.xml

@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ambari.contrib.views</groupId>
   <artifactId>files</artifactId>
-  <version>0.2.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <name>Files</name>
 
   <parent>

contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/FileOperationService.java

@@ -90,7 +90,7 @@ public class FileOperationService extends HdfsService {
         result = Response.ok(getApi(context).fileStatusToJSON(api
             .getFileStatus(request.dst)));
       } else {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't move '" + request.src + "' to '" + request.dst + "'")).status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {
@@ -117,7 +117,7 @@ public class FileOperationService extends HdfsService {
         result = Response.ok(getApi(context).fileStatusToJSON(api
             .getFileStatus(request.path)));
       } else {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't chmod '" + request.path + "'")).status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {
@@ -147,7 +147,8 @@ public class FileOperationService extends HdfsService {
         result = Response.ok(getApi(context).fileStatusToJSON(api
             .getFileStatus(request.dst)));
       } catch (HdfsApiException e) {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't copy '" + request.src + "' to '" + request.dst + "'")).
+            status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {
@@ -172,7 +173,7 @@ public class FileOperationService extends HdfsService {
       if (api.mkdir(request.path)) {
         result = Response.ok(getApi(context).fileStatusToJSON(api.getFileStatus(request.path)));
       } else {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't create dir '" + request.path + "'")).status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {
@@ -212,16 +213,25 @@ public class FileOperationService extends HdfsService {
   @Produces(MediaType.APPLICATION_JSON)
   public Response moveToTrash(RemoveRequest request) {
     try {
-      HdfsApi api = getApi(context);
-      
-      String trashDir = api.getTrashDirPath(request.path);
-      
       ResponseBuilder result;
-      if (api.rename(request.path, trashDir)) {
+
+      HdfsApi api = getApi(context);
+      String trash = api.getTrashDirPath();
+
+      if (!api.exists(trash)) {
+        if (!api.mkdir(trash)) {
+          result = Response.ok(new BoolResult(false, "Trash dir does not exists. Can't create dir for trash '" + trash + "'")).status(422);
+          return result.build();
+        }
+      }
+
+      String trashFilePath = api.getTrashDirPath(request.path);
+
+      if (api.rename(request.path, trashFilePath)) {
         result = Response.ok(getApi(context).fileStatusToJSON(api
-            .getFileStatus(trashDir)));
+            .getFileStatus(trashFilePath)));
       } else {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't move file to '" + trashFilePath + "'")).status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {
@@ -248,7 +258,7 @@ public class FileOperationService extends HdfsService {
       if (api.delete(request.path, request.recursive)) {
         result = Response.ok(new BoolResult(true)).status(204);
       } else {
-        result = Response.ok(new BoolResult(false)).status(422);
+        result = Response.ok(new BoolResult(false, "Can't remove '" + request.path + "'")).status(422);
       }
       return result.build();
     } catch (WebApplicationException ex) {

contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java

@@ -55,9 +55,15 @@ public abstract class HdfsService {
   @XmlRootElement
   public static class BoolResult{
     public boolean success;
+    public String message;
     public BoolResult(boolean success){
       this.success = success;
     }
+
+    public BoolResult(boolean success, String message){
+      this.success = success;
+      this.message = message;
+    }
   }
 
   private HdfsApi _api = null;

contrib/views/files/src/main/resources/view.xml

@@ -17,7 +17,7 @@
 <view>
     <name>FILES</name>
     <label>Files</label>
-    <version>0.2.0</version>
+    <version>1.0.0</version>
 
     <min-ambari-version>2.0.*</min-ambari-version>