This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 2356f9d CAMEL-15860: Use logger instead of stdio for
camel-catalog-maven.
2356f9d is described below
commit 2356f9dab233a21ca52c1e0032088dcfcf5c6887
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Dec 4 13:02:21 2020 +0100
CAMEL-15860: Use logger instead of stdio for camel-catalog-maven.
---
catalog/camel-catalog-maven/pom.xml | 5 +++++
.../camel/catalog/maven/DefaultMavenArtifactProvider.java | 14 +++++++++-----
.../apache/camel/catalog/maven/MavenVersionManager.java | 10 +++++++---
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/catalog/camel-catalog-maven/pom.xml
b/catalog/camel-catalog-maven/pom.xml
index 3c461c9..c9a0c72 100644
--- a/catalog/camel-catalog-maven/pom.xml
+++ b/catalog/camel-catalog-maven/pom.xml
@@ -44,6 +44,11 @@
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
<!-- use http cliet 4.x -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
index c1e4077..c9c9f5d 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/DefaultMavenArtifactProvider.java
@@ -25,6 +25,8 @@ import java.util.Set;
import groovy.grape.Grape;
import groovy.lang.GroovyClassLoader;
import org.apache.camel.catalog.CamelCatalog;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.extractComponentJavaType;
import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.loadComponentJSonSchema;
@@ -35,6 +37,7 @@ import static
org.apache.camel.catalog.maven.ComponentArtifactHelper.loadCompone
*/
public class DefaultMavenArtifactProvider implements MavenArtifactProvider {
+ private static final Logger LOG =
LoggerFactory.getLogger(DefaultMavenArtifactProvider.class);
private String cacheDirectory;
private boolean log;
@@ -67,7 +70,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
try {
if (cacheDirectory != null) {
if (log) {
- System.out.println("DEBUG: Using cache directory: " +
cacheDirectory);
+ LOG.debug("Using cache directory: {}", cacheDirectory);
}
System.setProperty("grape.root", cacheDirectory);
}
@@ -86,7 +89,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
param.put("transitive", false);
if (log) {
- System.out.println("Downloading " + groupId + ":" +
artifactId + ":" + version);
+ LOG.info("Downloading " + groupId + ":" + artifactId + ":"
+ version);
}
Grape.grab(param);
@@ -98,8 +101,9 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
} catch (Exception e) {
if (log) {
- System.out.println("WARN: Error during add components from
artifact " + groupId + ":" + artifactId + ":"
- + version + " due " + e.getMessage());
+ LOG.warn("Error during add components from artifact " +
groupId + ":" + artifactId + ":"
+ + version + " due " + e.getMessage(),
+ e);
}
}
@@ -121,7 +125,7 @@ public class DefaultMavenArtifactProvider implements
MavenArtifactProvider {
String json = loadComponentJSonSchema(log,
classLoader, scheme);
if (json != null) {
if (log) {
- System.out.println("Adding component: " +
scheme);
+ LOG.info("Adding component: {}", scheme);
}
camelCatalog.addComponent(scheme, javaType,
json);
names.add(scheme);
diff --git
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 3151894..5cfefa7 100644
---
a/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++
b/catalog/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -28,6 +28,8 @@ import groovy.grape.Grape;
import groovy.lang.GroovyClassLoader;
import org.apache.camel.catalog.VersionManager;
import org.apache.ivy.util.url.URLHandlerRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* A {@link VersionManager} that can load the resources using Maven to
download needed artifacts from a local or remote
@@ -37,6 +39,8 @@ import org.apache.ivy.util.url.URLHandlerRegistry;
*/
public class MavenVersionManager implements VersionManager, Closeable {
+ private static final Logger LOG =
LoggerFactory.getLogger(MavenVersionManager.class);
+
private final ClassLoader classLoader = new GroovyClassLoader();
private final TimeoutHttpClientHandler httpClient = new
TimeoutHttpClientHandler();
private String version;
@@ -112,7 +116,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
return true;
} catch (Exception e) {
if (log) {
- System.out.print("WARN: Cannot load version " + version + "
due " + e.getMessage());
+ LOG.warn("Cannot load version " + version + " due " +
e.getMessage(), e);
}
return false;
}
@@ -142,7 +146,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
return true;
} catch (Exception e) {
if (log) {
- System.out.print("WARN: Cannot load runtime provider version "
+ version + " due " + e.getMessage());
+ LOG.warn("Cannot load runtime provider version " + version + "
due " + e.getMessage(), e);
}
return false;
}
@@ -188,7 +192,7 @@ public class MavenVersionManager implements VersionManager,
Closeable {
}
} catch (IOException e) {
if (log) {
- System.out.print("WARN: Cannot open resource " + name + " and
version " + version + " due " + e.getMessage());
+ LOG.warn("Cannot open resource " + name + " and version " +
version + " due " + e.getMessage(), e);
}
}
