This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 1fa9a80 Custom TypeConverter is not automatically registered #2260
1fa9a80 is described below
commit 1fa9a80a268acb0c1e1cccc152ff9c40309edf18
Author: JiriOndrusek <[email protected]>
AuthorDate: Thu May 6 16:49:56 2021 +0200
Custom TypeConverter is not automatically registered #2260
---
.../quarkus/core/deployment/CamelProcessor.java | 35 ++++++++++++++++++----
.../apache/camel/quarkus/core/CamelRecorder.java | 6 ++++
.../camel/quarkus/core/FastTypeConverter.java | 4 +++
...va => StaticAnnotationTypeConverterLoader.java} | 32 ++++++++++----------
.../apache/camel/quarkus/core/CoreResource.java | 8 +++++
.../quarkus/core/converter/AnnotatedMyPair.java | 32 ++++++++++++++++++++
.../core/converter/AnnotatedMyPairConverter.java | 28 +++++++++++++++++
.../org/apache/camel/quarkus/core/CoreTest.java | 13 ++++++++
8 files changed, 136 insertions(+), 22 deletions(-)
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index e37c200..c535777 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -41,7 +41,9 @@ import io.quarkus.deployment.annotations.Record;
import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem;
import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.runtime.RuntimeValue;
+import org.apache.camel.Converter;
import org.apache.camel.impl.converter.BaseTypeConverterRegistry;
import org.apache.camel.quarkus.core.CamelConfig;
import org.apache.camel.quarkus.core.CamelConfigFlags;
@@ -67,6 +69,7 @@ import
org.apache.camel.quarkus.core.deployment.util.PathFilter;
import org.apache.camel.quarkus.support.common.CamelCapabilities;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.jboss.jandex.AnnotationTarget;
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.IndexView;
@@ -213,7 +216,11 @@ class CamelProcessor {
CamelTypeConverterRegistryBuildItem typeConverterRegistry(
CamelRecorder recorder,
ApplicationArchivesBuildItem applicationArchives,
- List<CamelTypeConverterLoaderBuildItem> additionalLoaders) {
+ List<CamelTypeConverterLoaderBuildItem> additionalLoaders,
+ CombinedIndexBuildItem combinedIndex,
+ BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) {
+
+ IndexView index = combinedIndex.getIndex();
RuntimeValue<TypeConverterRegistry> typeConverterRegistry =
recorder.createTypeConverterRegistry();
@@ -222,10 +229,6 @@ class CamelProcessor {
// would lead to have
org.apache.camel.impl.converter.AnnotationTypeConverterLoader taken into
// account even if it should not.
//
- // TODO: we could add a filter to discard
AnnotationTypeConverterLoader but maybe we should introduce
- // a marker interface like StaticTypeConverterLoader for loaders that
do not require to perform
- // any discovery at runtime; see
https://github.com/apache/camel-quarkus/issues/1896
- //
final ClassLoader TCCL =
Thread.currentThread().getContextClassLoader();
for (ApplicationArchive archive :
applicationArchives.getAllApplicationArchives()) {
@@ -248,6 +251,28 @@ class CamelProcessor {
}
}
+ Set<String> internalConverters = new HashSet<>();
+ //ignore all @converters from org.apache.camel:camel-* dependencies
+ for (ApplicationArchive archive :
applicationArchives.getAllApplicationArchives()) {
+ if (archive.getArtifactKey() != null &&
"org.apache.camel".equals(archive.getArtifactKey().getGroupId())
+ &&
archive.getArtifactKey().getArtifactId().startsWith("camel-")) {
+
internalConverters.addAll(archive.getIndex().getAnnotations(DotName.createSimple(Converter.class.getName()))
+ .stream().filter(a -> a.target().kind() ==
AnnotationTarget.Kind.CLASS)
+ .map(a -> a.target().asClass().name().toString())
+ .collect(Collectors.toSet()));
+ }
+ }
+
+ Set<Class> convertersClasses = index
+
.getAnnotations(DotName.createSimple(Converter.class.getName()))
+ .stream().filter(a -> a.target().kind() ==
AnnotationTarget.Kind.CLASS)
+ .map(a -> a.target().asClass().name().toString())
+ .filter(s -> !internalConverters.contains(s))
+ .map(s -> CamelSupport.loadClass(s, TCCL))
+ .collect(Collectors.toSet());
+
+ recorder.loadAnnotatedConverters(typeConverterRegistry,
convertersClasses);
+
//
// User can register loaders by providing a
CamelTypeConverterLoaderBuildItem that can be used to
// provide additional TypeConverter or override default converters
discovered by the previous step.
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index d4997d4..50c6b03 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.quarkus.core;
+import java.util.Set;
+
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.impl.engine.DefaultReactiveExecutor;
@@ -57,6 +59,10 @@ public class CamelRecorder {
}
}
+ public void loadAnnotatedConverters(RuntimeValue<TypeConverterRegistry>
registry, Set<Class> classes) {
+
StaticAnnotationTypeConverterLoader.getInstance().load(registry.getValue(),
classes);
+ }
+
public void bind(
RuntimeValue<Registry> runtime,
String name,
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 2df9239..f4587dc 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
@@ -41,4 +41,8 @@ public class FastTypeConverter extends DefaultTypeConverter {
}
}
+ @Override
+ public void scanTypeConverters() throws Exception {
+ //implemented in CamelProcessor without use of classpath discovery
(uses StaticAnnotationTypeConverterLoader)
+ }
}
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/StaticAnnotationTypeConverterLoader.java
similarity index 52%
copy from
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastTypeConverter.java
copy to
extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/StaticAnnotationTypeConverterLoader.java
index 2df9239..6e7fda9 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/StaticAnnotationTypeConverterLoader.java
@@ -16,29 +16,27 @@
*/
package org.apache.camel.quarkus.core;
-import org.apache.camel.impl.converter.DefaultTypeConverter;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Set;
-public class FastTypeConverter extends DefaultTypeConverter {
- private static final Logger LOG =
LoggerFactory.getLogger(FastTypeConverter.class);
+import org.apache.camel.impl.converter.AnnotationTypeConverterLoader;
+import org.apache.camel.spi.TypeConverterRegistry;
- public FastTypeConverter() {
- super(null, null, null, false);
+public class StaticAnnotationTypeConverterLoader extends
AnnotationTypeConverterLoader {
+
+ private static StaticAnnotationTypeConverterLoader INSTANCE = new
StaticAnnotationTypeConverterLoader();
+
+ public static StaticAnnotationTypeConverterLoader getInstance() {
+ return INSTANCE;
}
- @Override
- protected void doInit() throws Exception {
- super.doInit();
+ private StaticAnnotationTypeConverterLoader() {
+ //loader skips discovery, PackageScanClassResolver is not used
+ super(null);
}
- @Override
- public void loadCoreAndFastTypeConverters() throws Exception {
- for (TypeConverterLoader loader :
getCamelContext().getRegistry().findByType(TypeConverterLoader.class)) {
- LOG.debug("TypeConverterLoader: {} loading converters", loader);
- loader.load(this);
+ public void load(TypeConverterRegistry registry, Set<Class>
converterClasses) {
+ for (Class clazz : converterClasses) {
+ loadConverterMethods(registry, clazz);
}
}
-
}
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
index 5c4850b..fe0e6b6 100644
---
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CoreResource.java
@@ -29,6 +29,7 @@ import javax.inject.Inject;
import javax.json.Json;
import javax.json.JsonObject;
import javax.ws.rs.GET;
+import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -47,6 +48,7 @@ import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.component.log.LogComponent;
import org.apache.camel.impl.engine.DefaultHeadersMapFactory;
import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.quarkus.core.converter.AnnotatedMyPair;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.LRUCacheFactory;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
@@ -274,4 +276,10 @@ public class CoreResource {
return
context.adapt(ExtendedCamelContext.class).getStartupStepRecorder() instanceof
DefaultStartupStepRecorder;
}
+ @Path("/converter/annotatedMyPair")
+ @POST
+ @Produces(MediaType.APPLICATION_JSON)
+ public AnnotatedMyPair fromStringToAnnotatedMyPair(String input) {
+ return context.getTypeConverter().convertTo(AnnotatedMyPair.class,
input);
+ }
}
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPair.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPair.java
new file mode 100644
index 0000000..1d9daca
--- /dev/null
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPair.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.converter;
+
+public class AnnotatedMyPair {
+ public final String key;
+ public final String annotatedValue;
+
+ public AnnotatedMyPair(String key, String annotatedValue) {
+ this.key = key;
+ this.annotatedValue = annotatedValue;
+ }
+
+ public static AnnotatedMyPair fromString(String input) {
+ String[] items = input.split(":");
+ return new AnnotatedMyPair(items[0], items[1]);
+ }
+}
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPairConverter.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPairConverter.java
new file mode 100644
index 0000000..187ff91
--- /dev/null
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/converter/AnnotatedMyPairConverter.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.core.converter;
+
+import org.apache.camel.Converter;
+
+@Converter
+public class AnnotatedMyPairConverter {
+
+ @Converter
+ public static AnnotatedMyPair toMyPair(String s) {
+ return AnnotatedMyPair.fromString(s);
+ }
+}
diff --git
a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java
b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java
index 9b5a482..dbbb0cb 100644
---
a/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java
+++
b/integration-tests/core/src/test/java/org/apache/camel/quarkus/core/CoreTest.java
@@ -19,8 +19,11 @@ package org.apache.camel.quarkus.core;
import java.io.IOException;
import java.net.HttpURLConnection;
+import javax.ws.rs.core.MediaType;
+
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
import io.restassured.response.Response;
import org.apache.camel.support.DefaultLRUCacheFactory;
import org.junit.jupiter.api.Test;
@@ -129,4 +132,14 @@ public class CoreTest {
RestAssured.when().get("/test/startup-step-recorder").then().body(is("true"));
}
+ @Test
+ void testConverterFromAnnotation() {
+ RestAssured.given()
+ .contentType(ContentType.TEXT).body("a:b")
+ .accept(MediaType.APPLICATION_JSON)
+ .post("/test/converter/annotatedMyPair")
+ .then()
+ .statusCode(200)
+ .body("key", is("a"), "annotatedValue", is("b"));
+ }
}
