You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/05/23 08:40:33 UTC
(camel-spring-boot-examples) 02/03: Fixed compile
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
commit c1848a8d31a5ab4a86248ff46bb9670350f202a7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri May 23 10:37:35 2025 +0200
Fixed compile
---
.../example/springboot/cxf/otel/InputStreamConverterLoader.java | 8 +++++++-
.../camel/example/springboot/cxf/otel/IntegerConverterLoader.java | 8 +++++++-
.../org/apache/camel/example/springboot/cxf/otel/CamelRouter.java | 3 ++-
.../org/apache/camel/example/springboot/cxf/otel/CamelRouter.java | 3 ++-
.../org/apache/camel/example/springboot/cxf/otel/CamelRouter.java | 4 ++--
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverterLoader.java b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverterLoader.java
index daab67b..18d4953 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverterLoader.java
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/InputStreamConverterLoader.java
@@ -45,7 +45,13 @@ public final class InputStreamConverterLoader implements TypeConverterLoader, Ca
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, org.apache.camel.example.springboot.cxf.otel.RandomNumber.class, java.io.InputStream.class, false,
- (type, exchange, value) -> org.apache.camel.example.springboot.cxf.otel.InputStreamConverter.toRandomNumber((java.io.InputStream) value));
+ (type, exchange, value) -> {
+ Object answer = org.apache.camel.example.springboot.cxf.otel.InputStreamConverter.toRandomNumber((java.io.InputStream) value);
+ if (false && answer == null) {
+ answer = Void.class;
+ }
+ return answer;
+ });
}
private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) {
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/IntegerConverterLoader.java b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/IntegerConverterLoader.java
index fe86ec1..ef3463f 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/IntegerConverterLoader.java
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-common/src/generated/java/org/apache/camel/example/springboot/cxf/otel/IntegerConverterLoader.java
@@ -45,7 +45,13 @@ public final class IntegerConverterLoader implements TypeConverterLoader, CamelC
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, org.apache.camel.example.springboot.cxf.otel.RandomNumber.class, java.lang.Integer.class, false,
- (type, exchange, value) -> org.apache.camel.example.springboot.cxf.otel.IntegerConverter.toRandomNumber((java.lang.Integer) value));
+ (type, exchange, value) -> {
+ Object answer = org.apache.camel.example.springboot.cxf.otel.IntegerConverter.toRandomNumber((java.lang.Integer) value);
+ if (false && answer == null) {
+ answer = Void.class;
+ }
+ return answer;
+ });
}
private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) {
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
index c2aa567..ff469ed 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
@@ -20,6 +20,7 @@ import static org.apache.camel.example.springboot.cxf.otel.Constants.SERVICE_HEA
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.bean.BeanConstants;
import org.apache.camel.component.bean.validator.BeanValidationException;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.model.dataformat.JsonLibrary;
@@ -47,7 +48,7 @@ public class CamelRouter extends RouteBuilder {
"&providers=jaxrsProvider,openTelemetryProvider" +
"&loggingFeatureEnabled=true")
.to("log:camel-cxf-log?showAll=true")
- .setHeader(Exchange.BEAN_METHOD_NAME, simple("${header.operationName}"))
+ .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
.bean(EvenServiceImpl.class);
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
index d355dc0..ec4a153 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
@@ -20,6 +20,7 @@ import static org.apache.camel.example.springboot.cxf.otel.Constants.SERVICE_HEA
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.bean.BeanConstants;
import org.apache.camel.component.bean.validator.BeanValidationException;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.model.dataformat.JsonLibrary;
@@ -47,7 +48,7 @@ public class CamelRouter extends RouteBuilder {
"&providers=jaxrsProvider,openTelemetryProvider" +
"&loggingFeatureEnabled=true")
.to("log:camel-cxf-log?showAll=true")
- .setHeader(Exchange.BEAN_METHOD_NAME, simple("${header.operationName}"))
+ .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
.bean(OddServiceImpl.class);
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
index 9d7e9c4..fcb3b33 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/java/org/apache/camel/example/springboot/cxf/otel/CamelRouter.java
@@ -18,6 +18,7 @@ package org.apache.camel.example.springboot.cxf.otel;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.bean.BeanConstants;
import org.apache.camel.component.bean.validator.BeanValidationException;
import org.apache.camel.component.cxf.common.message.CxfConstants;
import org.apache.camel.component.minio.MinioConstants;
@@ -35,7 +36,6 @@ import jakarta.ws.rs.core.Response;
@Component
public class CamelRouter extends RouteBuilder {
-
@Override
public void configure() throws Exception {
//very raw way, just to handle the validation responses
@@ -51,7 +51,7 @@ public class CamelRouter extends RouteBuilder {
"&providers=jaxrsProvider,openTelemetryProvider" +
"&loggingFeatureEnabled=true")
.to("log:camel-cxf-log?showAll=true")
- .setHeader(Exchange.BEAN_METHOD_NAME, simple("${header.operationName}"))
+ .setHeader(BeanConstants.BEAN_METHOD_NAME, simple("${header.operationName}"))
.bean(RandomServiceImpl.class);