You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ji...@apache.org on 2025/05/14 06:46:50 UTC
(camel-quarkus) 24/26: Generated files and a bbetter fix of salesforce
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9bc87dc15dea601104462169eaea3dbce8c65ef7
Author: Jiri Ondrusek <on...@gmail.com>
AuthorDate: Wed May 7 13:04:10 2025 +0200
Generated files and a bbetter fix of salesforce
---
.../salesforce/graalvm/JettyJSONContextSubstitute.java | 17 ++++++++++++++---
pom.xml | 2 +-
poms/bom/src/main/generated/flattened-full-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
.../main/generated/flattened-reduced-verbose-pom.xml | 2 +-
5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/extensions/salesforce/runtime/src/main/java/org/apache/camel/quarkus/component/salesforce/graalvm/JettyJSONContextSubstitute.java b/extensions/salesforce/runtime/src/main/java/org/apache/camel/quarkus/component/salesforce/graalvm/JettyJSONContextSubstitute.java
index ab96906c6f..50a2c21836 100644
--- a/extensions/salesforce/runtime/src/main/java/org/apache/camel/quarkus/component/salesforce/graalvm/JettyJSONContextSubstitute.java
+++ b/extensions/salesforce/runtime/src/main/java/org/apache/camel/quarkus/component/salesforce/graalvm/JettyJSONContextSubstitute.java
@@ -16,9 +16,11 @@
*/
package org.apache.camel.quarkus.component.salesforce.graalvm;
+import java.lang.reflect.Field;
import java.text.ParseException;
import java.util.List;
+import com.oracle.svm.core.annotate.Alias;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;
import org.cometd.common.JettyJSONContext;
@@ -27,12 +29,21 @@ import org.eclipse.jetty.util.ajax.JSON;
@TargetClass(JettyJSONContext.class)
final class JettyJSONContextSubstitute {
+ @Alias
+ private List adapt(Object object) {
+ return null;
+ }
+
@Substitute
public List parse(String json) throws ParseException {
try {
- Object o = new JSON.StringSource(json);
- //method adapt is private, therefore it can not be used
- return List.of(o);
+ //the type of the field `_messagesParser` is `FieldJSON`, which is a private class.
+ // Therefore, I can not alias the field and it has to be gained reflectively
+ Field messagesParserField = JettyJSONContext.class.getDeclaredField("_messagesParser");
+ messagesParserField.setAccessible(true);
+ JSON messagesParser = (JSON) messagesParserField.get(this);
+ Object object = messagesParser.parse(new JSON.StringSource(json));
+ return adapt(object);
} catch (Exception x) {
throw (ParseException) new ParseException(json, -1).initCause(x);
}
diff --git a/pom.xml b/pom.xml
index 28b2c7f50d..63d1ea14c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -177,7 +177,7 @@
<threetenbp.version>1.7.0</threetenbp.version><!-- @sync com.google.cloud:google-cloud-pubsub:${google-cloud-pubsub.version} dep:org.threeten:threetenbp -->
<xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065-->
<xchange.version>${xchange-version}</xchange.version>
- <xmlgraphics-commons.version>2.10</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version -->
+ <xmlgraphics-commons.version>2.11</xmlgraphics-commons.version><!-- @sync org.apache.xmlgraphics:fop-parent:${fop-version} prop:xmlgraphics.commons.version -->
<web3j.version>${web3j-version}</web3j.version>
<web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version>
<zookeeper.version>${zookeeper-version}</zookeeper.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index a60bd63809..2d076f5f8f 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7411,7 +7411,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.11</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 03f1a699a5..d32b2cc8bc 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7356,7 +7356,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId>
<artifactId>xmlgraphics-commons</artifactId>
- <version>2.10</version>
+ <version>2.11</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
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 5bb63a351c..bfe2698955 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7356,7 +7356,7 @@
<dependency>
<groupId>org.apache.xmlgraphics</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>xmlgraphics-commons</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>2.11</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>commons-logging</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->