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 2022/11/23 12:56:24 UTC
[camel] branch main updated: CAMEL-18707: upgrade to Jandex 3 (#8765)
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.git
The following commit(s) were added to refs/heads/main by this push:
new 16c546b1d08 CAMEL-18707: upgrade to Jandex 3 (#8765)
16c546b1d08 is described below
commit 16c546b1d08b5501bc3cf203adeeec1fc30b02bf
Author: klease <38...@users.noreply.github.com>
AuthorDate: Wed Nov 23 13:56:18 2022 +0100
CAMEL-18707: upgrade to Jandex 3 (#8765)
* CAMEL-18707: Upgrade to Jandex 3.0.3 (#8735)
Change maven group to io.smallrye.
Adapt to minor API changes in Jandex 3.
* CAMEL-18707: fix issue related to deserializer generation.
Update use of deprecated method in jandex API.
---
camel-dependencies/pom.xml | 2 +-
dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml | 2 +-
.../maven/dsl/yaml/GenerateYamlDeserializersMojo.java | 4 ++--
.../camel/maven/dsl/yaml/GenerateYamlSupportMojo.java | 12 ++++++------
parent/pom.xml | 2 +-
tooling/maven/camel-package-maven-plugin/pom.xml | 2 +-
.../maven/packaging/GenerateInvokeOnHeaderMojo.java | 2 +-
.../packaging/TypeConverterLoaderGeneratorMojo.java | 17 +++++++++--------
8 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index e124b97ce6a..2029ef5ba94 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -282,7 +282,7 @@
<jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
<jakarta-mail-version>1.6.7</jakarta-mail-version>
<jakarta.el-version>3.0.3</jakarta.el-version>
- <jandex-version>2.4.3.Final</jandex-version>
+ <jandex-version>3.0.3</jandex-version>
<jansi-version>2.4.0</jansi-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
<jasypt-version>1.9.3</jasypt-version>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 8adbef6aab1..765fd4a8009 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -118,7 +118,7 @@
</dependency>
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
<version>${jandex-version}</version>
</dependency>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
index a9ab21ad219..7540ff306f0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlDeserializersMojo.java
@@ -432,7 +432,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
break;
}
- if (ctor.parameters().size() == 1 && ctor.parameters().get(0).name().equals(STRING_CLASS)) {
+ if (ctor.parameterTypes().size() == 1 && ctor.parameterTypes().get(0).name().equals(STRING_CLASS)) {
if ((ctor.flags() & java.lang.reflect.Modifier.PUBLIC) == 0) {
break;
}
@@ -987,7 +987,7 @@ public class GenerateYamlDeserializersMojo extends GenerateYamlSupportMojo {
@SuppressWarnings("MethodLength")
private boolean generateSetValue(CodeBlock.Builder cb, MethodInfo method, Collection<AnnotationSpec> annotations) {
final String name = StringHelper.camelCaseToDash(method.name()).toLowerCase(Locale.US).substring(4);
- final Type parameterType = method.parameters().get(0);
+ final Type parameterType = method.parameterTypes().get(0);
//
// Others
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
index 89f626edbd8..dd26b56ff68 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/src/main/java/org/apache/camel/maven/dsl/yaml/GenerateYamlSupportMojo.java
@@ -186,7 +186,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
if (target == null) {
return false;
}
- return target.classAnnotation(annotationName) != null;
+ return target.declaredAnnotation(annotationName) != null;
}
protected static boolean hasAnnotation(FieldInfo target, DotName annotationName) {
@@ -207,7 +207,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
return false;
}
return annotationValue(
- target.classAnnotation(annotationName),
+ target.declaredAnnotation(annotationName),
name).isPresent();
}
@@ -222,7 +222,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
return Optional.empty();
}
return annotationValue(
- target.classAnnotation(annotationName),
+ target.declaredAnnotation(annotationName),
name);
}
@@ -352,7 +352,7 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
Map<String, ClassInfo> answer = new TreeMap<>();
for (ClassInfo ci : view.getAllKnownSubclasses(type)) {
- AnnotationInstance instance = ci.classAnnotation(XML_ROOT_ELEMENT_ANNOTATION_CLASS);
+ AnnotationInstance instance = ci.declaredAnnotation(XML_ROOT_ELEMENT_ANNOTATION_CLASS);
if (instance != null) {
AnnotationValue name = instance.value("name");
if (name != null) {
@@ -405,8 +405,8 @@ public abstract class GenerateYamlSupportMojo extends AbstractMojo {
annotated(XML_ROOT_ELEMENT_ANNOTATION_CLASS)
.forEach(
i -> {
- AnnotationInstance meta = i.classAnnotation(METADATA_ANNOTATION_CLASS);
- AnnotationInstance root = i.classAnnotation(XML_ROOT_ELEMENT_ANNOTATION_CLASS);
+ AnnotationInstance meta = i.declaredAnnotation(METADATA_ANNOTATION_CLASS);
+ AnnotationInstance root = i.declaredAnnotation(XML_ROOT_ELEMENT_ANNOTATION_CLASS);
if (meta == null || root == null) {
return;
diff --git a/parent/pom.xml b/parent/pom.xml
index ba92e8bbb9c..f8e7fba3daa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -258,7 +258,7 @@
<jackson2-module-scala-version>2.14.0</jackson2-module-scala-version>
<jackrabbit-version>2.21.13</jackrabbit-version>
<jasminb-jsonapi-version>0.11</jasminb-jsonapi-version>
- <jandex-version>2.4.3.Final</jandex-version>
+ <jandex-version>3.0.3</jandex-version>
<jansi-version>2.4.0</jansi-version>
<jasypt-version>1.9.3</jasypt-version>
<java-grok-version>0.1.9</java-grok-version>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index ffddf592056..3a47e8c4b89 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -126,7 +126,7 @@
<!-- jandex for annotation processing -->
<dependency>
- <groupId>org.jboss</groupId>
+ <groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
<version>${jandex-version}</version>
</dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java
index 2e87b04c612..e87432925f3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/GenerateInvokeOnHeaderMojo.java
@@ -141,7 +141,7 @@ public class GenerateInvokeOnHeaderMojo extends AbstractGeneratorMojo {
} else {
model.setReturnType(mi.returnType().toString());
}
- for (Type type : mi.parameters()) {
+ for (Type type : mi.parameterTypes()) {
String arg = type.name().toString();
model.addArgs(arg);
}
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index 7cc3e2f298c..0874f04fed3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -106,7 +106,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
classConverters.addFallbackTypeConverter(ee);
} else {
Type to = ee.returnType();
- Type from = ee.parameters().get(0);
+ Type from = ee.parameterTypes().get(0);
if (asBoolean(annotation, "generateBulkLoader")) {
bulkConverters.add(ee);
} else {
@@ -161,8 +161,8 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
Integer order2 = asInteger(o2.annotation(CONVERTER_ANNOTATION), "order");
sort = order1.compareTo(order2);
if (sort == 0) {
- String str1 = o1.parameters().stream().findFirst().map(Type::toString).orElse("");
- String str2 = o2.parameters().stream().findFirst().map(Type::toString).orElse("");
+ String str1 = o1.parameterTypes().stream().findFirst().map(Type::toString).orElse("");
+ String str2 = o2.parameterTypes().stream().findFirst().map(Type::toString).orElse("");
return str1.compareTo(str2);
}
}
@@ -295,7 +295,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
} else {
to = method.returnType().name().toString();
}
- String from = method.parameters().get(0).toString();
+ String from = method.parameterTypes().get(0).toString();
// clip generics
if (to.indexOf('<') != -1) {
to = to.substring(0, to.indexOf('<'));
@@ -518,7 +518,8 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
// the 2nd parameter is optional and can either be Exchange or CamelContext
String param = "";
String paramType
- = converter.parameters().size() == 2 ? converter.parameters().get(1).asClassType().name().toString() : null;
+ = converter.parameterTypes().size() == 2
+ ? converter.parameterTypes().get(1).asClassType().name().toString() : null;
if (paramType != null) {
if ("org.apache.camel.Exchange".equals(paramType)) {
param = ", exchange";
@@ -526,7 +527,7 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
param = ", camelContext";
}
}
- String type = toString(converter.parameters().get(0));
+ String type = toString(converter.parameterTypes().get(0));
String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
return pfx + "(" + cast + "value" + param + ")";
}
@@ -539,9 +540,9 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
converterClasses.add(converter.declaringClass().toString());
pfx = "get" + converter.declaringClass().simpleName() + "()." + converter.name();
}
- String type = toString(converter.parameters().get(converter.parameters().size() - 2));
+ String type = toString(converter.parameterTypes().get(converter.parameterTypes().size() - 2));
String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
- return pfx + "(type, " + (converter.parameters().size() == 4 ? "exchange, " : "") + cast + "value" + ", registry)";
+ return pfx + "(type, " + (converter.parameterTypes().size() == 4 ? "exchange, " : "") + cast + "value" + ", registry)";
}
private static boolean isFallbackCanPromote(MethodInfo element) {