Removed all DTO where possible

diff --git a/src/gr/ebs/gss/server/Registration.java b/src/gr/ebs/gss/server/Registration.java
index e5e3cbe..75d58a2 100644 (file)
--- a/src/gr/ebs/gss/server/Registration.java
+++ b/src/gr/ebs/gss/server/Registration.java
@@ -23,7 +23,6 @@ import gr.ebs.gss.client.exceptions.DuplicateNameException;
 import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
 import java.io.IOException;
@@ -194,10 +193,10 @@ public class Registration extends BaseServlet {
                                handleException(response, e.getMessage());
                                return;
                        }
-                       final UserDTO userDto = new TransactionHelper<UserDTO>().tryExecute(new Callable<UserDTO>() {
+                       final User userDto = new TransactionHelper<User>().tryExecute(new Callable<User>() {
                                @Override
-                               public UserDTO call() throws Exception {
-                                       return getService().createUser(username, firstname + " " + lastname, email, "", "").getDTO();
+                               public User call() throws Exception {
+                                       return getService().createUser(username, firstname + " " + lastname, email, "", "");
                                }
 
                        });

diff --git a/src/gr/ebs/gss/server/domain/UserClass.java b/src/gr/ebs/gss/server/domain/UserClass.java
index d1c410b..ff9608c 100644 (file)
--- a/src/gr/ebs/gss/server/domain/UserClass.java
+++ b/src/gr/ebs/gss/server/domain/UserClass.java
@@ -103,21 +103,6 @@ public class UserClass  implements Serializable{
         *
         * @return a new DTO with the same contents as this object
         */
-       public UserClassDTO getDTO() {
-               UserClassDTO u = new UserClassDTO();
-               u.setId(id);
-               u.setName(name);
-               u.setQuota(quota);
-               for (final User user : users)
-                       u.getUsers().add(user.getDTO());
-               return u;
-       }
-
-       /**
-        * Return a new Data Transfer Object for this user class.
-        *
-        * @return a new DTO with the same contents as this object
-        */
        public UserClassDTO getDTOWithoutUsers() {
                UserClassDTO u = new UserClassDTO();
                u.setId(id);

diff --git a/src/gr/ebs/gss/server/ejb/ExternalAPI.java b/src/gr/ebs/gss/server/ejb/ExternalAPI.java
index bb0c024..3b39d8a 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/ExternalAPI.java
+++ b/src/gr/ebs/gss/server/ejb/ExternalAPI.java
@@ -1229,7 +1229,7 @@ public interface ExternalAPI {
         * @param username
         * @return
         */
-       UserDTO getUserByUserName(String username);
+       User getUserByUserName(String username);
 
        /**
         * @param lock

diff --git a/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java b/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
index e942219..aa740b6 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
+++ b/src/gr/ebs/gss/server/ejb/ExternalAPIBean.java
@@ -2630,9 +2630,9 @@ public class ExternalAPIBean implements ExternalAPI, ExternalAPIRemote {
         * @see gr.ebs.gss.server.ejb.ExternalAPI#getUsersByUserNameLike(java.lang.String)
         */
        @Override
-       public UserDTO getUserByUserName(String username) {
+       public User getUserByUserName(String username) {
                User result = dao.getUserByUserName(username);
-               return result.getDTO();
+               return result;
        }
        
        /*WEBDAV CREATE EMPTY FILE*/

diff --git a/src/gr/ebs/gss/server/ejb/ExternalAPIRemote.java b/src/gr/ebs/gss/server/ejb/ExternalAPIRemote.java
index e41a20f..cc2552b 100644 (file)
--- a/src/gr/ebs/gss/server/ejb/ExternalAPIRemote.java
+++ b/src/gr/ebs/gss/server/ejb/ExternalAPIRemote.java
@@ -28,10 +28,6 @@ import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.Group;
 import gr.ebs.gss.server.domain.Permission;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
-import gr.ebs.gss.server.domain.dto.PermissionDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 
 import java.io.InputStream;
 import java.util.Date;

diff --git a/src/gr/ebs/gss/server/rest/GroupsHandler.java b/src/gr/ebs/gss/server/rest/GroupsHandler.java
index 635a5c1..a5847e1 100644 (file)
--- a/src/gr/ebs/gss/server/rest/GroupsHandler.java
+++ b/src/gr/ebs/gss/server/rest/GroupsHandler.java
@@ -24,8 +24,6 @@ import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.Group;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.GroupDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
 import java.io.IOException;

diff --git a/src/gr/ebs/gss/server/rest/OthersHandler.java b/src/gr/ebs/gss/server/rest/OthersHandler.java
index 000efc6..7b26592 100644 (file)
--- a/src/gr/ebs/gss/server/rest/OthersHandler.java
+++ b/src/gr/ebs/gss/server/rest/OthersHandler.java
@@ -23,7 +23,6 @@ import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/src/gr/ebs/gss/server/rest/RequestHandler.java b/src/gr/ebs/gss/server/rest/RequestHandler.java
index 84270b6..df90cd7 100644 (file)
--- a/src/gr/ebs/gss/server/rest/RequestHandler.java
+++ b/src/gr/ebs/gss/server/rest/RequestHandler.java
@@ -22,8 +22,8 @@ import static gr.ebs.gss.server.configuration.GSSConfigurationFactory.getConfigu
 import gr.ebs.gss.client.exceptions.InsufficientPermissionsException;
 import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
+import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
 import gr.ebs.gss.server.webdav.Webdav;
 
 import java.io.ByteArrayInputStream;
@@ -73,7 +73,7 @@ public class RequestHandler extends Webdav {
        /**
         * The path for the resource manipulation subsystem.
         */
-       protected static final String PATH_FILES = FileHeaderDTO.PATH_FILES;
+       protected static final String PATH_FILES = FileHeader.PATH_FILES;
 
        /**
         * The path for the trash virtual folder.

diff --git a/src/gr/ebs/gss/server/rest/SharedHandler.java b/src/gr/ebs/gss/server/rest/SharedHandler.java
index 18d77c8..9a7d130 100644 (file)
--- a/src/gr/ebs/gss/server/rest/SharedHandler.java
+++ b/src/gr/ebs/gss/server/rest/SharedHandler.java
@@ -24,7 +24,6 @@ import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
 
 import java.io.IOException;
 import java.net.URLEncoder;

diff --git a/src/gr/ebs/gss/server/rest/TrashHandler.java b/src/gr/ebs/gss/server/rest/TrashHandler.java
index 740ede6..ad89bba 100644 (file)
--- a/src/gr/ebs/gss/server/rest/TrashHandler.java
+++ b/src/gr/ebs/gss/server/rest/TrashHandler.java
@@ -24,8 +24,6 @@ import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
 import java.io.IOException;

diff --git a/src/gr/ebs/gss/server/webdav/Webdav.java b/src/gr/ebs/gss/server/webdav/Webdav.java
index ea0aaab..9d9ad9e 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/Webdav.java
+++ b/src/gr/ebs/gss/server/webdav/Webdav.java
@@ -30,9 +30,6 @@ import gr.ebs.gss.server.domain.FileBody;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileBodyDTO;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
 import gr.ebs.gss.server.ejb.ExternalAPI;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 

diff --git a/src/gr/ebs/gss/server/webdav/milton/GSSResourceFactory.java b/src/gr/ebs/gss/server/webdav/milton/GSSResourceFactory.java
index 4848293..ab6d939 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GSSResourceFactory.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GSSResourceFactory.java
@@ -23,9 +23,6 @@ import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.Folder;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 import gr.ebs.gss.server.ejb.ExternalAPI;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
@@ -44,7 +41,6 @@ import com.bradmcevoy.http.HttpManager;
 import com.bradmcevoy.http.Resource;
 import com.bradmcevoy.http.ResourceFactory;
 import com.bradmcevoy.http.SecurityManager;
-import com.bradmcevoy.http.Request.Method;
 import com.ettrema.http.fs.LockManager;
 
 
@@ -81,14 +77,14 @@ public class GSSResourceFactory implements ResourceFactory {
                
         }*/
         try {
-               UserDTO user =null;
+               User user =null;
                if(HttpManager.request().getAuthorization()!=null && HttpManager.request().getAuthorization().getTag()==null){
                        String username = HttpManager.request().getAuthorization().getUser();
                        if(username !=null)
                                user = getService().getUserByUserName(username);
                }
                else if(HttpManager.request().getAuthorization()!=null&&HttpManager.request().getAuthorization().getTag()!=null){
-                       user =(UserDTO) HttpManager.request().getAuthorization().getTag();
+                       user =(User) HttpManager.request().getAuthorization().getTag();
                }
        
                if(user==null){
@@ -113,7 +109,7 @@ public class GSSResourceFactory implements ResourceFactory {
        public Long maxAgeSeconds(GssResource resource) {
         return maxAgeSeconds;
     }
-       protected Object getResourceGss(String path, UserDTO user) throws RpcException{
+       protected Object getResourceGss(String path, User user) throws RpcException{
 
                if(user ==null){
                        if(HttpManager.request().getAuthorization()!=null && HttpManager.request().getAuthorization().getTag()==null){
@@ -122,7 +118,7 @@ public class GSSResourceFactory implements ResourceFactory {
                                        user = getService().getUserByUserName(username);
                        }
                        else if(HttpManager.request().getAuthorization()!=null&&HttpManager.request().getAuthorization().getTag()!=null){
-                               user =(UserDTO) HttpManager.request().getAuthorization().getTag();
+                               user =(User) HttpManager.request().getAuthorization().getTag();
                        }
                }
                
@@ -131,8 +127,6 @@ public class GSSResourceFactory implements ResourceFactory {
                }
                boolean exists = true;
                Object resource = null;
-               FileHeaderDTO file = null;
-               FolderDTO folder = null;
                try {
                        resource = getService().getResourceAtPath(user.getId(), path, true);
                } catch (ObjectNotFoundException e) {

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssFileResource.java b/src/gr/ebs/gss/server/webdav/milton/GssFileResource.java
index 0bee249..ececafb 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssFileResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssFileResource.java
@@ -24,8 +24,7 @@ import gr.ebs.gss.client.exceptions.InsufficientPermissionsException;
 import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
+import gr.ebs.gss.server.domain.User;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
 import java.io.BufferedInputStream;
@@ -85,10 +84,10 @@ public class GssFileResource extends GssResource implements CopyableResource, De
         * @param factory
         * @param resource
         */
-       public GssFileResource(String host, GSSResourceFactory factory, Object resource, UserDTO currentUser) {
+       public GssFileResource(String host, GSSResourceFactory factory, Object resource, User currentUser) {
                super(host, factory, resource);
                this.file = (FileHeader) resource;
-               this.currentUser=currentUser;
+               this.currentUser = currentUser;
                
        }
        @Override
@@ -323,7 +322,7 @@ public class GssFileResource extends GssResource implements CopyableResource, De
        public boolean authorise(Request request, Method method, Auth auth) {
         boolean result = factory.getSecurityManager().authorise(request, method, auth, this);
         if(result){
-               UserDTO user = getCurrentUser();
+               User user = getCurrentUser();
                //check permission
                try {
                                factory.getService().getFile(user.getId(), file.getId());

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssFolderResource.java b/src/gr/ebs/gss/server/webdav/milton/GssFolderResource.java
index e8e2047..cfbd1b8 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssFolderResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssFolderResource.java
@@ -26,9 +26,7 @@ import gr.ebs.gss.client.exceptions.QuotaExceededException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
+import gr.ebs.gss.server.domain.User;
 import gr.ebs.gss.server.ejb.TransactionHelper;
 
 import java.io.File;
@@ -83,7 +81,7 @@ public class GssFolderResource extends GssResource implements MakeCollectionable
         * @param factory
         * @param resource
         */
-       public GssFolderResource(String host, GSSResourceFactory factory, Object resource, UserDTO currentUser) {
+       public GssFolderResource(String host, GSSResourceFactory factory, Object resource, User currentUser) {
                super(host, factory, resource);
                folder=(Folder) resource;
                this.currentUser=currentUser;
@@ -307,8 +305,8 @@ public class GssFolderResource extends GssResource implements MakeCollectionable
                                ff2=null;
                        }
                        final Object ff = ff2;
-                       FileHeader kmfile=null;
-                       if(ff!=null && ff instanceof FileHeaderDTO){
+                       FileHeader kmfile = null;
+                       if(ff != null && ff instanceof FileHeader){
                                kmfile = new TransactionHelper<FileHeader>().tryExecute(new Callable<FileHeader>() {
                                        @Override
                                        public FileHeader call()  throws Exception{
@@ -381,12 +379,9 @@ public class GssFolderResource extends GssResource implements MakeCollectionable
                        // TODO Auto-generated catch block
                        e.printStackTrace();
                }
-               ////log.info("CREATE AND LOCK:"+kmfileDTO.getId());
-               //File dest = new File( this.getFile(), name );
-               //createEmptyFile(  );
-               GssFileResource newRes = new GssFileResource( host, factory, kmfile ,getCurrentUser());
-               LockResult res = newRes.lock( timeout, lockInfo );
-               return res.getLockToken();
+        GssFileResource newRes = new GssFileResource( host, factory, kmfile ,getCurrentUser());
+        LockResult res = newRes.lock( timeout, lockInfo );
+        return res.getLockToken();
                
        }
        @Override
@@ -471,7 +466,7 @@ public class GssFolderResource extends GssResource implements MakeCollectionable
        public boolean authorise(Request request, Method method, Auth auth) {
         boolean result = factory.getSecurityManager().authorise(request, method, auth, this);
         if(result){
-               UserDTO user = getCurrentUser();
+               User user = getCurrentUser();
                //check permission
                try {
                                this.folder=factory.getService().getFolder(user.getId(), folder.getId());

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssOtherUserResource.java b/src/gr/ebs/gss/server/webdav/milton/GssOtherUserResource.java
index be6511d..331bcdc 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssOtherUserResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssOtherUserResource.java
@@ -18,9 +18,7 @@
  */
 package gr.ebs.gss.server.webdav.milton;
 
-import gr.ebs.gss.client.rest.resource.OthersResource;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -123,7 +121,7 @@ public class GssOtherUserResource implements PropFindableResource,  GetableResou
     }
        @Override
     public Object authenticate( DigestResponse digestRequest ) {
-        return (UserDTO) factory.getSecurityManager().authenticate(digestRequest);
+        return (User) factory.getSecurityManager().authenticate(digestRequest);
         
         
     }

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssOthersResource.java b/src/gr/ebs/gss/server/webdav/milton/GssOthersResource.java
index 2a6bf6d..6fe7e72 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssOthersResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssOthersResource.java
@@ -20,10 +20,7 @@ package gr.ebs.gss.server.webdav.milton;
 
 import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
-import gr.ebs.gss.client.rest.resource.OtherUserResource;
-import gr.ebs.gss.client.rest.resource.OthersResource;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -40,7 +37,6 @@ import com.bradmcevoy.http.CollectionResource;
 import com.bradmcevoy.http.DigestResource;
 import com.bradmcevoy.http.GetableResource;
 import com.bradmcevoy.http.HttpManager;
-import com.bradmcevoy.http.LockingCollectionResource;
 import com.bradmcevoy.http.PropFindableResource;
 import com.bradmcevoy.http.Range;
 import com.bradmcevoy.http.Request;
@@ -59,7 +55,7 @@ public class GssOthersResource implements PropFindableResource,  GetableResource
        private static final Logger log = LoggerFactory.getLogger(GssOthersResource.class);
     String host;
     GSSResourceFactory factory;
-    UserDTO currentUser;
+    User currentUser;
     
        /**
         * 
@@ -185,7 +181,7 @@ public class GssOthersResource implements PropFindableResource,  GetableResource
         *
         * @return the currentUser
         */
-       public UserDTO getCurrentUser() {
+       public User getCurrentUser() {
                if(currentUser!=null)
                        return currentUser;
                String username = HttpManager.request().getHeaders().get("authorization");

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssResource.java b/src/gr/ebs/gss/server/webdav/milton/GssResource.java
index f30ccb9..c911707 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssResource.java
@@ -20,7 +20,6 @@ package gr.ebs.gss.server.webdav.milton;
 
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.User;
-import gr.ebs.gss.server.domain.dto.UserDTO;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,7 +50,7 @@ public abstract class GssResource implements Resource, MoveableResource, Copyabl
     String host;
     GSSResourceFactory factory;
     Object resource;
-    UserDTO currentUser;
+    User currentUser;
     
        /**
         * 
@@ -114,7 +113,7 @@ public abstract class GssResource implements Resource, MoveableResource, Copyabl
         *
         * @return the currentUser
         */
-       public UserDTO getCurrentUser() {
+       public User getCurrentUser() {
                if(currentUser!=null)
                        return currentUser;
                if(HttpManager.request().getAuthorization()!=null && HttpManager.request().getAuthorization().getTag()==null){
@@ -130,7 +129,7 @@ public abstract class GssResource implements Resource, MoveableResource, Copyabl
                }
                else if(HttpManager.request().getAuthorization()!=null&&HttpManager.request().getAuthorization().getTag()!=null){
                        //log.info(HttpManager.request().getAuthorization().getUser());
-                       currentUser =(UserDTO) HttpManager.request().getAuthorization().getTag();//getService().getUserByUserName("past@ebs.gr");
+                       currentUser =(User) HttpManager.request().getAuthorization().getTag();//getService().getUserByUserName("past@ebs.gr");
                }
                return currentUser;
        }

diff --git a/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java b/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
index 2783997..4a313b0 100644 (file)
--- a/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
+++ b/src/gr/ebs/gss/server/webdav/milton/GssRootFolderResource.java
@@ -23,9 +23,7 @@ import gr.ebs.gss.client.exceptions.ObjectNotFoundException;
 import gr.ebs.gss.client.exceptions.RpcException;
 import gr.ebs.gss.server.domain.FileHeader;
 import gr.ebs.gss.server.domain.Folder;
-import gr.ebs.gss.server.domain.dto.FileHeaderDTO;
-import gr.ebs.gss.server.domain.dto.FolderDTO;
-import gr.ebs.gss.server.domain.dto.UserDTO;
+import gr.ebs.gss.server.domain.User;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,7 +72,7 @@ public class GssRootFolderResource extends GssFolderResource{
                // TODO Auto-generated method stub
                boolean result = factory.getSecurityManager().authorise(request, method, auth, this);
         if(result){
-               UserDTO user = getCurrentUser();
+               User user = getCurrentUser();
                if(user==null)
                        //log.info("AUTH USER NULL");
                if(this.folder==null){