You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2021/10/25 10:25:37 UTC
[camel] branch main updated: "CAMEL-17116:components - Loading
resource from classpath should use ClassResolver API" (#6324)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 11bd801 "CAMEL-17116:components - Loading resource from classpath should use ClassResolver API" (#6324)
11bd801 is described below
commit 11bd8012743868712904b449024344bcf8130d2b
Author: Ramu <kr...@gmail.com>
AuthorDate: Mon Oct 25 15:55:07 2021 +0530
"CAMEL-17116:components - Loading resource from classpath should use ClassResolver API" (#6324)
Co-authored-by: Kodanda Ramu Kakarla <kk...@kkakarla.pnq.csb>
---
.../apache/camel/component/jbpm/server/CamelKieServerExtension.java | 5 +++--
.../component/jira/oauth/OAuthAsynchronousHttpClientFactory.java | 2 +-
.../main/java/org/apache/camel/component/quartz/QuartzComponent.java | 2 +-
.../camel/component/schematron/processor/ClassPathURIResolver.java | 4 ++--
.../camel/component/schematron/processor/TemplatesFactory.java | 2 +-
.../component/schematron/processor/SchematronProcessorTest.java | 2 +-
.../apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index 36dfadb..a4f68af 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -96,7 +96,8 @@ public class CamelKieServerExtension implements KieServerExtension {
this.camelContext = (DefaultCamelContext) buildGlobalContext();
this.camelContext.setName("KIE Server Camel context");
- try (InputStream is = this.getClass().getResourceAsStream("/global-camel-routes.xml")) {
+ try (InputStream is
+ = getCamelContext().getClassResolver().loadResourceAsStream("/global-camel-routes.xml")) {
if (is != null) {
ExtendedCamelContext ecc = camelContext.adapt(ExtendedCamelContext.class);
RoutesDefinition routes
@@ -128,7 +129,7 @@ public class CamelKieServerExtension implements KieServerExtension {
public void createContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
ClassLoader classloader = kieContainerInstance.getKieContainer().getClassLoader();
- try (InputStream is = classloader.getResourceAsStream("camel-routes.xml")) {
+ try (InputStream is = getCamelContext().getClassResolver().loadResourceAsStream("camel-routes.xml")) {
if (is != null) {
DefaultCamelContext context = (DefaultCamelContext) buildDeploymentContext(id, classloader);
diff --git a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
index 5257801..4c395d4 100644
--- a/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
+++ b/components/camel-jira/src/main/java/org/apache/camel/component/jira/oauth/OAuthAsynchronousHttpClientFactory.java
@@ -169,7 +169,7 @@ public class OAuthAsynchronousHttpClientFactory {
static String getVersion(String groupId, String artifactId) {
final Properties props = new Properties();
String pomProps = String.format("/META-INF/maven/%s/%s/pom.properties", groupId, artifactId);
- try (InputStream resourceAsStream = AuthenticationHandler.class.getResourceAsStream(pomProps)) {
+ try (InputStream resourceAsStream = org.apache.camel.util.ObjectHelper.loadResourceAsStream(pomProps)) {
props.load(resourceAsStream);
return props.getProperty("version", UNKNOWN_VERSION);
} catch (Exception e) {
diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
index 9c43e28..ca361fa 100644
--- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
+++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java
@@ -246,7 +246,7 @@ public class QuartzComponent extends DefaultComponent implements ExtendedStartup
// or setFactory(SchedulerFactory) methods
// must use classloader from StdSchedulerFactory to work even in OSGi
- InputStream is = StdSchedulerFactory.class.getClassLoader().getResourceAsStream("org/quartz/quartz.properties");
+ InputStream is = org.apache.camel.util.ObjectHelper.loadResourceAsStream("org/quartz/quartz.properties");
if (is == null) {
throw new SchedulerException("Quartz properties file not found in classpath: org/quartz/quartz.properties");
}
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
index 20008e2..0e907c1a 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/ClassPathURIResolver.java
@@ -41,8 +41,8 @@ public class ClassPathURIResolver implements URIResolver {
@Override
public Source resolve(String href, String base) throws TransformerException {
- InputStream stream = ClassPathURIResolver.class.getClassLoader()
- .getResourceAsStream(rulesDir.concat("/").concat(href));
+ InputStream stream
+ = org.apache.camel.util.ObjectHelper.loadResourceAsStream(rulesDir.concat("/").concat(href));
if (stream != null) {
return new StreamSource(stream);
} else {
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java
index f2f07d1..949e59e 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/TemplatesFactory.java
@@ -68,7 +68,7 @@ public final class TemplatesFactory {
for (String template : PIPELINE) {
String path = Constants.SCHEMATRON_TEMPLATES_ROOT_DIR
.concat("/").concat(template);
- InputStream xsl = this.getClass().getClassLoader().getResourceAsStream(path);
+ InputStream xsl = org.apache.camel.util.ObjectHelper.loadResourceAsStream(path);
Transformer t = fac.newTransformer(new StreamSource(xsl));
DOMResult result = new DOMResult();
t.transform(source, result);
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
index 2436149..4df8b61 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/processor/SchematronProcessorTest.java
@@ -100,7 +100,7 @@ public class SchematronProcessorTest {
@Override
public Source resolve(String href, String base) throws TransformerException {
return new StreamSource(
- ClientUriResolver.class.getClassLoader().getResourceAsStream("custom-resolver/".concat(href)));
+ org.apache.camel.util.ObjectHelper.loadResourceAsStream("custom-resolver/".concat(href)));
}
}
}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
index f4996b2..eeda771 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XmlSignatureHelper.java
@@ -340,7 +340,7 @@ public final class XmlSignatureHelper {
if (path == null) {
throw new IllegalArgumentException("path is null");
}
- return XmlSignatureHelper.class.getResourceAsStream(path);
+ return org.apache.camel.util.ObjectHelper.loadResourceAsStream(path);
}
public static List<AlgorithmMethod> getTransforms(List<AlgorithmMethod> list) {