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/01/07 09:01:10 UTC
[camel] 03/08: CAMEL-14359: camel-bean is now singleton scoped by
default (cache=true).
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bean-scope
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bc61558af28a1d41c98f3f8068c50af50cb31d7d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Jan 6 19:46:27 2020 +0100
CAMEL-14359: camel-bean is now singleton scoped by default (cache=true).
---
.../camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java | 3 +++
.../apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java | 6 +++---
.../apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java | 4 +++-
.../java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java | 3 +++
.../camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java | 6 ++----
.../camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml | 2 ++
.../camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java | 3 +++
.../apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java | 3 +++
.../apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java | 3 +++
.../java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java | 3 +++
.../camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml | 3 +++
11 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java
index 8757dad..b37a601 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderEnableVendorExtensionTest.java
@@ -33,6 +33,9 @@ public class RestOpenApiReaderEnableVendorExtensionTest extends CamelTestSupport
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java
index 66c7147..9336964 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelApiSecurityTest.java
@@ -28,14 +28,14 @@ import org.apache.camel.model.rest.RestParamType;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
-
-
public class RestOpenApiReaderModelApiSecurityTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java
index 91df38e..7685c7d 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelBookOrderTest.java
@@ -28,12 +28,14 @@ import org.apache.camel.model.rest.RestParamType;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-
public class RestOpenApiReaderModelBookOrderTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("bookService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
index 39459d8..df611f8 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/RestOpenApiReaderModelTest.java
@@ -34,6 +34,9 @@ public class RestOpenApiReaderModelTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java
index 9efdbea..a7905ff 100644
--- a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java
+++ b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.java
@@ -36,7 +36,6 @@ public class SpringRestOpenApiReaderModelApiSecurityTest extends CamelSpringTest
@Test
public void testReaderRead() throws Exception {
-
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
config.setSchemes(new String[]{"http"});
@@ -75,13 +74,12 @@ public class SpringRestOpenApiReaderModelApiSecurityTest extends CamelSpringTest
assertTrue(json.contains("\"type\" : \"string\""));
assertTrue(json.contains("\"format\" : \"date\""));
assertFalse(json.contains("\"enum\""));
+
context.stop();
-
}
@Test
public void testReaderReadV3() throws Exception {
-
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
config.setSchemes(new String[]{"http"});
@@ -120,7 +118,7 @@ public class SpringRestOpenApiReaderModelApiSecurityTest extends CamelSpringTest
assertTrue(json.contains("\"type\" : \"string\""));
assertTrue(json.contains("\"format\" : \"date\""));
assertFalse(json.contains("\"enum\""));
+
context.stop();
-
}
}
diff --git a/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml b/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
index b39d317..cc5c91a 100644
--- a/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
+++ b/components/camel-openapi-java/src/test/resources/org/apache/camel/openapi/SpringRestOpenApiReaderModelApiSecurityTest.xml
@@ -27,6 +27,8 @@
<!-- use a dummy rest consumer factory for the rest engine -->
<bean id="dummy-rest" class="org.apache.camel.openapi.DummyRestConsumerFactory"/>
+ <bean id="userService" class="java.lang.Object"/>
+
<camelContext xmlns="http://camel.apache.org/schema/spring">
<rest path="/user" tag="dude" consumes="application/json" produces="application/json">
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
index da42e83..a3a596e 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
@@ -41,6 +41,9 @@ public class RestSwaggerReaderEnableVendorExtensionTest extends CamelTestSupport
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java
index 61a3237..2ddfdf2 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java
@@ -41,6 +41,9 @@ public class RestSwaggerReaderModelApiSecurityTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
index efe4467..0831552 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
@@ -40,6 +40,9 @@ public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("bookService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
index 32e52e6..c3805a9 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java
@@ -41,6 +41,9 @@ public class RestSwaggerReaderModelTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
+ @BindToRegistry("userService")
+ private Object dummy = new Object();
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
diff --git a/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml b/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
index 9fc8609..ae5c087 100644
--- a/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
+++ b/components/camel-swagger-java/src/test/resources/org/apache/camel/swagger/SpringRestSwaggerReaderModelApiSecurityTest.xml
@@ -27,6 +27,9 @@
<!-- use a dummy rest consumer factory for the rest engine -->
<bean id="dummy-rest" class="org.apache.camel.swagger.DummyRestConsumerFactory"/>
+ <!-- dummy -->
+ <bean id="userService" class="java.lang.Object"/>
+
<camelContext xmlns="http://camel.apache.org/schema/spring">
<rest path="/user" tag="dude" consumes="application/json" produces="application/json">