You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/10/30 12:00:01 UTC
[camel-karaf] branch master updated: Fixed build
This is an automated email from the ASF dual-hosted git repository.
acosentino 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 20be891 Fixed build
20be891 is described below
commit 20be89156ad2be3fdf82d41203c5163d2e3f3035
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 30 12:28:21 2020 +0100
Fixed build
---
.../java/org/apache/camel/core/osgi/OsgiTypeConverter.java | 10 +++++-----
.../camel/core/osgi/test/MockTypeConverterRegistry.java | 11 ++++++-----
2 files changed, 11 insertions(+), 10 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 29b5796..cc40a3e 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
@@ -41,6 +41,7 @@ import org.apache.camel.TypeConverters;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.converter.DefaultTypeConverter;
import org.apache.camel.impl.engine.DefaultPackageScanClassResolver;
+import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -194,11 +195,6 @@ public class OsgiTypeConverter extends ServiceSupport implements TypeConverter,
}
@Override
- public List<Class<?>[]> listAllTypeConvertersFromTo() {
- return getDelegate().listAllTypeConvertersFromTo();
- }
-
- @Override
public void setInjector(Injector injector) {
getDelegate().setInjector(injector);
}
@@ -335,4 +331,8 @@ 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 26c7c7f..b36f200 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
@@ -24,6 +24,7 @@ import org.apache.camel.LoggingLevel;
import org.apache.camel.TypeConverter;
import org.apache.camel.TypeConverterExists;
import org.apache.camel.TypeConverters;
+import org.apache.camel.spi.BulkTypeConverters;
import org.apache.camel.spi.Injector;
import org.apache.camel.spi.TypeConverterRegistry;
@@ -66,11 +67,6 @@ public class MockTypeConverterRegistry implements TypeConverterRegistry {
}
@Override
- public List<Class<?>[]> listAllTypeConvertersFromTo() {
- return null;
- }
-
- @Override
public void setInjector(Injector injector) {
// do nothing
}
@@ -137,5 +133,10 @@ public class MockTypeConverterRegistry implements TypeConverterRegistry {
public void stop() {
// noop
}
+
+ @Override
+ public void addBulkTypeConverters(BulkTypeConverters bulkTypeConverters) {
+ // noop
+ }
}