Changeset 288:adb48a12f33f

Timestamp:

09/04/11 21:33:41 (5 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2722

Message:

modified UploadedFile fileSpace to nullable.

Location:

kraken-dom/src/main/java/org/krakenapps/dom

Files:

• api/UploadToken.java (modified) (2 diffs)
• api/impl/AdminApiImpl.java (modified) (2 diffs)
• api/impl/FileUploadApiImpl.java (modified) (3 diffs)
• model/UploadedFile.java (modified) (1 diff)
• msgbus/FileUploadPlugin.java (modified) (1 diff)

kraken-dom/src/main/java/org/krakenapps/dom/api/UploadToken.java

@@ -19 +19 @@
         private String token;
         private int userId;
-        private int spaceId;
+        private Integer spaceId;
         private String fileName;
         private long fileSize;
         private Object userData;
 
-        public UploadToken(String token, int userId, int spaceId, String fileName, long fileSize) {
+        public UploadToken(String token, int userId, Integer spaceId, String fileName, long fileSize) {
                 this.token = token;
                 this.userId = userId;
@@ -55 +55 @@
          * @return the space id
          */
-        public int getSpaceId() {
+        public Integer getSpaceId() {
                 return spaceId;
         }

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/AdminApiImpl.java

@@ -39 +39 @@
 import org.krakenapps.jpa.handler.JpaConfig;
 import org.krakenapps.jpa.handler.Transactional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Component(name = "dom-admin-api")
@@ -46 +44 @@
 @JpaConfig(factory = "dom")
 public class AdminApiImpl extends AbstractApi<Admin> implements AdminApi, UserExtensionProvider {
-        private final Logger logger = LoggerFactory.getLogger(AdminApiImpl.class.getName());
-
         @Requires
         private ThreadLocalEntityManagerService entityManagerService;

kraken-dom/src/main/java/org/krakenapps/dom/api/impl/FileUploadApiImpl.java

@@ -273 +273 @@
 
                 // build path
-                File spaceDir = new File(baseDir, Integer.toString(token.getSpaceId()));
+                File spaceDir = new File(baseDir, (token.getSpaceId() == null) ? "0" : Integer.toString(token.getSpaceId()));
                 spaceDir.mkdirs();
 
@@ -285 +285 @@
 
                 // save properties
-                FileSpace space = em.find(FileSpace.class, token.getSpaceId());
-                if (space == null) {
-                        String msg = String.format("kraken dom: file space [%d] not found for uploaded file [%s]",
-                                        token.getSpaceId(), token.getFileName());
-                        throw new IllegalStateException(msg);
+                FileSpace space = null;
+                if (token.getSpaceId() != null) {
+                        space = em.find(FileSpace.class, token.getSpaceId());
+                        if (space == null) {
+                                String msg = String.format("kraken dom: file space [%d] not found for uploaded file [%s]",
+                                                token.getSpaceId(), token.getFileName());
+                                throw new IllegalStateException(msg);
+                        }
                 }
 
@@ -381 +384 @@
 
                 // remove physical file
-                int spaceId = file.getFileSpace().getId();
+                int spaceId = (file.getFileSpace() == null) ? 0 : file.getFileSpace().getId();
                 File spaceDir = new File(baseDir, Integer.toString(spaceId));
                 spaceDir.mkdirs();

kraken-dom/src/main/java/org/krakenapps/dom/model/UploadedFile.java

@@ -37 +37 @@
 
         @ManyToOne
-        @JoinColumn(name = "space_id", nullable = false)
+        @JoinColumn(name = "space_id")
         private FileSpace fileSpace;
 

kraken-dom/src/main/java/org/krakenapps/dom/msgbus/FileUploadPlugin.java

@@ -77 +77 @@
         public void setUploadToken(Request req, Response resp) {
                 String token = UUID.randomUUID().toString();
-                int spaceId = req.getInteger("space_id");
+                Integer spaceId = req.getInteger("space_id");
                 String fileName = req.getString("file_name");
                 long fileSize = req.getInteger("file_size");