Skip to content

fix: Define a constant instead of duplicating this literal "classpath:/" 4 ti #2

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
ciadoh wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Define a constant instead of duplicating this literal "classpath:/" 4 ti #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/main/java/org/owasp/webgoat/container/AsciiDoctorTemplateResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: Copyright © 2016 WebGoat authors
* SPDX-FileCopyrightText: Copyright 2016 WebGoat authors
* SPDX-License-Identifier: GPL-2.0-or-later
*/
package org.owasp.webgoat.container;
Expand Down Expand Up @@ -86,13 +86,13 @@ private InputStream getInputStream(String templateName) throws IOException {
String computedResourceName =
computeResourceName(templateName, language.getLocale().getLanguage());
if (resourceLoader
.getResource("classpath:/" + computedResourceName)
.isReadable() /*isFile()*/) {
.getResource(computedResourceName)
.isReadable()) {
log.debug("localized file exists");
return resourceLoader.getResource("classpath:/" + computedResourceName).getInputStream();
return resourceLoader.getResource(computedResourceName).getInputStream();
} else {
log.debug("using english template");
return resourceLoader.getResource("classpath:/" + templateName).getInputStream();
return resourceLoader.getResource(templateName).getInputStream();
}
}

Expand All @@ -106,7 +106,7 @@ private String computeResourceName(String resourceName, String language) {
log.debug("computed local file name: {}", computedResourceName);
log.debug(
"file exists: {}",
resourceLoader.getResource("classpath:/" + computedResourceName).isReadable());
resourceLoader.getResource(computedResourceName).isReadable());
return computedResourceName;
}

Expand Down Expand Up @@ -144,4 +144,4 @@ private String determineLanguage() {
}
}
}
}
}