Modified caching configuration, unit tests

Author: KINAXIS\agharat

src/main/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfiguration.java

@@ -158,37 +158,4 @@ public FormValidation doClearCache(@QueryParameter String name, @QueryParameter
             return FormValidation.ok("The cache dir was deleted successfully.");
         }
     }
-
-    /**
-     * Method can be called from an external source to delete cache of a particular version of the shared library
-     * Example: delete cache from through pipeline script once the build is successful
-     * @param jenkinsLibrary Name of the shared library
-     * @param version Name of the version to delete the cache
-     * @throws IOException
-     * @throws InterruptedException
-     */
-    public static void deleteLibraryCacheForBranch(String jenkinsLibrary, String version) throws IOException, InterruptedException {
-        if (LibraryCachingConfiguration.getGlobalLibrariesCacheDir().exists()) {
-            for (FilePath libraryNamePath : LibraryCachingConfiguration.getGlobalLibrariesCacheDir().list("*-name.txt")) {
-                String cacheName;
-                try (InputStream stream = libraryNamePath.read()) {
-                    cacheName = IOUtils.toString(stream, StandardCharsets.UTF_8);
-
-                    if (cacheName.equals(jenkinsLibrary)) {
-                        FilePath libraryCachePath = LibraryCachingConfiguration.getGlobalLibrariesCacheDir()
-                                .child(libraryNamePath.getName().replace("-name.txt", ""));
-                        ReentrantReadWriteLock retrieveLock = LibraryAdder.getReadWriteLockFor(libraryCachePath.getName());
-                        if (retrieveLock.writeLock().tryLock(10, TimeUnit.SECONDS)) {
-                            try {
-                                libraryCachePath.deleteRecursive();
-                                libraryNamePath.delete();
-                            } finally {
-                                retrieveLock.writeLock().unlock();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
 }

src/test/java/org/jenkinsci/plugins/workflow/libs/LibraryCachingConfigurationTest.java

@@ -190,6 +190,7 @@ public void isExcluded() {
         assertFalse(substringVersionConfig.isExcluded(null));
     }
 
+    @Issue("JENKINS-69135") //"Versions to include" feature for caching
     @Test
     @WithoutJenkins
     public void isIncluded() {
@@ -205,6 +206,16 @@ public void isIncluded() {
         assertTrue(substringVersionConfig.isIncluded(SUBSTRING_INCLUDED_VERSIONS_1));
         assertTrue(substringVersionConfig.isIncluded(SUBSTRING_INCLUDED_VERSIONS_2));
 
+        assertFalse(nullVersionConfig.isIncluded(""));
+        assertFalse(oneVersionConfig.isIncluded(""));
+        assertFalse(multiVersionConfig.isIncluded(""));
+        assertFalse(substringVersionConfig.isIncluded(""));
+
+        assertFalse(nullVersionConfig.isIncluded(null));
+        assertFalse(oneVersionConfig.isIncluded(null));
+        assertFalse(multiVersionConfig.isIncluded(null));
+        assertFalse(substringVersionConfig.isIncluded(null));
+
     }
 
     @Test
@@ -234,6 +245,9 @@ public void clearCache() throws Exception {
         assertThat(new File(cache.withSuffix("-name.txt").getRemote()), not(anExistingFile()));
     }
 
+    //Test similar substrings in "Versions to include" & "Versions to exclude"
+    //Exclusion takes precedence
+    @Issue("JENKINS-69135") //"Versions to include" feature for caching
     @Test
     public void clearCacheConflict() throws Exception {
         sampleRepo.init();
@@ -255,6 +269,7 @@ public void clearCacheConflict() throws Exception {
         LibrariesAction action = b.getAction(LibrariesAction.class);
         LibraryRecord record = action.getLibraries().get(0);
         FilePath cache = LibraryCachingConfiguration.getGlobalLibrariesCacheDir().child(record.getDirectoryName());
+        // Cache should not get created since the version is included in "Versions to exclude"
         assertThat(new File(cache.getRemote()), not(anExistingDirectory()));
         assertThat(new File(cache.withSuffix("-name.txt").getRemote()), not(anExistingFile()));
     }