This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 318a4b8c5753dfd591ab9670f2c787ddb671e354
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Mon Sep 27 09:32:03 2021 +0100
Adapt to latest Camel API changes
---
.../ROOT/pages/reference/extensions/bean.adoc | 2 +-
.../ROOT/pages/reference/extensions/groovy.adoc | 4 +--
.../ROOT/pages/reference/extensions/jsonpath.adoc | 6 ++--
.../ROOT/pages/reference/extensions/ognl.adoc | 4 +--
.../ROOT/pages/reference/extensions/ribbon.adoc | 6 ++--
.../ROOT/pages/reference/extensions/xml-jaxp.adoc | 4 +--
.../ROOT/pages/reference/extensions/xpath.adoc | 4 +--
.../partials/reference/components/hwcloud-dms.adoc | 1 +
.../components/hwcloud-imagerecognition.adoc | 1 +
.../partials/reference/components/hwcloud-obs.adoc | 1 +
.../ROOT/partials/reference/languages/bean.adoc | 4 +--
.../ROOT/partials/reference/languages/csimple.adoc | 2 +-
.../reference/languages/exchangeProperty.adoc | 2 +-
.../ROOT/partials/reference/languages/file.adoc | 2 +-
.../ROOT/partials/reference/languages/groovy.adoc | 2 +-
.../ROOT/partials/reference/languages/header.adoc | 2 +-
.../partials/reference/languages/hl7terser.adoc | 2 +-
.../ROOT/partials/reference/languages/joor.adoc | 2 +-
.../partials/reference/languages/jsonpath.adoc | 4 +--
.../ROOT/partials/reference/languages/mvel.adoc | 2 +-
.../ROOT/partials/reference/languages/ognl.adoc | 2 +-
.../ROOT/partials/reference/languages/ref.adoc | 2 +-
.../ROOT/partials/reference/languages/simple.adoc | 2 +-
.../ROOT/partials/reference/languages/xpath.adoc | 2 +-
.../ROOT/partials/reference/languages/xquery.adoc | 2 +-
.../partials/reference/languages/xtokenize.adoc | 2 +-
.../ROOT/partials/reference/others/ribbon.adoc | 2 +-
.../aws2/ddb/it/Aws2DdbStreamResource.java | 11 -------
.../component/aws2/ddb/it/Aws2DdbStreamRoutes.java | 2 +-
.../aws2/ddb/it/TestSequenceNumberProvider.java | 38 ----------------------
.../component/aws2/ddb/it/Aws2DdbStreamTest.java | 24 ++++----------
.../component/salesforce/generated/Account.java | 20 ------------
.../salesforce/generated/QueryRecordsAccount.java | 2 --
33 files changed, 44 insertions(+), 124 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/bean.adoc
b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
index fdfc5f7..eac977b 100644
--- a/docs/modules/ROOT/pages/reference/extensions/bean.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/bean.adoc
@@ -20,7 +20,7 @@ Invoke methods of Java beans
== What's inside
* xref:{cq-camel-components}::bean-component.adoc[Bean component], URI syntax:
`bean:beanName`
-* xref:{cq-camel-components}:languages:bean-language.adoc[Bean method language]
+* xref:{cq-camel-components}:languages:bean-language.adoc[Bean Method language]
* xref:{cq-camel-components}::class-component.adoc[Class component], URI
syntax: `class:beanName`
Please refer to the above links for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
index f07540d..10f9047 100644
--- a/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/groovy.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate a Groovy script.
+:cq-description: Evaluates a Groovy script.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate a Groovy script.
+Evaluates a Groovy script.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
index c1bf632..c71caf8 100644
--- a/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/jsonpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate a JsonPath expression against a JSON message body.
+:cq-description: Evaluates a JSONPath expression against a JSON message body.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,11 +15,11 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Evaluate a JsonPath expression against a JSON message body.
+Evaluates a JSONPath expression against a JSON message body.
== What's inside
-* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JsonPath
language]
+* xref:{cq-camel-components}:languages:jsonpath-language.adoc[JSONPath
language]
Please refer to the above link for usage and configuration details.
diff --git a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
index fa12a79..ea19278 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ognl.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: false
:cq-status: Preview
:cq-status-deprecation: Preview
-:cq-description: Evaluate an Apache Commons Object Graph Navigation Library
(OGNL) expression against the Camel Exchange.
+:cq-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: n/a
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
-Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression
against the Camel Exchange.
+Evaluates an OGNL expression (Apache Commons OGNL).
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
index 2ec28b0..0521300 100644
--- a/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/ribbon.adoc
@@ -5,14 +5,14 @@
:cq-artifact-id: camel-quarkus-ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-status-deprecation: Preview
+:cq-status-deprecation: Preview Deprecated
:cq-description: Using Netflix Ribbon for client side load balancing
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
[.badges]
-[.badge-key]##JVM since##[.badge-supported]##1.2.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+[.badge-key]##JVM since##[.badge-supported]##1.2.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
[.badge-key]##⚠️##[.badge-unsupported]##Deprecated##
Using Netflix Ribbon for client side load balancing
diff --git a/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
b/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
index abbd9ea..1414dd6 100644
--- a/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/xml-jaxp.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Tokenize XML payloads using the specified path expression.
+:cq-description: Tokenize XML payloads.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Tokenize XML payloads using the specified path expression.
+Tokenize XML payloads.
== What's inside
diff --git a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
index 404da3e..bf8011e 100644
--- a/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/xpath.adoc
@@ -7,7 +7,7 @@
:cq-native-supported: true
:cq-status: Stable
:cq-status-deprecation: Stable
-:cq-description: Evaluate an XPath expression against an XML payload.
+:cq-description: Evaluates an XPath expression against an XML payload.
:cq-deprecated: false
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
@@ -15,7 +15,7 @@
[.badges]
[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native
since##[.badge-supported]##1.0.0##
-Evaluate an XPath expression against an XML payload.
+Evaluates an XPath expression against an XML payload.
== What's inside
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-dms.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git
a/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++
b/docs/modules/ROOT/partials/reference/components/hwcloud-imagerecognition.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
new file mode 100644
index 0000000..a509c1d
--- /dev/null
+++ b/docs/modules/ROOT/partials/reference/components/hwcloud-obs.adoc
@@ -0,0 +1 @@
+// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid
warnings when this file is included from a Camel page
diff --git a/docs/modules/ROOT/partials/reference/languages/bean.adoc
b/docs/modules/ROOT/partials/reference/languages/bean.adoc
index 932cf92..6b11621 100644
--- a/docs/modules/ROOT/partials/reference/languages/bean.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/bean.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 0.1.0
:cq-native-since: 0.1.0
:cq-camel-part-name: bean
-:cq-camel-part-title: Bean method
-:cq-camel-part-description: Call a method of the specified Java bean passing
the Exchange, Body or specific headers to it.
+:cq-camel-part-title: Bean Method
+:cq-camel-part-description: Calls a Java bean method.
:cq-extension-page-title: Bean
diff --git a/docs/modules/ROOT/partials/reference/languages/csimple.adoc
b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
index 877eeba..9d30386 100644
--- a/docs/modules/ROOT/partials/reference/languages/csimple.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/csimple.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.5.0
:cq-camel-part-name: csimple
:cq-camel-part-title: CSimple
-:cq-camel-part-description: Evaluate a compile simple expression language.
+:cq-camel-part-description: Evaluate a compiled simple expression.
:cq-extension-page-title: CSimple
diff --git
a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
index 9533c59..8c58e71 100644
--- a/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/exchangeProperty.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: exchangeProperty
:cq-camel-part-title: ExchangeProperty
-:cq-camel-part-description: Get values of named Camel Exchange properties.
+:cq-camel-part-description: Gets a property from the Exchange.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/file.adoc
b/docs/modules/ROOT/partials/reference/languages/file.adoc
index 4f56872..8cc63c3 100644
--- a/docs/modules/ROOT/partials/reference/languages/file.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/file.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: file
:cq-camel-part-title: File
-:cq-camel-part-description: File related capabilities for the Simle language
+:cq-camel-part-description: File related capabilities for the Simple language
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/groovy.adoc
b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
index 84435f8..e86f87b 100644
--- a/docs/modules/ROOT/partials/reference/languages/groovy.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/groovy.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: groovy
:cq-camel-part-title: Groovy
-:cq-camel-part-description: Evaluate a Groovy script.
+:cq-camel-part-description: Evaluates a Groovy script.
:cq-extension-page-title: Groovy
diff --git a/docs/modules/ROOT/partials/reference/languages/header.adoc
b/docs/modules/ROOT/partials/reference/languages/header.adoc
index 5611593..645fce6 100644
--- a/docs/modules/ROOT/partials/reference/languages/header.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/header.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: header
:cq-camel-part-title: Header
-:cq-camel-part-description: Get values of Camel Message headers.
+:cq-camel-part-description: Gets a header from the Exchange.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
index 4d05135..e0a7236 100644
--- a/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/hl7terser.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.8.0
:cq-camel-part-name: hl7terser
:cq-camel-part-title: HL7 Terser
-:cq-camel-part-description: Get the value of an HL7 message field specified by
terse location specification syntax.
+:cq-camel-part-description: Get the value of a HL7 message field specified by
terse location specification syntax.
:cq-extension-page-title: HL7
diff --git a/docs/modules/ROOT/partials/reference/languages/joor.adoc
b/docs/modules/ROOT/partials/reference/languages/joor.adoc
index bb5888c..f382099 100644
--- a/docs/modules/ROOT/partials/reference/languages/joor.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/joor.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: joor
:cq-camel-part-title: jOOR
-:cq-camel-part-description: Evaluate a jOOR (Java compiled once at runtime)
expression language.
+:cq-camel-part-description: Evaluates a jOOR (Java compiled once at runtime)
expression.
:cq-extension-page-title: jOOR
diff --git a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
index ea924fd..1734b0e 100644
--- a/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/jsonpath.adoc
@@ -8,6 +8,6 @@
:cq-jvm-since: 1.0.0
:cq-native-since: 1.0.0
:cq-camel-part-name: jsonpath
-:cq-camel-part-title: JsonPath
-:cq-camel-part-description: Evaluate a JsonPath expression against a JSON
message body.
+:cq-camel-part-title: JSONPath
+:cq-camel-part-description: Evaluates a JSONPath expression against a JSON
message body.
:cq-extension-page-title: JSON Path
diff --git a/docs/modules/ROOT/partials/reference/languages/mvel.adoc
b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
index 362199e..d247ab1 100644
--- a/docs/modules/ROOT/partials/reference/languages/mvel.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/mvel.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: mvel
:cq-camel-part-title: MVEL
-:cq-camel-part-description: Evaluate an MVEL template against the Camel
Exchange.
+:cq-camel-part-description: Evaluates a MVEL template.
:cq-extension-page-title: MVEL
diff --git a/docs/modules/ROOT/partials/reference/languages/ognl.adoc
b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
index 10da17a..57229a2 100644
--- a/docs/modules/ROOT/partials/reference/languages/ognl.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/ognl.adoc
@@ -9,5 +9,5 @@
:cq-native-since: n/a
:cq-camel-part-name: ognl
:cq-camel-part-title: OGNL
-:cq-camel-part-description: Evaluate an Apache Commons Object Graph Navigation
Library (OGNL) expression against the Camel Exchange.
+:cq-camel-part-description: Evaluates an OGNL expression (Apache Commons OGNL).
:cq-extension-page-title: OGNL
diff --git a/docs/modules/ROOT/partials/reference/languages/ref.adoc
b/docs/modules/ROOT/partials/reference/languages/ref.adoc
index d5b5f68..3f5199d 100644
--- a/docs/modules/ROOT/partials/reference/languages/ref.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/ref.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: ref
:cq-camel-part-title: Ref
-:cq-camel-part-description: Look up an expression in the Camel Registry and
evaluate it.
+:cq-camel-part-description: Uses an existing expression from the registry.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/simple.adoc
b/docs/modules/ROOT/partials/reference/languages/simple.adoc
index ab04ad9..2741286 100644
--- a/docs/modules/ROOT/partials/reference/languages/simple.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/simple.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 0.0.1
:cq-camel-part-name: simple
:cq-camel-part-title: Simple
-:cq-camel-part-description: Evaluate Camel's built-in Simple language
expression against the Camel Exchange.
+:cq-camel-part-description: Evaluates a Camel simple expression.
:cq-extension-page-title: Core
diff --git a/docs/modules/ROOT/partials/reference/languages/xpath.adoc
b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
index 58c3099..cdebabb 100644
--- a/docs/modules/ROOT/partials/reference/languages/xpath.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xpath.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: xpath
:cq-camel-part-title: XPath
-:cq-camel-part-description: Evaluate an XPath expression against an XML
payload.
+:cq-camel-part-description: Evaluates an XPath expression against an XML
payload.
:cq-extension-page-title: XPath
diff --git a/docs/modules/ROOT/partials/reference/languages/xquery.adoc
b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
index b609bca..9bc6e85 100644
--- a/docs/modules/ROOT/partials/reference/languages/xquery.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xquery.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 2.0.0
:cq-camel-part-name: xquery
:cq-camel-part-title: XQuery
-:cq-camel-part-description: Evaluate an XQuery expressions against an XML
payload.
+:cq-camel-part-description: Evaluates an XQuery expressions against an XML
payload.
:cq-extension-page-title: XQuery
diff --git a/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
b/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
index 61bd841..a17a493 100644
--- a/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
+++ b/docs/modules/ROOT/partials/reference/languages/xtokenize.adoc
@@ -9,5 +9,5 @@
:cq-native-since: 1.0.0
:cq-camel-part-name: xtokenize
:cq-camel-part-title: XML Tokenize
-:cq-camel-part-description: Tokenize XML payloads using the specified path
expression.
+:cq-camel-part-description: Tokenize XML payloads.
:cq-extension-page-title: XML JAXP
diff --git a/docs/modules/ROOT/partials/reference/others/ribbon.adoc
b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
index af55164..1e77b26 100644
--- a/docs/modules/ROOT/partials/reference/others/ribbon.adoc
+++ b/docs/modules/ROOT/partials/reference/others/ribbon.adoc
@@ -4,7 +4,7 @@
:cq-artifact-id-base: ribbon
:cq-native-supported: false
:cq-status: Preview
-:cq-deprecated: false
+:cq-deprecated: true
:cq-jvm-since: 1.2.0
:cq-native-since: n/a
:cq-camel-part-name: ribbon
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
index 27d890b..7a113e3 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamResource.java
@@ -23,7 +23,6 @@ import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
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;
@@ -39,10 +38,6 @@ public class Aws2DdbStreamResource {
CamelContext camelContext;
@Inject
- @Named("aws2DdbStreamSequenceNumberProvider")
- TestSequenceNumberProvider sequenceNumberProvider;
-
- @Inject
@Named("aws2DdbStreamReceivedEvents")
List<Map<String, String>> aws2DdbStreamReceivedEvents;
@@ -59,12 +54,6 @@ public class Aws2DdbStreamResource {
aws2DdbStreamReceivedEvents.clear();
}
- @Path("/setSequenceNumber")
- @POST
- public void setSequenceNumber(String newSn) {
- sequenceNumberProvider.setLastSequenceNumber(newSn);
- }
-
@GET
@Path("/route/{routeId}/{operation}")
@Produces(MediaType.TEXT_PLAIN)
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
index b7671d8..8d73b81 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamRoutes.java
@@ -44,7 +44,7 @@ public class Aws2DdbStreamRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
from("aws2-ddbstream://" + streamTableName
- +
"?sequenceNumberProvider=#aws2DdbStreamSequenceNumberProvider&iteratorType=AT_SEQUENCE_NUMBER")
+ + "?streamIteratorType=FROM_LATEST")
.id("aws2DdbStreamRoute")
.process(e -> {
Record record =
e.getMessage().getBody(Record.class);
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
b/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
deleted file mode 100644
index e276715..0000000
---
a/integration-test-groups/aws2/aws2-ddb/src/main/java/org/apache/camel/quarkus/component/aws2/ddb/it/TestSequenceNumberProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.component.aws2.ddb.it;
-
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Named;
-
-import org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider;
-
-@ApplicationScoped
-@Named("aws2DdbStreamSequenceNumberProvider")
-public class TestSequenceNumberProvider implements SequenceNumberProvider {
-
- private String lastSn = "0";
-
- @Override
- public String getSequenceNumber() {
- return lastSn;
- }
-
- public void setLastSequenceNumber(String newSn) {
- lastSn = newSn;
- }
-}
diff --git
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
index de0b7ab..26b3f29 100644
---
a/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
+++
b/integration-test-groups/aws2/aws2-ddb/src/test/java/org/apache/camel/quarkus/component/aws2/ddb/it/Aws2DdbStreamTest.java
@@ -116,8 +116,6 @@ class Aws2DdbStreamTest {
&& put2SeqNumber.length() > 0);
- /* SequenceNumber */
-
RestAssured.given()
.get("/aws2-ddbstream/clear")
.then()
@@ -127,12 +125,6 @@ class Aws2DdbStreamTest {
routeController("stop", null);
routeController("status", ServiceStatus.Stopped.name());
- RestAssured.given()
- .body(put2SeqNumber.toString())
- .post("/aws2-ddbstream/setSequenceNumber")
- .then()
- .statusCode(204);
-
routeController("start", null);
routeController("status", ServiceStatus.Started.name());
waitForStreamConsumerToStart();
@@ -153,7 +145,7 @@ class Aws2DdbStreamTest {
.then()
.statusCode(204);
- /* There should be only key2 and key3, because route is started with
parameter "AT_SEQUENCE_NUMBER" of put #2. */
+ /* There should be put & update events for key 3 */
Awaitility.await().pollInterval(1, TimeUnit.SECONDS).atMost(120,
TimeUnit.SECONDS).until(
() -> {
ExtractableResponse<Response> result =
RestAssured.get("/aws2-ddbstream/change")
@@ -167,20 +159,16 @@ class Aws2DdbStreamTest {
retVal = retVal.stream().filter(m ->
!String.valueOf(m.get("key")).startsWith("initKey"))
.collect(Collectors.toList());
- LOG.info("Expecting 3 events, got " + result.statusCode()
+ ": " + retVal);
+ LOG.info("Expecting 2 events, got " + result.statusCode()
+ ": " + retVal);
return retVal;
},
- list -> list.size() == 3
-
- && key2.equals(list.get(0).get("key"))
- && msg2.equals(list.get(0).get("new"))
+ list -> list.size() == 2
+ && key3.equals(list.get(0).get("key"))
+ && msg3.equals(list.get(0).get("new"))
&& key3.equals(list.get(1).get("key"))
- && msg3.equals(list.get(1).get("new"))
-
- && key3.equals(list.get(2).get("key"))
- && msg3.equals(list.get(2).get("old")));
+ && msg3.equals(list.get(1).get("old")));
}
private void waitForStreamConsumerToStart() {
diff --git
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
index d4785ca..479b2c5 100644
---
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
+++
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/Account.java
@@ -24,12 +24,8 @@ import javax.annotation.Generated;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.thoughtworks.xstream.annotations.XStreamAlias;
-import com.thoughtworks.xstream.annotations.XStreamConverter;
-import org.apache.camel.component.salesforce.api.MultiSelectPicklistConverter;
import
org.apache.camel.component.salesforce.api.MultiSelectPicklistDeserializer;
import org.apache.camel.component.salesforce.api.MultiSelectPicklistSerializer;
-import org.apache.camel.component.salesforce.api.PicklistEnumConverter;
import
org.apache.camel.component.salesforce.api.dto.AbstractDescribedSObjectBase;
import org.apache.camel.component.salesforce.api.dto.SObjectDescription;
import org.apache.camel.component.salesforce.api.dto.SObjectDescriptionUrls;
@@ -39,7 +35,6 @@ import
org.apache.camel.component.salesforce.api.dto.SObjectField;
* Salesforce DTO for SObject Account
*/
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
-@XStreamAlias("Account")
public class Account extends AbstractDescribedSObjectBase {
public Account() {
@@ -60,7 +55,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecordId = MasterRecordId;
}
- @XStreamAlias("MasterRecord")
private Account MasterRecord;
@JsonProperty("MasterRecord")
@@ -73,7 +67,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.MasterRecord = MasterRecord;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_TypeEnum Type;
@JsonProperty("Type")
@@ -98,7 +91,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ParentId = ParentId;
}
- @XStreamAlias("Parent")
private Account Parent;
@JsonProperty("Parent")
@@ -195,7 +187,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.BillingLongitude = BillingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_BillingGeocodeAccuracyEnum BillingGeocodeAccuracy;
@JsonProperty("BillingGeocodeAccuracy")
@@ -304,7 +295,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.ShippingLongitude = ShippingLongitude;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ShippingGeocodeAccuracyEnum ShippingGeocodeAccuracy;
@JsonProperty("ShippingGeocodeAccuracy")
@@ -401,7 +391,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Sic = Sic;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_IndustryEnum Industry;
@JsonProperty("Industry")
@@ -438,7 +427,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberOfEmployees = NumberOfEmployees;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_OwnershipEnum Ownership;
@JsonProperty("Ownership")
@@ -475,7 +463,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.Description = Description;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_RatingEnum Rating;
@JsonProperty("Rating")
@@ -524,7 +511,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.JigsawCompanyId = JigsawCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CleanStatusEnum CleanStatus;
@JsonProperty("CleanStatus")
@@ -537,7 +523,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CleanStatus = CleanStatus;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_AccountSourceEnum AccountSource;
@JsonProperty("AccountSource")
@@ -634,7 +619,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.DandbCompanyId = DandbCompanyId;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_CustomerPriorityEnum CustomerPriority__c;
@JsonProperty("CustomerPriority__c")
@@ -647,7 +631,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.CustomerPriority__c = CustomerPriority__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_SLAEnum SLA__c;
@JsonProperty("SLA__c")
@@ -660,7 +643,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLA__c = SLA__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_ActiveEnum Active__c;
@JsonProperty("Active__c")
@@ -685,7 +667,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.NumberofLocations__c = NumberofLocations__c;
}
- @XStreamConverter(PicklistEnumConverter.class)
private Account_UpsellOpportunityEnum UpsellOpportunity__c;
@JsonProperty("UpsellOpportunity__c")
@@ -722,7 +703,6 @@ public class Account extends AbstractDescribedSObjectBase {
this.SLAExpirationDate__c = SLAExpirationDate__c;
}
- @XStreamConverter(MultiSelectPicklistConverter.class)
private Account_MyMultiselectEnum[] MyMultiselect__c;
@JsonProperty("MyMultiselect__c")
diff --git
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
index 78cab0f..569227e 100644
---
a/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
+++
b/integration-tests/salesforce/src/main/java/org/apache/camel/quarkus/component/salesforce/generated/QueryRecordsAccount.java
@@ -20,7 +20,6 @@ import java.util.List;
import javax.annotation.Generated;
-import com.thoughtworks.xstream.annotations.XStreamImplicit;
import org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
/**
@@ -29,7 +28,6 @@ import
org.apache.camel.component.salesforce.api.dto.AbstractQueryRecordsBase;
@Generated("org.apache.camel.maven.CamelSalesforceMojo")
public class QueryRecordsAccount extends AbstractQueryRecordsBase {
- @XStreamImplicit
private List<Account> records;
public List<Account> getRecords() {
