(camel-quarkus) branch camel-main updated: Fixed twilio and langchain4j conflict

2024-07-08 Thread jiriondrusek 
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


The following commit(s) were added to refs/heads/camel-main by this push:
 new 8ce3614191 Fixed twilio and langchain4j conflict
8ce3614191 is described below

commit 8ce3614191e9c018d92e078d58fc6f7dc2b38200
Author: JiriOndrusek 
AuthorDate: Mon Jul 8 11:12:48 2024 +0200

Fixed twilio and langchain4j conflict
---
 .../component/twilio/it/TwilioResource.java|  5 -
 poms/bom/pom.xml   | 22 ++
 poms/bom/src/main/generated/flattened-full-pom.xml | 20 
 .../src/main/generated/flattened-reduced-pom.xml   | 20 
 .../generated/flattened-reduced-verbose-pom.xml| 20 
 5 files changed, 86 insertions(+), 1 deletion(-)

diff --git 
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
 
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
index c81d4054a8..4b38c2db23 100644
--- 
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
+++ 
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
@@ -22,6 +22,7 @@ import java.util.Optional;
 
 import com.twilio.constant.EnumConstants;
 import com.twilio.http.HttpClient;
+import com.twilio.http.IRequest;
 import com.twilio.http.NetworkHttpClient;
 import com.twilio.http.Request;
 import com.twilio.http.TwilioRestClient;
@@ -80,8 +81,10 @@ public class TwilioResource {
 Optional wireMockUrl = 
ConfigProvider.getConfig().getOptionalValue("wiremock.url", String.class);
 if (wireMockUrl.isPresent()) {
 HttpClient client = new NetworkHttpClient() {
+
 @Override
-public com.twilio.http.Response makeRequest(Request 
originalRequest) {
+public  com.twilio.http.Response 
makeRequest(T r) {
+Request originalRequest = (Request) r;
 String url = originalRequest.getUrl();
 
 Request modified = new Request(originalRequest.getMethod(),
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 5f7d920a52..4919376b8d 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1808,11 +1808,33 @@
 org.apache.camel
 camel-langchain4j-chat
 ${camel.version}
+
+
+
+langchain4j-core
+dev.langchain4j
+
+
+langchain4j
+dev.langchain4j
+
+
 
 
 org.apache.camel
 camel-langchain4j-core
 ${camel.version}
+
+
+
+langchain4j-core
+dev.langchain4j
+
+
+langchain4j
+dev.langchain4j
+
+
 
 
 org.apache.camel
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml 
b/poms/bom/src/main/generated/flattened-full-pom.xml
index de847b6692..4e64abb35b 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1745,11 +1745,31 @@
 org.apache.camel
 camel-langchain4j-chat
 4.7.0-SNAPSHOT
+
+  
+dev.langchain4j
+langchain4j-core
+  
+  
+dev.langchain4j
+langchain4j
+  
+
   
   
 org.apache.camel
 camel-langchain4j-core
 4.7.0-SNAPSHOT
+
+  
+dev.langchain4j
+langchain4j-core
+  
+  
+dev.langchain4j
+langchain4j
+  
+
   
   
 org.apache.camel
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml 
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 972c015568..58e1b37565 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1745,11 +1745,31 @@
 org.apache.camel
 camel-langchain4j-chat
 4.7.0-SNAPSHOT
+
+  
+dev.langchain4j
+langchain4j-core
+  
+  
+dev.langchain4j
+langchain4j
+  
+
   
   
 org.apache.camel
 camel-langchain4j-core
 4.7.0-SNAPSHOT
+
+  
+

(camel-quarkus) branch camel-main updated: Fixed twilio

2024-06-27 Thread jiriondrusek 
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


The following commit(s) were added to refs/heads/camel-main by this push:
 new cab0a50a5c Fixed twilio
cab0a50a5c is described below

commit cab0a50a5c79667e48988e815da805f68a24ff8a
Author: JiriOndrusek 
AuthorDate: Thu Jun 27 15:05:51 2024 +0200

Fixed twilio
---
 .../org/apache/camel/quarkus/component/twilio/it/TwilioResource.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
 
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
index a585ea261a..c81d4054a8 100644
--- 
a/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
+++ 
b/integration-tests/twilio/src/main/java/org/apache/camel/quarkus/component/twilio/it/TwilioResource.java
@@ -20,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import com.twilio.constant.EnumConstants;
 import com.twilio.http.HttpClient;
 import com.twilio.http.NetworkHttpClient;
 import com.twilio.http.Request;
@@ -85,6 +86,8 @@ public class TwilioResource {
 
 Request modified = new Request(originalRequest.getMethod(),
 url.replace("https://api.twilio.com;, 
wireMockUrl.get()));
+
modified.setContentType(EnumConstants.ContentType.FORM_URLENCODED);
+modified.setBody("");
 
 Map> headerParams = 
originalRequest.getHeaderParams();
 for (String key : headerParams.keySet()) {