Fixing LoadedLibraries, though not yet actual replay

Author: jglick

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

@@ -50,6 +50,7 @@
 import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
@@ -358,20 +359,24 @@ static URL retrieve(@NonNull LibraryRecord record, @NonNull LibraryRetriever ret
                     Run<?,?> run = (Run) executable;
                     LibrariesAction action = run.getAction(LibrariesAction.class);
                     if (action != null) {
-                        // TODO handle *.jar
                         FilePath libs = new FilePath(run.getRootDir()).child("libs");
                         for (LibraryRecord library : action.getLibraries()) {
                             if (library.trusted) {
                                 continue; // TODO JENKINS-41157 allow replay of trusted libraries if you have ADMINISTER
                             }
-                            for (String rootName : new String[] {"src", "vars"}) {
-                                FilePath root = libs.child(library.getDirectoryName() + "/" + rootName);
-                                if (!root.isDirectory()) {
-                                    continue;
-                                }
-                                for (FilePath groovy : root.list("**/*.groovy")) {
-                                    String clazz = className(groovy.getRemote(), root.getRemote());
-                                    scripts.put(clazz, groovy.readToString()); // TODO no idea what encoding the Groovy compiler uses
+                            FilePath jar = libs.child(library.getDirectoryName() + ".jar");
+                            if (!jar.exists()) {
+                                continue;
+                            }
+                            try (JarFile jf = new JarFile(jar.getRemote())) {
+                                for (JarEntry je : (Iterable<JarEntry>) jf.stream()::iterator) {
+                                    if (je.getName().endsWith(".groovy")) {
+                                        String text;
+                                        try (InputStream is = jf.getInputStream(je)) {
+                                            text = IOUtils.toString(is, StandardCharsets.UTF_8); // TODO no idea what encoding the Groovy compiler uses
+                                        }
+                                        scripts.put(je.getName().replaceFirst("[.]groovy$", "").replace('/', '.'), text);
+                                    }
                                 }
                             }
                         }
@@ -383,10 +388,6 @@ static URL retrieve(@NonNull LibraryRecord record, @NonNull LibraryRetriever ret
             return scripts;
         }
 
-        static String className(String groovy, String root) {
-            return groovy.replaceFirst("^" + Pattern.quote(root) + "[/\\\\](.+)[.]groovy", "$1").replace('/', '.').replace('\\', '.');
-        }
-
     }
 
     @Extension public static class Copier extends FlowCopier.ByRun {

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

@@ -46,7 +46,6 @@
 import jenkins.scm.impl.subversion.SubversionSCMSource;
 import jenkins.scm.impl.subversion.SubversionSampleRepoRule;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
 import org.jenkinsci.plugins.workflow.cps.GlobalVariable;
@@ -64,7 +63,6 @@
 import org.jvnet.hudson.test.Issue;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.TestExtension;
-import org.jvnet.hudson.test.WithoutJenkins;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 public class LibraryAdderTest {
@@ -546,12 +544,4 @@ public void parallelBuildsDontInterfereWithExpiredCache() throws Throwable {
 
     // TODO test migration in LibraryAdder.add after reload build started prior to dir2Jar (@OldData)
 
-    @Issue("JENKINS-68544")
-    @WithoutJenkins
-    @Test public void className() {
-        assertThat(LibraryAdder.LoadedLibraries.className("/path/to/lib/src/some/pkg/Type.groovy", "/path/to/lib/src"), is("some.pkg.Type"));
-        assertThat(LibraryAdder.LoadedLibraries.className("C:\\path\\to\\lib\\src\\some\\pkg\\Type.groovy", "C:\\path\\to\\lib\\src"), is("some.pkg.Type"));
-        assertThat(LibraryAdder.LoadedLibraries.className("C:\\path\\to\\Extra\\lib\\src\\some\\pkg\\Type.groovy", "C:\\path\\to\\Extra\\lib\\src"), is("some.pkg.Type"));
-    }
-
 }