Changeset 889

Timestamp:

2008-12-01 17:24:52 (4 years ago)

Author:

bruno

Message:

dbmock: in case no temp dir is specified, use random one, to avoid conflicts when having multiple dbmock instances. Delete it on exit.

Location:

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbmock

Files:

• DbMockFinder.java (modified) (5 diffs)
• DbMockUtils.java (modified) (1 diff)

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbmock/DbMockFinder.java

@@ -36 +36 @@
 import org.restlet.data.Form;
 
+import javax.annotation.PreDestroy;
+
 /**
  * Finder class that creates a MockResource class depending on an URI
- * 
- * 
  */
 public class DbMockFinder extends Finder {
@@ -45 +45 @@
     private String entitiesLocation;
     private String tempStore;
+    private boolean deleteTempStore;
 
     private enum InitState { WAITING, SUCCESS, FAILED }
@@ -56 +57 @@
 
     public DbMockFinder(Context context, KauriModule module, String entitiesLocation) {
-        this(context, module, entitiesLocation, System.getProperty("java.io.tmpdir") + File.separator + ("dbmock"));
+        this(context, module, entitiesLocation, null);
     }
 
@@ -63 +64 @@
         this.module = module;
         this.entitiesLocation = entitiesLocation;
-        this.tempStore = tempStore;
+
+        if (tempStore == null) {
+            this.tempStore = getTempStoreDir();
+            this.deleteTempStore = true;
+        } else {
+            // if the user specified the temp store location himselve, then we assume the user
+            // wants to keep data between restarts, so don't delete it
+            this.tempStore = tempStore;
+            this.deleteTempStore = false;
+        }
+    }
+
+    private String getTempStoreDir() {
+        String suffix = (System.currentTimeMillis() % 100000) + "" + (int)(Math.random() * 100000);
+        while (true) {
+            String dirName = System.getProperty("java.io.tmpdir") + File.separator + ("dbmock_") + suffix;
+            File dir = new File(dirName);
+            if (dir.exists()) {
+                log.debug("Temporary storage directory already exists, trying another location. Currenty tried: " + dirName);
+                continue;
+            }
+
+            boolean dirCreated = dir.mkdirs();
+            if (!dirCreated) {
+                throw new RuntimeException("Failed to created temporary storage directory at " + dirName);
+            }
+            return dir.getAbsolutePath();
+        }
     }
 
@@ -195 +223 @@
         this.tempStore = tempStore;
     }
+
+    @PreDestroy
+    public void destroy() {
+        DbMockUtils.deleteDirectory(new File(this.tempStore));
+    }
 }

trunk/modules/kauri-dbresources/kauri-dbresources-impl/src/main/java/org/kauriproject/dbmock/DbMockUtils.java

@@ -367 +367 @@
         }
     }
+
+    public static void deleteDirectory(File dir) {
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.isDirectory()) {
+                    deleteDirectory(file);
+                } else {
+                    boolean deleted = file.delete();
+                    if (!deleted)
+                        throw new RuntimeException("Could not delete file " + file.getAbsolutePath());
+                }
+            }
+        }
+        if (!dir.delete())
+            throw new RuntimeException("Could not delete file or directory " + dir.getAbsolutePath());
+    }
 }