remove java preferences from cachestore

Author: jshum2479

imagetool/src/main/java/com/oracle/weblogic/imagetool/api/meta/CacheStore.java

@@ -66,11 +66,4 @@ public interface CacheStore {
      */
     Map<String, String> getCacheItems();
 
-    /**
-     * Set cache directory to new location.
-     *
-     * @param value a directory path
-     * @return true if successful
-     */
-    boolean setCacheDir(String value);
 }

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/CacheCLI.java

@@ -24,8 +24,6 @@
                 ListCacheItems.class,
                 AddInstallerEntry.class,
                 AddPatchEntry.class,
-                GetCacheDir.class,
-                SetCacheDir.class,
                 AddEntry.class,
                 DeleteEntry.class,
                 HelpCommand.class

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/cache/SetCacheDir.java

@@ -18,7 +18,6 @@ public class CacheStoreFactory implements Supplier<CacheStore> {
 
     static {
         cashStoreMap.put(Constants.FILE_CACHE, FileCacheStore.CACHE_STORE);
-        cashStoreMap.put(Constants.PREF_CACHE, PreferenceCacheStore.CACHE_STORE);
     }
 
     public CacheStore getCacheStore(String backingType) {
@@ -27,13 +26,6 @@ public CacheStore getCacheStore(String backingType) {
 
     @Override
     public CacheStore get() {
-        String backingType = null;
-        try {
-            backingType = System.getenv(Constants.CACHE_STORE_TYPE);
-            backingType = Utils.isEmptyString(backingType) ? System.getProperty(Constants.CACHE_STORE_TYPE, Constants.FILE_CACHE) : backingType;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return getCacheStore(backingType);
+        return FileCacheStore.CACHE_STORE;
     }
 }

imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/meta/CacheStoreFactory.java

@@ -6,19 +6,17 @@
 
 import com.oracle.weblogic.imagetool.api.meta.CacheStore;
 import com.oracle.weblogic.imagetool.util.Constants;
+import com.oracle.weblogic.imagetool.util.Utils;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
-import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Properties;
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -28,18 +26,11 @@ public enum FileCacheStore implements CacheStore {
 
     private final Properties properties = new Properties();
     private String metadataPath;
-    private final String DEFAULT_CACHE_DIR = Paths.get(System.getProperty("user.home"), "cache")
-            .toAbsolutePath().toString();
-    private final Preferences preferences = Preferences.userRoot().node(Constants.WEBLOGIC_IMAGETOOL);
 
     FileCacheStore() {
         try {
-            metadataPath = preferences.get(Constants.METADATA_PREF_KEY, null);
-            if (metadataPath == null || metadataPath.isEmpty()) {
-                metadataPath = String.format("%s%s%s", DEFAULT_CACHE_DIR, File.separator, Constants.DEFAULT_META_FILE);
-                preferences.put(Constants.METADATA_PREF_KEY, metadataPath);
-                preferences.flush();
-            }
+            String userCacheDir = Utils.getCacheDir();
+            metadataPath = String.format("%s%s%s", userCacheDir, File.separator, Constants.DEFAULT_META_FILE);
             File metadataFile = new File(metadataPath);
             if (metadataFile.exists() && metadataFile.isFile()) {
                 loadProperties(metadataFile);
@@ -48,7 +39,7 @@ public enum FileCacheStore implements CacheStore {
                 metadataFile.createNewFile();
             }
             if (properties.getProperty(Constants.CACHE_DIR_KEY) == null) {
-                properties.put(Constants.CACHE_DIR_KEY, DEFAULT_CACHE_DIR);
+                properties.put(Constants.CACHE_DIR_KEY, userCacheDir);
                 persistToDisk();
             }
             File cacheDir = new File(properties.getProperty(Constants.CACHE_DIR_KEY));
@@ -63,7 +54,7 @@ public enum FileCacheStore implements CacheStore {
 
     @Override
     public String getCacheDir() {
-        return properties.getProperty(Constants.CACHE_DIR_KEY, DEFAULT_CACHE_DIR);
+        return properties.getProperty(Constants.CACHE_DIR_KEY);
     }
 
     @Override
@@ -138,26 +129,5 @@ private void loadProperties(File propsFile) {
         }
     }
 
-    public boolean setCacheDir(String cacheDirPath) {
-        if (cacheDirPath != null) {
-            properties.put(Constants.CACHE_DIR_KEY, cacheDirPath);
-            try {
-                metadataPath = getCacheDir() + File.separator + Constants.DEFAULT_META_FILE;
-                File metaDataFile = new File(metadataPath);
-                if (metaDataFile.exists() && metaDataFile.isFile()) {
-                    loadProperties(metaDataFile);
-                } else {
-                    metaDataFile.getParentFile().mkdirs();
-                    metaDataFile.createNewFile();
-                }
-                preferences.put(Constants.METADATA_PREF_KEY, metadataPath);
-                preferences.flush();
-                return persistToDisk();
-            } catch (BackingStoreException | IOException e) {
-                e.printStackTrace();
-            }
-        }
-        return false;
-    }
 
 }

imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/meta/FileCacheStore.java

@@ -570,6 +570,35 @@ public static String getBuildWorkingDir() throws IOException {
         return workingDir;
     }
 
+    /**
+     * returns the cache store directory
+     * @return cache directory
+     */
+    public static String getCacheDir() throws IOException {
+        String cacheDir = System.getenv("WLSIMG_CACHEDIR");
+        if (cacheDir == null ) {
+            cacheDir = System.getProperty("user.home") + "/cache";
+        }
+        Path path = Paths.get(cacheDir);
+
+        boolean pathExists =
+            Files.exists(path,
+                new LinkOption[]{ LinkOption.NOFOLLOW_LINKS});
+
+        if (!pathExists) {
+            throw new IOException("Cache Directory does not exists " + cacheDir);
+        } else {
+            if (!Files.isDirectory(path)) {
+                throw new IOException("Cache Directory specified is not a directory " + cacheDir);
+            }
+            if (!Files.isWritable(path)) {
+                throw new IOException("Cache Directory specified is not writable " + cacheDir);
+            }
+        }
+
+        return cacheDir;
+    }
+
     /**
      * Return the version number inside a opatch file
      * @param fileName full path to the opatch patch

imagetool/src/main/java/com/oracle/weblogic/imagetool/impl/meta/PreferenceCacheStore.java

@@ -19,22 +19,7 @@
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class FileCacheStoreTest {
 
-    private CacheStore cacheStore = new CacheStoreFactory().getCacheStore(Constants.FILE_CACHE);
-
-    @Test
-    public void a1setCacheDir() throws IOException {
-        Path cacheDirPath = Files.createTempDirectory("test_imagetool");
-        cacheDirPath.toFile().deleteOnExit();
-        // change the cache directory from default so it doesn't modify user data
-        cacheStore.setCacheDir(cacheDirPath.toAbsolutePath().toString());
-    }
-
-    @Test
-    public void a2getCacheDir() {
-        assertNotNull(cacheStore.getCacheDir());
-        File cacheDir = new File(cacheStore.getCacheDir());
-        assertTrue(cacheDir.exists() && cacheDir.isDirectory());
-    }
+    private CacheStore cacheStore = new CacheStoreFactory().get();
 
     @Test
     public void a3addToCache() {