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 2019/04/01 08:36:18 UTC
[camel-k-runtime] branch m2 updated: chore(version): Upgrade to
Camel 3.0.0-M2: Camel 2.x no longer works. Do NOT mergegit log!
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch m2
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/m2 by this push:
new 2d34050 chore(version): Upgrade to Camel 3.0.0-M2: Camel 2.x no longer works. Do NOT mergegit log!
2d34050 is described below
commit 2d34050dc0356c361c1897bf12fd3253200d4307
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 1 10:36:09 2019 +0200
chore(version): Upgrade to Camel 3.0.0-M2: Camel 2.x no longer works. Do NOT mergegit log!
---
.../src/main/java/org/apache/camel/k/InMemoryRegistry.java | 5 +++++
.../test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy | 2 +-
.../java/org/apache/camel/k/jvm/ApplicationRuntime.java | 13 ++++++++-----
.../main/java/org/apache/camel/k/jvm/loader/XmlLoader.java | 6 ++++--
.../org/apache/camel/k/jvm/RoutesLoadersCommonTest.java | 2 +-
.../test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java | 2 +-
.../src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt | 2 +-
.../camel/k/spring/boot/ApplicationAutoConfiguration.java | 7 ++++++-
.../test/java/org/apache/camel/k/yaml/RoutesLoaderTest.java | 2 +-
.../camel/component/knative/http/KnativeHttpMain.java | 5 ++---
10 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/camel-k-runtime-core/src/main/java/org/apache/camel/k/InMemoryRegistry.java b/camel-k-runtime-core/src/main/java/org/apache/camel/k/InMemoryRegistry.java
index 1b6c9e6..453d3d7 100644
--- a/camel-k-runtime-core/src/main/java/org/apache/camel/k/InMemoryRegistry.java
+++ b/camel-k-runtime-core/src/main/java/org/apache/camel/k/InMemoryRegistry.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
import java.util.stream.Collectors;
import org.apache.camel.NoSuchBeanException;
+import org.apache.camel.RuntimeCamelException;
public final class InMemoryRegistry implements Runtime.Registry {
private final ConcurrentMap<String, Object> registry;
@@ -36,6 +37,10 @@ public final class InMemoryRegistry implements Runtime.Registry {
this.registry.put(name, bean);
}
+ public void bind(String id, Class<?> type, Object bean) throws RuntimeCamelException {
+ this.registry.put(id, bean);
+ }
+
@Override
public Object lookupByName(String name) {
return registry.get(name);
diff --git a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy b/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
index 13b5f24..cdfd6db 100644
--- a/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
+++ b/camel-k-runtime-groovy/src/test/groovy/org/apache/camel/k/groovy/LoaderTest.groovy
@@ -44,7 +44,7 @@ class LoaderTest extends Specification {
def routes = builder.routeCollection.routes
routes.size() == 1
- routes[0].inputs[0].endpointUri == 'timer:tick'
+ routes[0].input.endpointUri == 'timer:tick'
routes[0].outputs[0] instanceof ToDefinition
}
}
diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
index 9182a64..4a1392e 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
+++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/ApplicationRuntime.java
@@ -113,8 +113,13 @@ public final class ApplicationRuntime implements Runtime {
return getContext().createProducerTemplate();
}
- @Override
+ protected CamelContext createCamelContext() {
+ // camel 3.x
+ return getContext();
+ }
+
protected Map<String, CamelContext> getCamelContextMap() {
+ // camel 2.x
getContext();
return contextMap;
@@ -123,7 +128,7 @@ public final class ApplicationRuntime implements Runtime {
@Override
protected void doStart() throws Exception {
super.doStart();
- postProcessContext();
+ initCamelContext();
try {
getContext().start();
@@ -138,9 +143,7 @@ public final class ApplicationRuntime implements Runtime {
protected void doStop() throws Exception {
super.doStop();
- if (!getCamelContexts().isEmpty()) {
- getContext().stop();
- }
+ getContext().stop();
}
}
diff --git a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
index 6880e3e..4efd1ad 100644
--- a/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
+++ b/camel-k-runtime-jvm/src/main/java/org/apache/camel/k/jvm/loader/XmlLoader.java
@@ -26,6 +26,8 @@ import org.apache.camel.k.RoutesLoader;
import org.apache.camel.k.Runtime;
import org.apache.camel.k.Source;
import org.apache.camel.k.support.URIResolver;
+import org.apache.camel.model.ModelCamelContext;
+import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.RoutesDefinition;
import org.apache.camel.model.rest.RestsDefinition;
import org.slf4j.Logger;
@@ -46,7 +48,7 @@ public class XmlLoader implements RoutesLoader {
public void configure() throws Exception {
try (InputStream is = URIResolver.resolve(getContext(), source)) {
try {
- RoutesDefinition definition = getContext().loadRoutesDefinition(is);
+ RoutesDefinition definition = ModelHelper.loadRoutesDefinition(getContext(), is);
LOGGER.debug("Loaded {} routes from {}", definition.getRoutes().size(), source);
setRouteCollection(definition);
@@ -59,7 +61,7 @@ public class XmlLoader implements RoutesLoader {
try (InputStream is = URIResolver.resolve(getContext(), source)) {
try {
- RestsDefinition definition = getContext().loadRestsDefinition(is);
+ RestsDefinition definition = ModelHelper.loadRestsDefinition(getContext(), is);
LOGGER.debug("Loaded {} rests from {}", definition.getRests().size(), source);
setRestCollection(definition);
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
index fb2a8a0..8f98431 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
+++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersCommonTest.java
@@ -53,7 +53,7 @@ public class RoutesLoadersCommonTest {
List<RouteDefinition> routes = builder.getRouteCollection().getRoutes();
assertThat(routes).hasSize(1);
- assertThat(routes.get(0).getInputs().get(0).getEndpointUri()).isEqualTo("timer:tick");
+ assertThat(routes.get(0).getInput().getEndpointUri()).isEqualTo("timer:tick");
assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
}
diff --git a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
index bc44345..1b80106 100644
--- a/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
+++ b/camel-k-runtime-jvm/src/test/java/org/apache/camel/k/jvm/RoutesLoadersTest.java
@@ -68,7 +68,7 @@ public class RoutesLoadersTest {
List<RouteDefinition> routes = builder.getRouteCollection().getRoutes();
assertThat(routes).hasSize(1);
- assertThat(routes.get(0).getInputs().get(0).getEndpointUri()).isEqualTo("timer:tick");
+ assertThat(routes.get(0).getInput().getEndpointUri()).isEqualTo("timer:tick");
assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(SetBodyDefinition.class);
assertThat(routes.get(0).getOutputs().get(1)).isInstanceOf(ProcessDefinition.class);
assertThat(routes.get(0).getOutputs().get(2)).isInstanceOf(ToDefinition.class);
diff --git a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt b/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
index c31af21..91a589c 100644
--- a/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
+++ b/camel-k-runtime-kotlin/src/test/kotlin/org/apache/camel/k/kotlin/LoaderTest.kt
@@ -42,7 +42,7 @@ class LoaderTest {
val routes = builder.routeCollection.routes
assertThat(routes).hasSize(1)
- assertThat(routes[0].inputs[0].endpointUri).isEqualTo("timer:tick")
+ assertThat(routes[0].input.endpointUri).isEqualTo("timer:tick")
assertThat(routes[0].outputs[0]).isInstanceOf(ProcessDefinition::class.java)
assertThat(routes[0].outputs[1]).isInstanceOf(ToDefinition::class.java)
}
diff --git a/camel-k-runtime-spring-boot/src/main/java/org/apache/camel/k/spring/boot/ApplicationAutoConfiguration.java b/camel-k-runtime-spring-boot/src/main/java/org/apache/camel/k/spring/boot/ApplicationAutoConfiguration.java
index 7182add..4ecb213 100644
--- a/camel-k-runtime-spring-boot/src/main/java/org/apache/camel/k/spring/boot/ApplicationAutoConfiguration.java
+++ b/camel-k-runtime-spring-boot/src/main/java/org/apache/camel/k/spring/boot/ApplicationAutoConfiguration.java
@@ -123,10 +123,15 @@ public class ApplicationAutoConfiguration {
public <T> Set<T> findByType(Class<T> type) {
return registry.findByType(type);
}
- @Override
+
public void bind(String name, Object bean) {
applicationContext.getBeanFactory().registerSingleton(name, bean);
}
+
+ public void bind(String name, Class type, Object bean) {
+ applicationContext.getBeanFactory().registerSingleton(name, bean);
+ }
+
}
}
diff --git a/camel-k-runtime-yaml/src/test/java/org/apache/camel/k/yaml/RoutesLoaderTest.java b/camel-k-runtime-yaml/src/test/java/org/apache/camel/k/yaml/RoutesLoaderTest.java
index 2c77ad9..c3329c5 100644
--- a/camel-k-runtime-yaml/src/test/java/org/apache/camel/k/yaml/RoutesLoaderTest.java
+++ b/camel-k-runtime-yaml/src/test/java/org/apache/camel/k/yaml/RoutesLoaderTest.java
@@ -48,7 +48,7 @@ public class RoutesLoaderTest {
List<RouteDefinition> routes = builder.getRouteCollection().getRoutes();
assertThat(routes).hasSize(1);
- assertThat(routes.get(0).getInputs().get(0).getEndpointUri()).isEqualTo("timer:tick");
+ assertThat(routes.get(0).getInput().getEndpointUri()).isEqualTo("timer:tick");
assertThat(routes.get(0).getOutputs().get(0)).isInstanceOf(ToDefinition.class);
}
}
diff --git a/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpMain.java b/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpMain.java
index ba4099f..6ad8d5b 100644
--- a/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpMain.java
+++ b/camel-knative-http/src/test/java/org/apache/camel/component/knative/http/KnativeHttpMain.java
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.knative.http;
+import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.SimpleRegistry;
public class KnativeHttpMain {
public static void main(String[] args) throws Exception {
- SimpleRegistry registry = new SimpleRegistry();
- DefaultCamelContext context = new DefaultCamelContext(registry);
+ CamelContext context = new DefaultCamelContext();
try {
context.disableJMX();