fix: Using correct backingResoure for JarSources (quarkusio#738)

A JarSource that is created from a ScriptSource should have the same backingResource as the original ScriptSource. Fixes quarkusio#734
maxandersen · Feb 18, 2021 · 09a85e0 · 09a85e0
1 parent 515a61e
commit 09a85e0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/main/java/dev/jbang/source/JarSource.java b/src/main/java/dev/jbang/source/JarSource.java
@@ -30,16 +30,17 @@
  */
 public class JarSource implements Source {
 	private final ResourceRef resourceRef;
+	private final File jarFile;
 
 	private String classPath;
 	private String mainClass;
 	private List<String> javaRuntimeOptions;
 	private int buildJdk;
 
-	private JarSource(ResourceRef resourceRef) {
+	private JarSource(ResourceRef resourceRef, File jar) {
 		this.resourceRef = resourceRef;
+		this.jarFile = jar;
 		this.javaRuntimeOptions = Collections.emptyList();
-		File jar = getResourceRef().getFile();
 		if (jar.exists()) {
 			try (JarFile jf = new JarFile(jar)) {
 				Attributes attrs = jf.getManifest().getMainAttributes();
@@ -71,7 +72,7 @@ public ResourceRef getResourceRef() {
 
 	@Override
 	public File getJarFile() {
-		return getResourceRef().getFile();
+		return jarFile;
 	}
 
 	@Override
@@ -125,6 +126,10 @@ public List<String> getRuntimeOptions() {
 	}
 
 	public static JarSource prepareJar(ResourceRef resourceRef) {
-		return new JarSource(resourceRef);
+		return new JarSource(resourceRef, resourceRef.getFile());
+	}
+
+	public static JarSource prepareJar(ResourceRef resourceRef, File jarFile) {
+		return new JarSource(resourceRef, jarFile);
 	}
 }
diff --git a/src/main/java/dev/jbang/source/RunContext.java b/src/main/java/dev/jbang/source/RunContext.java
@@ -2,7 +2,6 @@
 
 import static dev.jbang.dependencies.DependencyUtil.joinClasspaths;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -274,14 +273,10 @@ public ModularClassPath getClassPath() {
 	 * If the given source is a JarSource its metadata will be copied to this
 	 * RunContext and the JarSource will be returned. In any other case the given
 	 * source will be returned;
-	 * 
-	 * @return
 	 */
 	public Source importJarMetadataFor(Source src) {
-		File jarFile = src.getJarFile();
-		if (jarFile.exists()) {
-			JarSource jar = JarSource.prepareJar(
-					ResourceRef.forNamedFile(src.getResourceRef().getOriginalResource(), jarFile));
+		JarSource jar = src.asJarSource();
+		if (jar != null && jar.getJarFile().exists()) {
 			setMainClass(jar.getMainClass());
 			setPersistentJvmArgs(jar.getRuntimeOptions());
 			setBuildJdk(JavaUtil.javaVersion(jar.getJavaVersion()));

diff --git a/src/main/java/dev/jbang/source/ScriptSource.java b/src/main/java/dev/jbang/source/ScriptSource.java
@@ -434,8 +434,7 @@ public JarSource asJarSource() {
 		JarSource result = null;
 		File jarFile = getJarFile();
 		if (jarFile != null && jarFile.exists()) {
-			JarSource jarSrc = JarSource.prepareJar(
-					ResourceRef.forNamedFile(getResourceRef().getOriginalResource(), jarFile));
+			JarSource jarSrc = JarSource.prepareJar(getResourceRef(), jarFile);
 			if (jarSrc.resolveClassPath(Collections.emptyList()).isValid()) {
 				result = jarSrc;
 			}

diff --git a/src/test/java/dev/jbang/cli/TestInfo.java b/src/test/java/dev/jbang/cli/TestInfo.java
@@ -52,9 +52,7 @@ void testInfoToolsBuilt() {
 		assertThat(info.applicationJar, allOf(
 				containsString("quote.java."),
 				endsWith(".jar")));
-		assertThat(info.backingResource, allOf(
-				containsString("quote.java."),
-				endsWith(".jar")));
+		assertThat(info.backingResource, equalTo(Paths.get("itests/quote.java").toString()));
 		assertThat(Integer.parseInt(info.javaVersion), greaterThan(0));
 		assertThat(info.mainClass, equalTo("quote"));
 		assertThat(info.resolvedDependencies, Matchers.<Collection<String>>allOf(