This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 15da541a23c307e38b8bfa061d84da863986e8ab
Author: Peter Palaga <ppal...@redhat.com>
AuthorDate: Thu Feb 13 16:10:05 2020 +0100
Upgarde to Camel 3.1.0 - WIP (simplified RuntimeCamelCatalog)
---
.../src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java | 4 ++--
.../java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java | 7 ++-----
.../main/java/org/apache/camel/quarkus/core/FastCamelContext.java | 2 +-
.../src/main/java/org/apache/camel/quarkus/core/CamelServlet.java | 4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index e37ca47..35e5688 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
@@ -20,12 +20,12 @@ import io.quarkus.arc.runtime.BeanContainer;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
import org.apache.camel.CamelContext;
+import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.model.ValidateDefinition;
import org.apache.camel.model.validator.PredicateValidatorDefinition;
import org.apache.camel.quarkus.core.FastFactoryFinderResolver.Builder;
import org.apache.camel.reifier.ProcessorReifier;
import org.apache.camel.reifier.validator.ValidatorReifier;
-import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
import org.apache.camel.spi.FactoryFinderResolver;
import org.apache.camel.spi.ModelJAXBContextFactory;
import org.apache.camel.spi.ModelToXMLDumper;
@@ -75,7 +75,7 @@ public class CamelRecorder {
xmlLoader.getValue(),
xmlModelDumper.getValue());
- context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new
CamelRuntimeCatalog(context, config.runtimeCatalog));
+ context.setDefaultExtension(RuntimeCamelCatalog.class, () -> new
CamelRuntimeCatalog(config.runtimeCatalog));
context.setRegistry(registry.getValue());
context.setTypeConverterRegistry(typeConverterRegistry.getValue());
context.setLoadTypeConverters(false);
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
index 5b56b9c..98474b3 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRuntimeCatalog.java
@@ -16,15 +16,12 @@
*/
package org.apache.camel.quarkus.core;
-import org.apache.camel.CamelContext;
-import org.apache.camel.runtimecatalog.impl.DefaultRuntimeCamelCatalog;
+import org.apache.camel.catalog.impl.DefaultRuntimeCamelCatalog;
public class CamelRuntimeCatalog extends DefaultRuntimeCamelCatalog {
private final CamelConfig.RuntimeCatalogConfig config;
- public CamelRuntimeCatalog(CamelContext camelContext,
CamelConfig.RuntimeCatalogConfig config) {
- super(camelContext, true);
-
+ public CamelRuntimeCatalog(CamelConfig.RuntimeCatalogConfig config) {
this.config = config;
}
diff --git
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
index 35ebb10..da27c25 100644
---
a/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
+++
b/extensions/core/runtime/src/main/java/org/apache/camel/quarkus/core/FastCamelContext.java
@@ -76,8 +76,8 @@ import org.apache.camel.spi.CamelBeanPostProcessor;
import org.apache.camel.spi.CamelContextNameStrategy;
import org.apache.camel.spi.ClassResolver;
import org.apache.camel.spi.ComponentResolver;
-import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.ConfigurerResolver;
+import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatResolver;
import org.apache.camel.spi.EndpointRegistry;
import org.apache.camel.spi.ExecutorServiceManager;
diff --git
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
index d83da39..773d87e 100644
---
a/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
+++
b/integration-tests/core/src/main/java/org/apache/camel/quarkus/core/CamelServlet.java
@@ -30,8 +30,8 @@ import javax.ws.rs.core.MediaType;
import org.apache.camel.CamelContext;
import org.apache.camel.NoSuchLanguageException;
+import org.apache.camel.catalog.RuntimeCamelCatalog;
import org.apache.camel.component.log.LogComponent;
-import org.apache.camel.runtimecatalog.RuntimeCamelCatalog;
import org.apache.camel.spi.Registry;
import org.apache.camel.support.processor.DefaultExchangeFormatter;
@@ -103,7 +103,7 @@ public class CamelServlet {
@GET
@Produces(MediaType.APPLICATION_JSON)
public String catalog(@PathParam("type") String type, @PathParam("name")
String name) throws IOException {
- final RuntimeCamelCatalog catalog =
context.getExtension(RuntimeCamelCatalog.class);
+ final CamelRuntimeCatalog catalog = (CamelRuntimeCatalog)
context.getExtension(RuntimeCamelCatalog.class);
switch (type) {
case "component":
