adds configuration to the resource pools builder; plus some tests (#74)

duracloud · May 21, 2024 · 4df1670 · 4df1670
1 parent a1ad05d
commit 4df1670
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 7 deletions.
diff --git a/loopingduptaskproducer/src/main/java/org/duracloud/mill/ltp/dup/AppDriver.java b/loopingduptaskproducer/src/main/java/org/duracloud/mill/ltp/dup/AppDriver.java
@@ -41,6 +41,7 @@
 import org.ehcache.config.builders.CacheConfigurationBuilder;
 import org.ehcache.config.builders.CacheManagerBuilder;
 import org.ehcache.config.builders.ResourcePoolsBuilder;
+import org.ehcache.config.units.MemoryUnit;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +69,7 @@ public static void main(String[] args) {
     @Override
     protected LoopingTaskProducer buildTaskProducer() {
 
-        List<PropertyDefinition> defintions =
+        List<PropertyDefinition> definitions =
             new PropertyDefinitionListBuilder().addAws()
                                                .addSwift()
                                                .addNotificationConfig()
@@ -82,7 +83,7 @@ protected LoopingTaskProducer buildTaskProducer() {
                                                .addLocalDuplicationDir()
                                                .addWorkDir()
                                                .build();
-        PropertyVerifier verifier = new PropertyVerifier(defintions);
+        PropertyVerifier verifier = new PropertyVerifier(definitions);
         verifier.verify(System.getProperties());
 
         LoopingTaskProducerConfigurationManager config = new LoopingTaskProducerConfigurationManager();
@@ -148,7 +149,7 @@ protected LoopingTaskProducer buildTaskProducer() {
             .withCache("contentIdCache",
                        CacheConfigurationBuilder.newCacheConfigurationBuilder(
                            String.class, String.class,
-                           ResourcePoolsBuilder.newResourcePoolsBuilder()))
+                           ResourcePoolsBuilder.newResourcePoolsBuilder().disk(100, MemoryUnit.MB, true)))
             .build(true);
         Cache<String, String> cache = cacheManager.getCache("contentIdCache", String.class, String.class);
 

diff --git a/...producer/src/test/java/org/duracloud/mill/ltp/dup/LoopingDuplicationTaskProducerTest.java b/...producer/src/test/java/org/duracloud/mill/ltp/dup/LoopingDuplicationTaskProducerTest.java
@@ -51,12 +51,14 @@
 import org.ehcache.config.builders.CacheConfigurationBuilder;
 import org.ehcache.config.builders.CacheManagerBuilder;
 import org.ehcache.config.builders.ResourcePoolsBuilder;
+import org.ehcache.config.units.EntryUnit;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 /**
  * @author Daniel Bernstein
  * Date: Nov 6, 2013
@@ -118,7 +120,9 @@ public void setUp() throws Exception {
     @After
     public void tearDown() throws Exception {
         verifyAll();
-        cache.clear();
+        if (cache != null) {
+            cache.clear();
+        }
     }
 
     /**
@@ -183,7 +187,8 @@ public void testNonExistentSpace() throws CredentialsRepoException, ParseExcepti
     }
 
     private void setupLoopingTaskProducerConfig(int times) {
-        expect(this.config.getWorkDirectoryPath()).andReturn("java.io.tmpdir").times(times);
+        expect(this.config.getWorkDirectoryPath()).andReturn(
+                String.valueOf(Path.of(System.getProperty("java.io.tmpdir")))).times(times);
     }
 
     private void setupNotificationManager() {
@@ -277,6 +282,37 @@ public void setMorsels(LinkedHashSet<DuplicationMorsel> morsels2) {
 
     }
 
+    /**
+     * Test setting up the ehcache CacheManager without a resource pool
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetupCacheWithoutStore() throws Exception {
+        replayAll();
+        CacheManager testCacheManager = CacheManagerBuilder.newCacheManagerBuilder().build(true);
+        testCacheManager.createCache(CACHE_NAME,
+                CacheConfigurationBuilder.newCacheConfigurationBuilder(String.class, String.class,
+                        ResourcePoolsBuilder.newResourcePoolsBuilder()));
+        Cache<String, String> testCache = testCacheManager.getCache(CACHE_NAME, String.class, String.class);
+        testCache.clear();
+        testCacheManager.close();
+    }
+
+    /**
+     * Test setting up the ehcache CacheManager with a resource pool
+     */
+    @Test
+    public void testSetupCacheWithStore() {
+        replayAll();
+        CacheManager testCacheManager = CacheManagerBuilder.newCacheManagerBuilder().build(true);
+        testCacheManager.createCache(CACHE_NAME,
+                CacheConfigurationBuilder.newCacheConfigurationBuilder(String.class, String.class,
+                        ResourcePoolsBuilder.newResourcePoolsBuilder().heap(10, EntryUnit.ENTRIES)));
+        Cache<String, String> testCache = testCacheManager.getCache(CACHE_NAME, String.class, String.class);
+        Assert.assertNotNull(testCache);
+        testCache.clear();
+        testCacheManager.close();
+    }
+
     private String createStateFilePath() {
         final var path = Path.of(System.getProperty("java.io.tmpdir"), System.currentTimeMillis() + ".json").toString();
         new File(path).deleteOnExit();
@@ -501,7 +537,8 @@ private void setupCache() {
             CacheManager cacheManager = CacheManagerBuilder.newCacheManagerBuilder().build(true);
             cacheManager.createCache(CACHE_NAME,
                                      CacheConfigurationBuilder.newCacheConfigurationBuilder(String.class, String.class,
-                                         ResourcePoolsBuilder.heap(10)));
+                                         ResourcePoolsBuilder.newResourcePoolsBuilder()
+                                                 .heap(10, EntryUnit.ENTRIES)));
             cache = cacheManager.getCache(CACHE_NAME, String.class, String.class);
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -885,7 +885,7 @@
       <dependency>
         <groupId>org.ehcache</groupId>
         <artifactId>ehcache</artifactId>
-        <version>3.10.0</version>
+        <version>3.10.8</version>
       </dependency>
 
     </dependencies>