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 2023/04/11 17:44:44 UTC
[camel-spring-boot] branch camel-spring-boot-3.x updated: Compile with Java 11 (#810)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-3.x by this push:
new afe27cc6494 Compile with Java 11 (#810)
afe27cc6494 is described below
commit afe27cc6494a798a9f7d19970d3b0b8c107938b1
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Apr 11 19:44:38 2023 +0200
Compile with Java 11 (#810)
---
.../starter/observation/ObservationRegistryConfigurer.java | 3 ++-
.../starter/tracing/OpenTelemetryAutoConfiguration.java | 9 +++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/observation/ObservationRegistryConfigurer.java b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/observation/ObservationRegistryConfigurer.java
index 134ffdc697b..0f1c8193056 100644
--- a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/observation/ObservationRegistryConfigurer.java
+++ b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/observation/ObservationRegistryConfigurer.java
@@ -17,6 +17,7 @@
package org.apache.camel.observation.starter.observation;
import java.util.List;
+import java.util.stream.Collectors;
import io.micrometer.observation.GlobalObservationConvention;
import io.micrometer.observation.ObservationFilter;
@@ -87,7 +88,7 @@ class ObservationRegistryConfigurer {
}
private <T> List<T> asOrderedList(ObjectProvider<T> provider) {
- return provider.orderedStream().toList();
+ return provider.orderedStream().collect(Collectors.toList());
}
}
diff --git a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/tracing/OpenTelemetryAutoConfiguration.java b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/tracing/OpenTelemetryAutoConfiguration.java
index 3bd68618961..bbae50fa023 100644
--- a/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/tracing/OpenTelemetryAutoConfiguration.java
+++ b/components-starter/camel-observation-starter/src/main/java/org/apache/camel/observation/starter/tracing/OpenTelemetryAutoConfiguration.java
@@ -18,6 +18,7 @@ package org.apache.camel.observation.starter.tracing;
import java.util.Collections;
import java.util.List;
+import java.util.stream.Collectors;
import io.micrometer.tracing.SpanCustomizer;
import io.micrometer.tracing.exporter.SpanExportingPredicate;
@@ -110,7 +111,7 @@ public class OpenTelemetryAutoConfiguration {
@Bean
@ConditionalOnMissingBean
ContextPropagators otelContextPropagators(ObjectProvider<TextMapPropagator> textMapPropagators) {
- return ContextPropagators.create(TextMapPropagator.composite(textMapPropagators.orderedStream().toList()));
+ return ContextPropagators.create(TextMapPropagator.composite(textMapPropagators.orderedStream().collect(Collectors.toList())));
}
@Bean
@@ -125,9 +126,9 @@ public class OpenTelemetryAutoConfiguration {
ObjectProvider<SpanExportingPredicate> spanExportingPredicates, ObjectProvider<SpanReporter> spanReporters,
ObjectProvider<SpanFilter> spanFilters) {
return BatchSpanProcessor
- .builder(new CompositeSpanExporter(spanExporters.orderedStream().toList(),
- spanExportingPredicates.orderedStream().toList(), spanReporters.orderedStream().toList(),
- spanFilters.orderedStream().toList()))
+ .builder(new CompositeSpanExporter(spanExporters.orderedStream().collect(Collectors.toList()),
+ spanExportingPredicates.orderedStream().collect(Collectors.toList()), spanReporters.orderedStream().collect(Collectors.toList()),
+ spanFilters.orderedStream().collect(Collectors.toList())))
.build();
}