renaming class: HybridPDRDatasetRestorer -> RestrictedDatasetRestorer…

… (step 1)
usnistgov · Jan 8, 2024 · a885dee · a885dee
1 parent b1605b7
commit a885dee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/gov/nist/oar/distrib/cachemgr/pdr/HybridPDRDatasetRestorer.java b/src/main/java/gov/nist/oar/distrib/cachemgr/pdr/HybridPDRDatasetRestorer.java
@@ -76,7 +76,7 @@
  * Individual files can restored to cache using the {@link gov.nist.oar.distrib.cachemgr.Restorer} interface;
  * however, whole datasets can be efficiently cached as well via its extended interface.
  */
-public class HybridPDRDatasetRestorer extends PDRDatasetRestorer {
+public class RestrictedDatasetRestorer extends PDRDatasetRestorer {
     BagStorage restrictedLtstore = null;
 
     /**
@@ -85,8 +85,8 @@ public class HybridPDRDatasetRestorer extends PDRDatasetRestorer {
      * @param restrictedLtstore  the restricted long-term storage
      * @param headbagcache  the cache to use cache the head bags
      */
-    public HybridPDRDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore,
-                                    HeadBagCacheManager headbagcache) {
+    public RestrictedDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore,
+                                     HeadBagCacheManager headbagcache) {
         super(publicLtstore, headbagcache, -1L);
         this.restrictedLtstore = restrictedLtstore;
     }
@@ -99,8 +99,8 @@ public HybridPDRDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedL
      * @param smallsizelim  a data file size limit: files smaller than this will preferentially go
      *                        into volumes marked for small files.
      */
-    public HybridPDRDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore,
-                                    HeadBagCacheManager headbagcache, long smallsizelim) {
+    public RestrictedDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore,
+                                     HeadBagCacheManager headbagcache, long smallsizelim) {
         super(publicLtstore, headbagcache, smallsizelim);
         this.restrictedLtstore = restrictedLtstore;
     }
@@ -114,8 +114,8 @@ public HybridPDRDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedL
      *                        into volumes marked for small files.
      * @param logger        the logger to use for messages.
      */
-    public HybridPDRDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore, HeadBagCacheManager headbagcache, long smallsizelim,
-                              Logger logger)
+    public RestrictedDatasetRestorer(BagStorage publicLtstore, BagStorage restrictedLtstore, 
+                                     HeadBagCacheManager headbagcache, long smallsizelim, Logger logger)
     {
         super(publicLtstore, headbagcache, smallsizelim, logger);
         this.restrictedLtstore = restrictedLtstore;

diff --git a/src/test/java/gov/nist/oar/distrib/cachemgr/pdr/HybridPDRDatasetRestorerTest.java b/src/test/java/gov/nist/oar/distrib/cachemgr/pdr/HybridPDRDatasetRestorerTest.java
@@ -38,7 +38,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-public class HybridPDRDatasetRestorerTest {
+public class RestrictedDatasetRestorerTest {
 
     @Rule
     public final TemporaryFolder tempf = new TemporaryFolder();
@@ -48,7 +48,7 @@ public class HybridPDRDatasetRestorerTest {
     private BagStorage publicLtstore;
     private BagStorage restrictedLtstore;
     private HeadBagCacheManager hbcm;
-    private HybridPDRDatasetRestorer rstr;
+    private RestrictedDatasetRestorer rstr;
 
     ConfigurableCache cache = null;
 
@@ -106,7 +106,7 @@ public void setUp() throws IOException, CacheManagementException {
 
         hbcm = createHBCache(restrictedLtstore, publicLtstore);
         cache = createDataCache();
-        rstr = new HybridPDRDatasetRestorer(publicLtstore, restrictedLtstore, hbcm, 500);
+        rstr = new RestrictedDatasetRestorer(publicLtstore, restrictedLtstore, hbcm, 500);
 
     }