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/03/11 14:18:07 UTC
[camel] 02/02: CAMEL-19132: Deprecate vm and direct-vm and remove in v4
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e4a313012ad4a9a60a83b5c8d3d9052b15861d64
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Mar 11 15:17:52 2023 +0100
CAMEL-19132: Deprecate vm and direct-vm and remove in v4
---
.../component/stub/AbstractStubTestSupport.java | 82 ----------------------
.../camel/component/stub/StubInOnlyTest.java | 17 ++---
.../apache/camel/component/stub/StubInOutTest.java | 16 ++---
3 files changed, 10 insertions(+), 105 deletions(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/stub/AbstractStubTestSupport.java b/core/camel-core/src/test/java/org/apache/camel/component/stub/AbstractStubTestSupport.java
deleted file mode 100644
index c49bcd7d43e..00000000000
--- a/core/camel-core/src/test/java/org/apache/camel/component/stub/AbstractStubTestSupport.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.stub;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.Service;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.parallel.ResourceLock;
-
-@ResourceLock("VmComponent")
-public abstract class AbstractStubTestSupport extends ContextTestSupport {
-
- protected CamelContext context2;
- protected ProducerTemplate template2;
-
- @Override
- @BeforeEach
- public void setUp() throws Exception {
- super.setUp();
- context2 = new DefaultCamelContext();
- template2 = context2.createProducerTemplate();
-
- startServices(template2, context2);
-
- // add routes after CamelContext has been started
- RouteBuilder routeBuilder = createRouteBuilderForSecondContext();
- if (routeBuilder != null) {
- context2.addRoutes(routeBuilder);
- }
- }
-
- @Override
- @AfterEach
- public void tearDown() throws Exception {
- stopServices(context2, template2);
- super.tearDown();
- }
-
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
- return null;
- }
-
- protected void startServices(Object... services) {
- for (Object o : services) {
- if (o instanceof Service) {
- ((Service) o).start();
- } else if (o instanceof CamelContext) {
- ((CamelContext) o).start();
- }
- }
- }
-
- protected void stopServices(Object... services) {
- for (Object o : services) {
- if (o instanceof Service) {
- ((Service) o).stop();
- } else if (o instanceof CamelContext) {
- ((CamelContext) o).stop();
- }
- }
- }
-
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
index 8ef5ecfb59d..6bf2386d0b0 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOnlyTest.java
@@ -16,38 +16,31 @@
*/
package org.apache.camel.component.stub;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
@ResourceLock("VmComponent")
-public class StubInOnlyTest extends AbstractStubTestSupport {
+public class StubInOnlyTest extends ContextTestSupport {
@Test
public void testInOnly() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- template2.sendBody("direct:start", "Hello World");
+ template.sendBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("stub:smtp://some.server.com?something=bar&whatnot=cheese").to("mock:result");
- }
- };
- }
-
- @Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
from("direct:start").to("stub:smtp://some.server.com?something=bar&whatnot=cheese");
+
+ from("stub:smtp://some.server.com?something=bar&whatnot=cheese").to("mock:result");
}
};
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOutTest.java b/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOutTest.java
index 8695bee98ab..4a12194c98a 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOutTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/stub/StubInOutTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.camel.component.stub;
+import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.ResourceLock;
@ResourceLock("VmComponent")
-public class StubInOutTest extends AbstractStubTestSupport {
+public class StubInOutTest extends ContextTestSupport {
@Test
public void testInOut() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- template2.requestBody("direct:start", "Hello World");
+ template.requestBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
}
@@ -37,18 +38,11 @@ public class StubInOutTest extends AbstractStubTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
+ from("direct:start").to("stub:smtp://some.server.com?something=bar&whatnot=cheese");
+
from("stub:smtp://some.server.com?something=bar&whatnot=cheese").to("mock:result");
}
};
}
- @Override
- protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start").to("stub:smtp://some.server.com?something=bar&whatnot=cheese");
- }
- };
- }
}