extract getCanonicalPath()

greenrobot · greenrobot · commit b04a4025e914 · 2018-03-08T12:42:10.000+01:00
diff --git a/objectbox-java/src/main/java/io/objectbox/BoxStore.java b/objectbox-java/src/main/java/io/objectbox/BoxStore.java
@@ -176,18 +176,7 @@ public static String getVersion() {
         NativeLibraryLoader.ensureLoaded();
 
         directory = builder.directory;
-        if (directory.exists()) {
-            if (!directory.isDirectory()) {
-                throw new DbException("Is not a directory: " + directory.getAbsolutePath());
-            }
-        } else if (!directory.mkdirs()) {
-            throw new DbException("Could not create directory: " + directory.getAbsolutePath());
-        }
-        try {
-            canonicalPath = directory.getCanonicalPath();
-        } catch (IOException e) {
-            throw new DbException("Could not verify dir", e);
-        }
+        canonicalPath = getCanonicalPath(directory);
         verifyNotAlreadyOpen(canonicalPath);
 
         handle = nativeCreate(canonicalPath, builder.maxSizeInKByte, builder.maxReaders, builder.model);
@@ -234,6 +223,21 @@ public static String getVersion() {
         queryAttempts = builder.queryAttempts < 1 ? 1 : builder.queryAttempts;
     }
 
+    static String getCanonicalPath(File directory) {
+        if (directory.exists()) {
+            if (!directory.isDirectory()) {
+                throw new DbException("Is not a directory: " + directory.getAbsolutePath());
+            }
+        } else if (!directory.mkdirs()) {
+            throw new DbException("Could not create directory: " + directory.getAbsolutePath());
+        }
+        try {
+            return directory.getCanonicalPath();
+        } catch (IOException e) {
+            throw new DbException("Could not verify dir", e);
+        }
+    }
+
     private static void verifyNotAlreadyOpen(String canonicalPath) {
         synchronized (openFiles) {
             int tries = 0;
