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
commit c798e1b00be671057274429794197d121c5ad172
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Dec 5 11:53:33 2020 +0100
CAMEL-15804: Polished
---
.../camel/language/datasonnet/DatasonnetExpression.java | 13 +++++++------
.../camel/language/datasonnet/DatasonnetLanguage.java | 7 ++++---
.../camel/language/datasonnet/CamelDatasonnetTest.java | 3 ++-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index 1c1db0b..2d75095 100644
---
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -18,6 +18,7 @@ package org.apache.camel.language.datasonnet;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.Charset;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -47,7 +48,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DatasonnetExpression extends ExpressionAdapter implements
ExpressionResultTypeAware {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DatasonnetExpression.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(DatasonnetExpression.class);
private String expression;
private Expression metaExpression;
@@ -111,7 +112,7 @@ public class DatasonnetExpression extends ExpressionAdapter
implements Expressio
return (T) result.getContent();
}
} catch (Exception e) {
- throw new RuntimeExpressionException("Unable to evaluate
DataSonnet expression : " + expression, e);
+ throw new RuntimeExpressionException("Unable to evaluate
DataSonnet expression: " + expression, e);
} finally {
CML.getInstance().getExchange().remove();
}
@@ -173,7 +174,7 @@ public class DatasonnetExpression extends ExpressionAdapter
implements Expressio
}
Map<String, String> answer = new HashMap<>();
- LOGGER.debug("Explicit library path is " + libraryPaths);
+ LOG.debug("Explicit library path is: {}", libraryPaths);
for (String nextPath : libraryPaths) {
final File nextLibDir = new File(nextPath);
if (nextLibDir.isDirectory()) {
@@ -183,16 +184,16 @@ public class DatasonnetExpression extends
ExpressionAdapter implements Expressio
public FileVisitResult visitFile(Path file,
BasicFileAttributes attrs) throws IOException {
File f = file.toFile();
if (!f.isDirectory() &&
f.getName().toLowerCase().endsWith(".libsonnet")) {
- String content =
IOUtils.toString(file.toUri());
+ String content =
IOUtils.toString(file.toUri(), Charset.defaultCharset());
Path relative =
nextLibDir.toPath().relativize(file);
- LOGGER.debug("Loading DataSonnet library: " +
relative);
+ LOG.debug("Loading DataSonnet library: {}",
relative);
answer.put(relative.toString(), content);
}
return FileVisitResult.CONTINUE;
}
});
} catch (IOException e) {
- LOGGER.error("Unable to load libraries from " + nextPath,
e);
+ LOG.warn("Unable to load DataSonnet library from: " +
nextPath, e);
}
}
}
diff --git
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetLanguage.java
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetLanguage.java
index c7053f3..ce2b943 100644
---
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetLanguage.java
+++
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetLanguage.java
@@ -40,19 +40,20 @@ import org.slf4j.LoggerFactory;
@Language("datasonnet")
public class DatasonnetLanguage extends LanguageSupport implements
PropertyConfigurer {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DatasonnetLanguage.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(DatasonnetLanguage.class);
private static final Map<String, String> CLASSPATH_IMPORTS = new
HashMap<>();
static {
- LOGGER.debug("One time classpath search...");
+ LOG.debug("One time classpath search...");
try (ScanResult scanResult = new
ClassGraph().whitelistPaths("/").scan()) {
scanResult.getResourcesWithExtension("libsonnet")
.forEachByteArray((resource, bytes) -> {
- LOGGER.debug("Loading DataSonnet library: " +
resource.getPath());
+ LOG.debug("Loading DataSonnet library: {}",
resource.getPath());
CLASSPATH_IMPORTS.put(resource.getPath(), new
String(bytes, StandardCharsets.UTF_8));
});
}
+ LOG.debug("One time classpath search done");
}
// Cache used to stores the Mappers
diff --git
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
index a4f2938..d6de0b0 100644
---
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
+++
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.language.datasonnet;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.TimeZone;
@@ -159,6 +160,6 @@ public class CamelDatasonnetTest extends
CamelSpringTestSupport {
private String loadResourceAsString(String name) throws Exception {
InputStream is = getClass().getClassLoader().getResourceAsStream(name);
- return IOUtils.toString(is);
+ return IOUtils.toString(is, Charset.defaultCharset());
}
}
