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 2023/08/08 12:14:26 UTC
[camel-spring-boot] branch main updated: CAMEL-19724: adjusted the code to align with the changes from Camel Core (#904)
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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 2294861b34d CAMEL-19724: adjusted the code to align with the changes from Camel Core (#904)
2294861b34d is described below
commit 2294861b34d68f1f822fff627f26e658cb394a02
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Tue Aug 8 14:14:21 2023 +0200
CAMEL-19724: adjusted the code to align with the changes from Camel Core (#904)
---
.../apache/camel/spring/boot/FatJarPackageScanClassResolver.java | 9 ++++++---
.../camel/spring/boot/FatJarPackageScanResourceResolver.java | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
index 070eb50eefc..0fcede943e3 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanClassResolver.java
@@ -25,12 +25,15 @@ import java.util.jar.JarInputStream;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An implementation of the {@code org.apache.camel.spi.PackageScanClassResolver} that is able to
* scan spring-boot fat jars to find classes contained also in nested jars.
*/
public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResolver {
+ private static final Logger LOG = LoggerFactory.getLogger(FatJarPackageScanClassResolver.class);
private static final String SPRING_BOOT_CLASSIC_LIB_ROOT = "lib/";
private static final String SPRING_BOOT_BOOT_INF_LIB_ROOT = "BOOT-INF/lib/";
@@ -59,18 +62,18 @@ public class FatJarPackageScanClassResolver extends DefaultPackageScanClassResol
entries.add(cleanupSpringBootClassName(name));
} else if (inspectNestedJars && !entry.isDirectory() && isSpringBootNestedJar(name)) {
String nestedUrl = urlPath + "!/" + name;
- log.trace("Inspecting nested jar: {}", nestedUrl);
+ LOG.trace("Inspecting nested jar: {}", nestedUrl);
List<String> nestedEntries = doLoadJarClassEntries(jarStream, nestedUrl, false, false);
entries.addAll(nestedEntries);
}
}
} catch (IOException ioe) {
- log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
+ LOG.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
} finally {
if (closeStream) {
// stream is left open when scanning nested jars, otherwise the fat jar stream gets closed
- IOHelper.close(jarStream, urlPath, log);
+ IOHelper.close(jarStream, urlPath, LOG);
}
}
diff --git a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
index 249d2947d46..3d68a356a42 100644
--- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
+++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/FatJarPackageScanResourceResolver.java
@@ -18,6 +18,8 @@ package org.apache.camel.spring.boot;
import org.apache.camel.impl.engine.DefaultPackageScanResourceResolver;
import org.apache.camel.util.IOHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +33,7 @@ import java.util.jar.JarInputStream;
* scan spring-boot fat jars to find resources contained also in nested jars.
*/
public class FatJarPackageScanResourceResolver extends DefaultPackageScanResourceResolver {
+ private static final Logger LOG = LoggerFactory.getLogger(FatJarPackageScanResourceResolver.class);
private static final String SPRING_BOOT_CLASSIC_LIB_ROOT = "lib/";
private static final String SPRING_BOOT_BOOT_INF_LIB_ROOT = "BOOT-INF/lib/";
@@ -56,7 +59,7 @@ public class FatJarPackageScanResourceResolver extends DefaultPackageScanResourc
String name = entry.getName().trim();
if (inspectNestedJars && !entry.isDirectory() && isSpringBootNestedJar(name)) {
String nestedUrl = urlPath + "!/" + name;
- log.trace("Inspecting nested jar: {}", nestedUrl);
+ LOG.trace("Inspecting nested jar: {}", nestedUrl);
List<String> nestedEntries = doLoadImplementationsInJar(packageName, jarStream, nestedUrl, false, false);
entries.addAll(nestedEntries);
} else if (!entry.isDirectory() && !name.endsWith(".class")) {
@@ -68,11 +71,11 @@ public class FatJarPackageScanResourceResolver extends DefaultPackageScanResourc
}
}
} catch (IOException ioe) {
- log.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
+ LOG.warn("Cannot search jar file '" + urlPath + " due to an IOException: " + ioe.getMessage() + ". This exception is ignored.", ioe);
} finally {
if (closeStream) {
// stream is left open when scanning nested jars, otherwise the fat jar stream gets closed
- IOHelper.close(jarStream, urlPath, log);
+ IOHelper.close(jarStream, urlPath, LOG);
}
}