This is an automated email from the ASF dual-hosted git repository. gnodet pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit f22d8a1f87925257642c0245ae6a5727abf896d5 Author: Guillaume Nodet <[email protected]> AuthorDate: Tue Apr 7 10:54:12 2020 +0200 Another set of fixes --- .../org/apache/camel/quarkus/core/FastTypeConverter.java | 12 +++++------- .../org/apache/camel/quarkus/component/file/it/FileTest.java | 2 +- pom.xml | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java index 83ec56e..6492338 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java @@ -30,17 +30,15 @@ public class FastTypeConverter extends DefaultTypeConverter { @Override protected void doInit() throws Exception { - if (this.injector == null && this.camelContext != null) { - this.injector = this.camelContext.getInjector(); - } + super.doInit(); + } + + @Override + public void loadCoreAndFastTypeConverters() throws Exception { for (TypeConverterLoader loader : getCamelContext().getRegistry().findByType(TypeConverterLoader.class)) { LOG.debug("TypeConverterLoader: {} loading converters", loader); loader.load(this); } } - @Override - public void loadCoreAndFastTypeConverters() throws Exception { - throw new UnsupportedOperationException(); - } } diff --git a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java index ace21af..3546687 100644 --- a/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java +++ b/integration-tests/file/src/test/java/org/apache/camel/quarkus/component/file/it/FileTest.java @@ -61,7 +61,7 @@ class FileTest { @Test public void fileWatchCreateUpdate() throws IOException, InterruptedException { - final Path dir = Files.createTempDirectory(FileTest.class.getSimpleName()).toAbsolutePath().normalize(); + final Path dir = Files.createTempDirectory(FileTest.class.getSimpleName()).toRealPath(); RestAssured.given() .queryParam("path", dir.toString()) .get("/file-watch/get-events") diff --git a/pom.xml b/pom.xml index 2c1b03c..945bd9b 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ <retrofit.version>2.5.0</retrofit.version> <!-- Keep spring.version aligned with the version used by Camel --> <spring.version>5.2.3.RELEASE</spring.version> - <snakeyaml.version>1.25</snakeyaml.version> + <snakeyaml.version>1.26</snakeyaml.version> <xalan.version>2.7.2</xalan.version> <xerces.version>2.12.0</xerces.version> <xstream.version>1.4.11</xstream.version>
