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 2020/10/30 12:41:18 UTC
[camel-karaf] branch master updated: CAMEL-15765: camel-core -
Optimize base converters
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 2f1c270 CAMEL-15765: camel-core - Optimize base converters
2f1c270 is described below
commit 2f1c270f23b1770de93a47a168c4b3616544fc21
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Oct 30 13:07:27 2020 +0100
CAMEL-15765: camel-core - Optimize base converters
---
.../apache/camel/core/osgi/OsgiTypeConverter.java | 39 ++++------------------
.../core/osgi/test/MockTypeConverterRegistry.java | 11 +++---
2 files changed, 13 insertions(+), 37 deletions(-)
diff --git a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
index cc40a3e..c0ebbf1 100644
--- a/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
+++ b/core/camel-core-osgi/src/main/java/org/apache/camel/core/osgi/OsgiTypeConverter.java
@@ -19,16 +19,8 @@ package org.apache.camel.core.osgi;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.Enumeration;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -169,6 +161,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
return getDelegate().tryConvertTo(type, value);
}
+
@Override
public void addTypeConverter(Class<?> toType, Class<?> fromType, TypeConverter typeConverter) {
getDelegate().addTypeConverter(toType, fromType, typeConverter);
@@ -180,6 +173,11 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
}
@Override
+ public void addBulkTypeConverters(BulkTypeConverters bulkTypeConverters) {
+ getDelegate().addBulkTypeConverters(bulkTypeConverters);
+ }
+
+ @Override
public boolean removeTypeConverter(Class<?> toType, Class<?> fromType) {
return getDelegate().removeTypeConverter(toType, fromType);
}
@@ -234,7 +232,7 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
getDelegate().setTypeConverterExists(typeConverterExists);
}
- public synchronized DefaultTypeConverter getDelegate() {
+ public DefaultTypeConverter getDelegate() {
if (delegate == null) {
delegate = createRegistry();
}
@@ -289,25 +287,6 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
return answer;
}
- public static <T> Stream<T> enumerationAsStream(Enumeration<T> e) {
- return StreamSupport.stream(
- Spliterators.spliteratorUnknownSize(
- new Iterator<T>() {
- public T next() {
- return e.nextElement();
- }
- public boolean hasNext() {
- return e.hasMoreElements();
- }
- public void forEachRemaining(Consumer<? super T> action) {
- while (e.hasMoreElements()) {
- action.accept(e.nextElement());
- }
- }
- },
- Spliterator.ORDERED), false);
- }
-
private class OsgiDefaultTypeConverter extends DefaultTypeConverter {
public OsgiDefaultTypeConverter(PackageScanClassResolver resolver, Injector injector, FactoryFinder factoryFinder, boolean loadTypeConverters) {
@@ -331,8 +310,4 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
}
}
- @Override
- public void addBulkTypeConverters(BulkTypeConverters bulkTypeConverters) {
- }
-
}
diff --git a/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java b/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
index b36f200..0703361 100644
--- a/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
+++ b/core/camel-core-osgi/src/test/java/org/apache/camel/core/osgi/test/MockTypeConverterRegistry.java
@@ -39,7 +39,12 @@ public class MockTypeConverterRegistry implements TypeConverterRegistry {
public List<TypeConverter> getFallbackTypeConverters() {
return fallbackTypeConverters;
}
-
+
+ @Override
+ public void addBulkTypeConverters(BulkTypeConverters bulkTypeConverters) {
+ typeConverters.add(bulkTypeConverters);
+ }
+
@Override
public void addTypeConverter(Class<?> toType, Class<?> fromType, TypeConverter typeConverter) {
typeConverters.add(typeConverter);
@@ -134,9 +139,5 @@ public class MockTypeConverterRegistry implements TypeConverterRegistry {
// noop
}
- @Override
- public void addBulkTypeConverters(BulkTypeConverters bulkTypeConverters) {
- // noop
- }
}