You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2023/04/05 18:47:46 UTC
[camel-quarkus] branch camel-main updated (26df0463bd -> 8cc0824540)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a change to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from 26df0463bd Ref #4745: Add context plugins for the dry mode as expected
new 2f811a1cc5 Regen poms
new 8cc0824540 camel-java-joor-dsl - Ease the way to get all the compiled classes
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/joor/deployment/JavaJoorDslProcessor.java | 27 ++++----------
.../component/joor/deployment/JoorProcessor.java | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 15 --------
.../src/main/generated/flattened-reduced-pom.xml | 41 ----------------------
.../generated/flattened-reduced-verbose-pom.xml | 41 ----------------------
5 files changed, 7 insertions(+), 119 deletions(-)
[camel-quarkus] 01/02: Regen poms
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2f811a1cc5ef26dcec487ef440878b04b569fb34
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Apr 5 20:46:27 2023 +0200
Regen poms
---
poms/bom/src/main/generated/flattened-full-pom.xml | 15 --------
.../src/main/generated/flattened-reduced-pom.xml | 41 ----------------------
.../generated/flattened-reduced-verbose-pom.xml | 41 ----------------------
3 files changed, 97 deletions(-)
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index d421893e8e..7d5ee2e033 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6905,11 +6905,6 @@
<artifactId>cxf-rt-bindings-xml</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-databinding-aegis</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-databinding-jaxb</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6920,11 +6915,6 @@
<artifactId>cxf-rt-frontend-simple</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-javascript</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-management</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6965,11 +6955,6 @@
<artifactId>cxf-tools-common</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-tools-java2ws</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-tools-validator</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 7601307cc5..c033972a5d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6558,11 +6558,6 @@
<artifactId>cxf-rt-features-logging</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-features-metrics</artifactId>
- <version>4.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -6579,17 +6574,6 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-hc5</artifactId>
- <version>4.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
@@ -6600,11 +6584,6 @@
<artifactId>cxf-rt-ws-security</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-ws-rm</artifactId>
- <version>4.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
@@ -6855,11 +6834,6 @@
<artifactId>cxf-rt-bindings-xml</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-databinding-aegis</artifactId>
- <version>4.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
@@ -6870,16 +6844,6 @@
<artifactId>cxf-rt-frontend-simple</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-javascript</artifactId>
- <version>4.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-management</artifactId>
- <version>4.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-json-basic</artifactId>
@@ -6915,11 +6879,6 @@
<artifactId>cxf-tools-common</artifactId>
<version>4.0.0</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-java2ws</artifactId>
- <version>4.0.0</version>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-validator</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index 6f5db4d495..4088e369d3 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6558,11 +6558,6 @@
<artifactId>cxf-rt-features-logging</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-features-metrics</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-frontend-jaxws</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6579,17 +6574,6 @@
<artifactId>cxf-rt-transports-http</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-transports-http-hc5</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-ws-mex</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6600,11 +6584,6 @@
<artifactId>cxf-rt-ws-security</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-ws-rm</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-wsdl</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6855,11 +6834,6 @@
<artifactId>cxf-rt-bindings-xml</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-databinding-aegis</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-databinding-jaxb</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6870,16 +6844,6 @@
<artifactId>cxf-rt-frontend-simple</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-javascript</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-rt-management</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-rt-rs-json-basic</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
@@ -6915,11 +6879,6 @@
<artifactId>cxf-tools-common</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <artifactId>cxf-tools-java2ws</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- <version>4.0.0</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
- </dependency>
<dependency>
<groupId>org.apache.cxf</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
<artifactId>cxf-tools-validator</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:2.0.0.Alpha5 -->
[camel-quarkus] 02/02: camel-java-joor-dsl - Ease the way to get all the compiled classes
Posted by nf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8cc0824540997ac52bf28fd9884d5c13002ed55b
Author: Nicolas Filotto <nf...@talend.com>
AuthorDate: Wed Apr 5 20:47:27 2023 +0200
camel-java-joor-dsl - Ease the way to get all the compiled classes
---
.../java/joor/deployment/JavaJoorDslProcessor.java | 27 +++++-----------------
.../component/joor/deployment/JoorProcessor.java | 2 +-
2 files changed, 7 insertions(+), 22 deletions(-)
diff --git a/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java b/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java
index b149b67cbe..c009357f6c 100644
--- a/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java
+++ b/extensions/java-joor-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/java/joor/deployment/JavaJoorDslProcessor.java
@@ -97,29 +97,14 @@ public class JavaJoorDslProcessor {
.map(Objects::toString)
.collect(Collectors.joining(System.getProperty("path.separator")))));
for (String className : result.getClassNames()) {
+ registerForReflection(reflectiveClass, lambdaCapturingTypeProducer, result.getClass(className));
+ }
+ for (String className : result.getCompiledClassNames()) {
+ int index = className.indexOf("$");
+ String outerClassName = index == -1 ? className : className.substring(0, index);
generatedClass
- .produce(new JavaJoorGeneratedClassBuildItem(className, nameToResource.get(className).getLocation(),
+ .produce(new JavaJoorGeneratedClassBuildItem(className, nameToResource.get(outerClassName).getLocation(),
result.getByteCode(className)));
- Class<?> aClass = result.getClass(className);
- // Inner classes
- for (Class<?> clazz : aClass.getDeclaredClasses()) {
- String name = clazz.getName();
- generatedClass
- .produce(new JavaJoorGeneratedClassBuildItem(name, nameToResource.get(className).getLocation(),
- result.getByteCode(name)));
- }
- // Anonymous classes
- for (int i = 1;; i++) {
- String name = String.format("%s$%d", className, i);
- byte[] content = result.getByteCode(name);
- if (content == null) {
- break;
- }
- generatedClass
- .produce(new JavaJoorGeneratedClassBuildItem(name, nameToResource.get(className).getLocation(),
- content));
- }
- registerForReflection(reflectiveClass, lambdaCapturingTypeProducer, aClass);
}
}
diff --git a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
index cb8c10df23..49a3e9c674 100644
--- a/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
+++ b/extensions/joor/deployment/src/main/java/org/apache/camel/quarkus/component/joor/deployment/JoorProcessor.java
@@ -144,7 +144,7 @@ class JoorProcessor {
.flatMap(PathCollection::stream)
.map(Objects::toString)
.collect(Collectors.joining(System.getProperty("path.separator")))));
- for (String className : compilationResult.getClassNames()) {
+ for (String className : compilationResult.getCompiledClassNames()) {
generatedClass
.produce(
new GeneratedClassBuildItem(true, className, compilationResult.getByteCode(className)));