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 d9334e75b71a982bad8d3c4008edba39d645c2cf
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Jun 28 08:55:36 2024 +0100
Miscellaneous tidy ups
---
.../deployment/AzureStorageQueueProcessor.java | 2 +-
.../xchange/deployment/XchangeProcessor.java | 5 +++--
integration-tests/dataformat/pom.xml | 2 +-
.../component/langchain/chat/it/OllamaRoute.java | 22 ----------------------
4 files changed, 5 insertions(+), 26 deletions(-)
diff --git
a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java
b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java
index 9f73e984fa..ca1214aeb5 100644
---
a/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java
+++
b/extensions/azure-storage-queue/deployment/src/main/java/org/apache/camel/quarkus/component/azure/storage/queue/deployment/AzureStorageQueueProcessor.java
@@ -57,7 +57,7 @@ class AzureStorageQueueProcessor {
|| n.startsWith("com.azure.storage.queue.models."))
.sorted()
.toArray(String[]::new);
-
reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().serialization().build());
+
reflectiveClasses.produce(ReflectiveClassBuildItem.builder(modelClasses).fields().build());
final String[] knownSerializableImpls = combinedIndex.getIndex()
.getAllKnownImplementors(XML_SERIALIZABLE_NAME)
diff --git
a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
index 6328d03b00..9c154e6a4f 100644
---
a/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
+++
b/extensions/xchange/deployment/src/main/java/org/apache/camel/quarkus/component/xchange/deployment/XchangeProcessor.java
@@ -110,12 +110,13 @@ class XchangeProcessor {
.toArray(String[]::new);
reflectiveClass.produce(ReflectiveClassBuildItem.builder(jaxrsAnnotations).methods().build());
- //constructors for converters
+ // reflective instantiation of xchange converters
String[] converterClasses =
index.getAllKnownSubclasses("com.fasterxml.jackson.databind.util.StdConverter")
.stream()
.map(classInfo -> classInfo.name().toString())
+ .filter(className -> className.startsWith("org.knowm.xchange"))
.toArray(String[]::new);
-
reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).methods().fields().build());
+
reflectiveClass.produce(ReflectiveClassBuildItem.builder(converterClasses).build());
}
@BuildStep
diff --git a/integration-tests/dataformat/pom.xml
b/integration-tests/dataformat/pom.xml
index bb1c87f5f7..7eed5cf0ef 100644
--- a/integration-tests/dataformat/pom.xml
+++ b/integration-tests/dataformat/pom.xml
@@ -67,7 +67,7 @@
<profiles>
- <profile>
+ <profile>
<id>native</id>
<activation>
<property>
diff --git
a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java
b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java
index 47d9c68c40..c87d2cffe8 100644
---
a/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java
+++
b/integration-tests/langchain4j-chat/src/main/java/org/apache/camel/quarkus/component/langchain/chat/it/OllamaRoute.java
@@ -16,22 +16,11 @@
*/
package org.apache.camel.quarkus.component.langchain.chat.it;
-import dev.langchain4j.model.chat.ChatLanguageModel;
-import io.quarkiverse.langchain4j.ollama.OllamaChatLanguageModel;
-import io.quarkiverse.langchain4j.ollama.Options;
import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Produces;
import org.apache.camel.builder.RouteBuilder;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
-
-import static java.time.Duration.ofSeconds;
@ApplicationScoped
public class OllamaRoute extends RouteBuilder {
-
- @ConfigProperty(name = "quarkus.langchain4j.ollama.base-url")
- private String ollamaUrl;
-
@Override
public void configure() throws Exception {
from("direct:send-simple-message?timeout=30000")
@@ -46,15 +35,4 @@ public class OllamaRoute extends RouteBuilder {
.to("langchain4j-chat:test3?chatOperation=CHAT_MULTIPLE_MESSAGES")
.to("mock:multipleMessageResponse");
}
-
- //model reflects the values in wire-mocked response
- @Produces
- public ChatLanguageModel produceModel() {
- return OllamaChatLanguageModel.builder()
-
.options(Options.builder().temperature(0.3).topK(40).topP(0.9).build())
- .model("orca-mini")
- .baseUrl(ollamaUrl)
- .timeout(ofSeconds(3000))
- .build();
- }
}
