Skip to content

fix loading plugin messages if classpath is not a jar #15160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: 7.0.x
Choose a base branch
from
+25 −2
Open

fix loading plugin messages if classpath is not a jar #15160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
036832e
fix loading plugin messages if classpath is not a jar
Taack Oct 21, 2025
b9c4d2b
Merge branch '7.0.x' into 7.0.x
Taack Oct 21, 2025
f45ebfb
add test-case for StaticResourceLoader in case of nop jar classpath
Taack Oct 21, 2025
4f6844a
typo
Taack Oct 21, 2025
a6eea15
typo
Taack Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion grails-core/src/main/groovy/org/grails/core/io/StaticResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,15 @@
public class StaticResourceLoader implements ResourceLoader {
private static final Logger LOG = LoggerFactory.getLogger(StaticResourceLoader.class);
private Resource baseResource;
private final boolean doNotCreateRelative;

public StaticResourceLoader() {
doNotCreateRelative = false;
}

public StaticResourceLoader(boolean doNotCreateRelative) {
this.doNotCreateRelative = doNotCreateRelative;
}

public void setBaseResource(Resource baseResource) {
this.baseResource = baseResource;
Expand All @@ -48,7 +57,7 @@
LOG.debug("Loading resource for path {} from base resource {}", location, baseResource);
}
try {
Resource resource = baseResource.createRelative(location);
Resource resource = doNotCreateRelative ? baseResource : baseResource.createRelative(location);
if (LOG.isDebugEnabled() && resource.exists()) {
LOG.debug("Found resource for path {} from base resource {}", location, baseResource);
}
Expand Down
2 changes: 1 addition & 1 deletion grails-core/src/main/groovy/org/grails/plugins/BinaryGrailsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public Properties getProperties(final Locale locale) {
Resource url = this.baseResourcesResource;
Properties properties = null;
if (url != null) {
StaticResourceLoader resourceLoader = new StaticResourceLoader();
StaticResourceLoader resourceLoader = new StaticResourceLoader(!isJar);
resourceLoader.setBaseResource(url);
ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(resourceLoader);
try {
Expand Down
14 changes: 14 additions & 0 deletions grails-test-suite-uber/src/test/groovy/org/grails/support/StaticResourceLoaderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.grails.support;

import java.net.MalformedURLException;

import org.grails.core.io.StaticResourceLoader;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.Resource;
Expand Down Expand Up @@ -57,4 +59,16 @@ public void testIllegalState() {
// expected
}
}

@Test
public void testNonJarClasspath() {
StaticResourceLoader srl = new StaticResourceLoader(true);
try {
Resource baseResource = new UrlResource("file://home/test");
srl.setBaseResource(baseResource);
assertEquals(srl.getResource(""), baseResource);
} catch (MalformedURLException e) {
fail("mal formed url");
}
}
}
Loading