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 2019/08/01 15:03:37 UTC
[camel] branch master updated (64fd094 -> 2c254a4)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 64fd094 CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Syslog
new afa4f1a CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Swagger-Java
new 67fe4c3 CAMEL-13801 - Fixed CS for Camel-Swagger-Java
new 2c254a4 Removed unused imports
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../RestSwaggerReaderApiDocsOverrideTest.java | 29 +++++----------
.../swagger/RestSwaggerReaderApiDocsTest.java | 29 +++++----------
.../swagger/RestSwaggerReaderDayOfWeekTest.java | 30 +++++----------
...RestSwaggerReaderEnableVendorExtensionTest.java | 32 ++++++----------
.../RestSwaggerReaderModelApiSecurityTest.java | 43 ++++++++--------------
.../RestSwaggerReaderModelBookOrderTest.java | 25 +++++--------
.../camel/swagger/RestSwaggerReaderModelTest.java | 34 +++++++----------
.../RestSwaggerReaderPropertyPlaceholderTest.java | 32 ++++++----------
.../camel/swagger/RestSwaggerReaderTest.java | 31 ++++++----------
.../camel/swagger/producer/RestSwaggerGetTest.java | 14 ++-----
.../producer/RestSwaggerGetUriParamTest.java | 14 ++-----
.../syslog/NettyRfc5425LongMessageTest.java | 1 -
.../camel/component/syslog/NettyRfc5425Test.java | 1 -
13 files changed, 111 insertions(+), 204 deletions(-)
[camel] 03/03: Removed unused imports
Posted by ac...@apache.org.
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.git
commit 2c254a411fc77be7be07f87f5c652cd90985098c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 17:03:18 2019 +0200
Removed unused imports
---
.../org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java | 2 --
.../java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java | 2 --
.../java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java | 2 --
.../camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java | 2 --
.../org/apache/camel/swagger/RestSwaggerReaderModelApiSecurityTest.java | 2 --
.../org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java | 2 --
.../test/java/org/apache/camel/swagger/RestSwaggerReaderModelTest.java | 2 --
.../apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java | 1 -
.../src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java | 2 --
.../test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java | 1 -
.../org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java | 1 -
11 files changed, 19 deletions(-)
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
index b13fd07..e044b29 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
index c496767..73bfc82 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
index 5917108..83ef33c 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
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 5b990bc..c4fa429 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
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
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 696603a..8374fda 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
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
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 160cc22..8961b7c 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
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
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 3dda1e2..89ff690 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
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
index 652d1bf..966e88a 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
@@ -27,7 +27,6 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestParamType;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
index 62bc6e5..add70e6 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
@@ -24,10 +24,8 @@ import io.swagger.models.Swagger;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
-import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
index 7d3def6..f28f260 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.swagger.producer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
index 4112f22..2f625ee 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.swagger.producer;
import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
[camel] 01/03: CAMEL-13801 - camel3 - Use @BindToRegistry wherever
possible, Camel-Swagger-Java
Posted by ac...@apache.org.
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.git
commit afa4f1ac22028891aeb855e02a4cb7273ec710cc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 16:59:33 2019 +0200
CAMEL-13801 - camel3 - Use @BindToRegistry wherever possible, Camel-Swagger-Java
---
.../swagger/RestSwaggerReaderApiDocsOverrideTest.java | 13 ++++++-------
.../camel/swagger/RestSwaggerReaderApiDocsTest.java | 11 +++++------
.../camel/swagger/RestSwaggerReaderDayOfWeekTest.java | 11 +++++------
.../RestSwaggerReaderEnableVendorExtensionTest.java | 11 +++++------
.../swagger/RestSwaggerReaderModelApiSecurityTest.java | 11 +++++------
.../swagger/RestSwaggerReaderModelBookOrderTest.java | 11 +++++------
.../apache/camel/swagger/RestSwaggerReaderModelTest.java | 11 +++++------
.../swagger/RestSwaggerReaderPropertyPlaceholderTest.java | 15 +++++++--------
.../org/apache/camel/swagger/RestSwaggerReaderTest.java | 11 +++++------
.../apache/camel/swagger/producer/RestSwaggerGetTest.java | 9 +++------
.../swagger/producer/RestSwaggerGetUriParamTest.java | 9 +++------
.../component/syslog/NettyRfc5425LongMessageTest.java | 1 -
.../apache/camel/component/syslog/NettyRfc5425Test.java | 1 -
13 files changed, 54 insertions(+), 71 deletions(-)
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
index 3609574..969f7fb 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderApiDocsOverrideTest extends CamelTestSupport {
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
index 31c44c2..73b4b1c 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderApiDocsTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
index a485bd2..b6520ab 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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 2feb6de..3e55813 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
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderEnableVendorExtensionTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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 4aeeb87..7fd9e18 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
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderModelApiSecurityTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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 e8959ab..a0e22d2 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
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
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 66e477c..8c71821 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
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderModelTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
index fba836e..73de294 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
@@ -24,31 +24,30 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
import org.junit.Test;
@Ignore("Does not run well on CI due test uses JMX mbeans")
public class RestSwaggerReaderPropertyPlaceholderTest extends CamelTestSupport {
-
+
+ @BindToRegistry("dummy-rest")
+ private DummyRestProducerFactory factory = new DummyRestProducerFactory();
+
@Override
protected boolean useJmx() {
return true;
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
-
- @Override
protected Properties useOverridePropertiesWithPropertiesComponent() {
Properties prop = new Properties();
prop.put("foo", "hello");
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
index a2b8ee7..9407c92 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
@@ -21,21 +21,20 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import io.swagger.jaxrs.config.BeanConfig;
import io.swagger.models.Swagger;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestParamType;
+import org.apache.camel.swagger.producer.DummyRestProducerFactory;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy-rest", new DummyRestConsumerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy-rest")
+ private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
index 1c53029..3fcc68f 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.swagger.producer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -24,12 +25,8 @@ import org.junit.Test;
public class RestSwaggerGetTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy", new DummyRestProducerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy")
+ private DummyRestProducerFactory factory = new DummyRestProducerFactory();
@Test
public void testSwaggerGet() throws Exception {
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
index 802adf3..837d27d 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.swagger.producer;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -24,12 +25,8 @@ import org.junit.Test;
public class RestSwaggerGetUriParamTest extends CamelTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("dummy", new DummyRestProducerFactory());
- return jndi;
- }
+ @BindToRegistry("dummy")
+ private DummyRestProducerFactory factory = new DummyRestProducerFactory();
@Test
public void testSwaggerGet() throws Exception {
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
index d93b28a..f9340d0 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.syslog.netty.Rfc5425Encoder;
import org.apache.camel.component.syslog.netty.Rfc5425FrameDecoder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
index 9b9093a..4a37351 100644
--- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
+++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java
@@ -22,7 +22,6 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.syslog.netty.Rfc5425Encoder;
import org.apache.camel.component.syslog.netty.Rfc5425FrameDecoder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.Registry;
import org.apache.camel.test.AvailablePortFinder;
[camel] 02/03: CAMEL-13801 - Fixed CS for Camel-Swagger-Java
Posted by ac...@apache.org.
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.git
commit 67fe4c391538b58b665f754fbb75ef1da2693b73
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Aug 1 17:02:04 2019 +0200
CAMEL-13801 - Fixed CS for Camel-Swagger-Java
---
.../RestSwaggerReaderApiDocsOverrideTest.java | 20 +++++---------
.../swagger/RestSwaggerReaderApiDocsTest.java | 18 ++++--------
.../swagger/RestSwaggerReaderDayOfWeekTest.java | 19 ++++---------
...RestSwaggerReaderEnableVendorExtensionTest.java | 21 ++++++--------
.../RestSwaggerReaderModelApiSecurityTest.java | 32 ++++++++--------------
.../RestSwaggerReaderModelBookOrderTest.java | 14 ++++------
.../camel/swagger/RestSwaggerReaderModelTest.java | 23 ++++++----------
.../RestSwaggerReaderPropertyPlaceholderTest.java | 22 ++++++---------
.../camel/swagger/RestSwaggerReaderTest.java | 20 +++++---------
.../camel/swagger/producer/RestSwaggerGetTest.java | 8 ++----
.../producer/RestSwaggerGetUriParamTest.java | 4 +--
11 files changed, 72 insertions(+), 129 deletions(-)
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
index 969f7fb..b13fd07 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsOverrideTest.java
@@ -32,7 +32,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RestSwaggerReaderApiDocsOverrideTest extends CamelTestSupport {
-
+
@BindToRegistry("dummy-rest")
private DummyRestConsumerFactory factory = new DummyRestConsumerFactory();
@@ -41,17 +41,11 @@ public class RestSwaggerReaderApiDocsOverrideTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- rest("/hello").apiDocs(false).consumes("application/json").produces("application/json")
- .get("/hi/{name}").description("Saying hi")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .to("log:hi")
- .get("/bye/{name}").apiDocs(true).description("Saying bye")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .responseMessage().code(200).message("A reply message").endResponseMessage()
- .to("log:bye")
- .post("/bye").description("To update the greeting message").consumes("application/xml").produces("application/xml")
- .param().name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam()
- .to("log:bye");
+ rest("/hello").apiDocs(false).consumes("application/json").produces("application/json").get("/hi/{name}").description("Saying hi").param().name("name")
+ .type(RestParamType.path).dataType("string").description("Who is it").endParam().to("log:hi").get("/bye/{name}").apiDocs(true).description("Saying bye").param()
+ .name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam().responseMessage().code(200).message("A reply message")
+ .endResponseMessage().to("log:bye").post("/bye").description("To update the greeting message").consumes("application/xml").produces("application/xml").param()
+ .name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam().to("log:bye");
}
};
}
@@ -60,7 +54,7 @@ public class RestSwaggerReaderApiDocsOverrideTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
RestSwaggerReader reader = new RestSwaggerReader();
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
index 73b4b1c..c496767 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderApiDocsTest.java
@@ -41,17 +41,11 @@ public class RestSwaggerReaderApiDocsTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- rest("/hello").consumes("application/json").produces("application/json")
- .get("/hi/{name}").description("Saying hi")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .to("log:hi")
- .get("/bye/{name}").apiDocs(false).description("Saying bye")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .responseMessage().code(200).message("A reply message").endResponseMessage()
- .to("log:bye")
- .post("/bye").apiDocs(false).description("To update the greeting message").consumes("application/xml").produces("application/xml")
- .param().name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam()
- .to("log:bye");
+ rest("/hello").consumes("application/json").produces("application/json").get("/hi/{name}").description("Saying hi").param().name("name").type(RestParamType.path)
+ .dataType("string").description("Who is it").endParam().to("log:hi").get("/bye/{name}").apiDocs(false).description("Saying bye").param().name("name")
+ .type(RestParamType.path).dataType("string").description("Who is it").endParam().responseMessage().code(200).message("A reply message").endResponseMessage()
+ .to("log:bye").post("/bye").apiDocs(false).description("To update the greeting message").consumes("application/xml").produces("application/xml").param()
+ .name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam().to("log:bye");
}
};
}
@@ -60,7 +54,7 @@ public class RestSwaggerReaderApiDocsTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
RestSwaggerReader reader = new RestSwaggerReader();
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
index b6520ab..5917108 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderDayOfWeekTest.java
@@ -42,19 +42,12 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// this user REST service is json only
- rest("/day").tag("dude").description("Day service")
- .consumes("application/json").produces("application/json")
+ rest("/day").tag("dude").description("Day service").consumes("application/json").produces("application/json")
- .get("/week").description("Day of week")
- .param().name("day").type(RestParamType.query).description("Day of week")
- .defaultValue("friday")
- .dataType("string").allowableValues("monday", "tuesday", "wednesday", "thursday", "friday")
- .endParam()
- .responseMessage()
- .code(200).responseModel(DayResponse.class)
- .header("X-Rate-Limit-Limit").description("The number of allowed requests in the current period").dataType("integer").endHeader()
- .endResponseMessage()
- .to("log:week");
+ .get("/week").description("Day of week").param().name("day").type(RestParamType.query).description("Day of week").defaultValue("friday").dataType("string")
+ .allowableValues("monday", "tuesday", "wednesday", "thursday", "friday").endParam().responseMessage().code(200).responseModel(DayResponse.class)
+ .header("X-Rate-Limit-Limit").description("The number of allowed requests in the current period").dataType("integer").endHeader().endResponseMessage()
+ .to("log:week");
}
};
}
@@ -63,7 +56,7 @@ public class RestSwaggerReaderDayOfWeekTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
config.setTitle("Day");
config.setLicense("Apache 2.0");
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 3e55813..5b990bc 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
@@ -45,21 +45,16 @@ public class RestSwaggerReaderEnableVendorExtensionTest extends CamelTestSupport
restConfiguration().apiVendorExtension(true);
// this user REST service is json only
- rest("/user").tag("dude").description("User rest service")
- .consumes("application/json").produces("application/json")
+ rest("/user").tag("dude").description("User rest service").consumes("application/json").produces("application/json")
- .get("/{id}").description("Find user by id").outType(User.class)
- .responseMessage().message("The user returned").endResponseMessage()
- .param().name("id").type(RestParamType.path).description("The id of the user to get").dataType("integer").endParam()
- .to("bean:userService?method=getUser(${header.id})")
+ .get("/{id}").description("Find user by id").outType(User.class).responseMessage().message("The user returned").endResponseMessage().param().name("id")
+ .type(RestParamType.path).description("The id of the user to get").dataType("integer").endParam().to("bean:userService?method=getUser(${header.id})")
- .put().description("Updates or create a user").type(User.class)
- .param().name("body").type(RestParamType.body).description("The user to update or create").endParam()
- .to("bean:userService?method=updateUser")
+ .put().description("Updates or create a user").type(User.class).param().name("body").type(RestParamType.body).description("The user to update or create")
+ .endParam().to("bean:userService?method=updateUser")
- .get("/findAll").description("Find all users").outType(User[].class)
- .responseMessage().message("All the found users").endResponseMessage()
- .to("bean:userService?method=listUsers");
+ .get("/findAll").description("Find all users").outType(User[].class).responseMessage().message("All the found users").endResponseMessage()
+ .to("bean:userService?method=listUsers");
}
};
}
@@ -68,7 +63,7 @@ public class RestSwaggerReaderEnableVendorExtensionTest extends CamelTestSupport
public void testEnableVendorExtension() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
config.setTitle("Camel User store");
config.setLicense("Apache 2.0");
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 7fd9e18..696603a 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
@@ -43,29 +43,21 @@ public class RestSwaggerReaderModelApiSecurityTest extends CamelTestSupport {
public void configure() throws Exception {
rest("/user").tag("dude").description("User rest service")
// setup security definitions
- .securityDefinitions()
- .oauth2("petstore_auth").authorizationUrl("http://petstore.swagger.io/oauth/dialog").end()
- .apiKey("api_key").withHeader("myHeader").end()
- .end()
- .consumes("application/json").produces("application/json")
+ .securityDefinitions().oauth2("petstore_auth").authorizationUrl("http://petstore.swagger.io/oauth/dialog").end().apiKey("api_key").withHeader("myHeader").end()
+ .end().consumes("application/json").produces("application/json")
- .get("/{id}/{date}").description("Find user by id and date").outType(User.class)
- .responseMessage().message("The user returned").endResponseMessage()
- // setup security for this rest verb
- .security("api_key")
- .param().name("id").type(RestParamType.path).description("The id of the user to get").endParam()
- .param().name("date").type(RestParamType.path).description("The date").dataFormat("date").endParam()
- .to("bean:userService?method=getUser(${header.id})")
+ .get("/{id}/{date}").description("Find user by id and date").outType(User.class).responseMessage().message("The user returned").endResponseMessage()
+ // setup security for this rest verb
+ .security("api_key").param().name("id").type(RestParamType.path).description("The id of the user to get").endParam().param().name("date")
+ .type(RestParamType.path).description("The date").dataFormat("date").endParam().to("bean:userService?method=getUser(${header.id})")
.put().description("Updates or create a user").type(User.class)
- // setup security for this rest verb
- .security("petstore_auth", "write:pets,read:pets")
- .param().name("body").type(RestParamType.body).description("The user to update or create").endParam()
- .to("bean:userService?method=updateUser")
+ // setup security for this rest verb
+ .security("petstore_auth", "write:pets,read:pets").param().name("body").type(RestParamType.body).description("The user to update or create").endParam()
+ .to("bean:userService?method=updateUser")
- .get("/findAll").description("Find all users").outType(User[].class)
- .responseMessage().message("All the found users").endResponseMessage()
- .to("bean:userService?method=listUsers");
+ .get("/findAll").description("Find all users").outType(User[].class).responseMessage().message("All the found users").endResponseMessage()
+ .to("bean:userService?method=listUsers");
}
};
}
@@ -74,7 +66,7 @@ public class RestSwaggerReaderModelApiSecurityTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
config.setTitle("Camel User store");
config.setLicense("Apache 2.0");
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 a0e22d2..160cc22 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
@@ -42,15 +42,11 @@ public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// this user REST service is json only
- rest("/books").tag("dude").description("Book order service")
- .consumes("application/json").produces("application/json")
+ rest("/books").tag("dude").description("Book order service").consumes("application/json").produces("application/json")
- .get("/{id}").description("Find order by id").outType(BookOrder.class)
- .responseMessage().message("The order returned").endResponseMessage()
- .param().name("id").type(RestParamType.path).description("The id of the order to get").dataType("integer").endParam()
- .to("bean:bookService?method=getOrder(${header.id})")
- .get("/books/{id}/line/{lineNum}").outType(LineItem.class)
- .to("bean:bookService?method=getOrder(${header.id})");
+ .get("/{id}").description("Find order by id").outType(BookOrder.class).responseMessage().message("The order returned").endResponseMessage().param().name("id")
+ .type(RestParamType.path).description("The id of the order to get").dataType("integer").endParam().to("bean:bookService?method=getOrder(${header.id})")
+ .get("/books/{id}/line/{lineNum}").outType(LineItem.class).to("bean:bookService?method=getOrder(${header.id})");
}
};
}
@@ -59,7 +55,7 @@ public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
config.setTitle("Camel User store");
config.setLicense("Apache 2.0");
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 8c71821..3dda1e2 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
@@ -42,22 +42,17 @@ public class RestSwaggerReaderModelTest extends CamelTestSupport {
@Override
public void configure() throws Exception {
// this user REST service is json only
- rest("/user").tag("dude").description("User rest service")
- .consumes("application/json").produces("application/json")
+ rest("/user").tag("dude").description("User rest service").consumes("application/json").produces("application/json")
- .get("/{id}/{date}").description("Find user by id and date").outType(User.class)
- .responseMessage().message("The user returned").endResponseMessage()
- .param().name("id").type(RestParamType.path).description("The id of the user to get").endParam()
- .param().name("date").type(RestParamType.path).description("The date").dataFormat("date").endParam()
- .to("bean:userService?method=getUser(${header.id})")
+ .get("/{id}/{date}").description("Find user by id and date").outType(User.class).responseMessage().message("The user returned").endResponseMessage().param()
+ .name("id").type(RestParamType.path).description("The id of the user to get").endParam().param().name("date").type(RestParamType.path).description("The date")
+ .dataFormat("date").endParam().to("bean:userService?method=getUser(${header.id})")
- .put().description("Updates or create a user").type(User.class)
- .param().name("body").type(RestParamType.body).description("The user to update or create").endParam()
- .to("bean:userService?method=updateUser")
+ .put().description("Updates or create a user").type(User.class).param().name("body").type(RestParamType.body).description("The user to update or create")
+ .endParam().to("bean:userService?method=updateUser")
- .get("/findAll").description("Find all users").outType(User[].class)
- .responseMessage().message("All the found users").endResponseMessage()
- .to("bean:userService?method=listUsers");
+ .get("/findAll").description("Find all users").outType(User[].class).responseMessage().message("All the found users").endResponseMessage()
+ .to("bean:userService?method=listUsers");
}
};
}
@@ -66,7 +61,7 @@ public class RestSwaggerReaderModelTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
config.setTitle("Camel User store");
config.setLicense("Apache 2.0");
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
index 73de294..652d1bf 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderPropertyPlaceholderTest.java
@@ -38,10 +38,10 @@ import org.junit.Test;
@Ignore("Does not run well on CI due test uses JMX mbeans")
public class RestSwaggerReaderPropertyPlaceholderTest extends CamelTestSupport {
-
+
@BindToRegistry("dummy-rest")
private DummyRestProducerFactory factory = new DummyRestProducerFactory();
-
+
@Override
protected boolean useJmx() {
return true;
@@ -60,17 +60,11 @@ public class RestSwaggerReaderPropertyPlaceholderTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- rest("/{{foo}}").consumes("application/json").produces("application/json")
- .get("/hi/{name}").description("Saying hi")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .to("log:hi")
- .get("/{{bar}}/{name}").description("Saying bye")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").endParam()
- .responseMessage().code(200).message("A reply message").endResponseMessage()
- .to("log:bye")
- .post("/{{bar}}").description("To update the greeting message").consumes("application/xml").produces("application/xml")
- .param().name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam()
- .to("log:bye");
+ rest("/{{foo}}").consumes("application/json").produces("application/json").get("/hi/{name}").description("Saying hi").param().name("name").type(RestParamType.path)
+ .dataType("string").description("Who is it").endParam().to("log:hi").get("/{{bar}}/{name}").description("Saying bye").param().name("name")
+ .type(RestParamType.path).dataType("string").description("Who is it").endParam().responseMessage().code(200).message("A reply message").endResponseMessage()
+ .to("log:bye").post("/{{bar}}").description("To update the greeting message").consumes("application/xml").produces("application/xml").param().name("greeting")
+ .type(RestParamType.body).dataType("string").description("Message to use as greeting").endParam().to("log:bye");
}
};
}
@@ -79,7 +73,7 @@ public class RestSwaggerReaderPropertyPlaceholderTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
RestSwaggerReader reader = new RestSwaggerReader();
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
index 9407c92..62bc6e5 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderTest.java
@@ -41,18 +41,12 @@ public class RestSwaggerReaderTest extends CamelTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- rest("/hello").consumes("application/json").produces("application/json")
- .get("/hi/{name}").description("Saying hi")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").example("Donald Duck").endParam()
- .to("log:hi")
- .get("/bye/{name}").description("Saying bye")
- .param().name("name").type(RestParamType.path).dataType("string").description("Who is it").example("Donald Duck").endParam()
- .responseMessage().code(200).message("A reply number").responseModel(float.class)
- .example("success", "123").example("error", "-1").endResponseMessage()
- .to("log:bye")
- .post("/bye").description("To update the greeting message").consumes("application/xml").produces("application/xml")
- .param().name("greeting").type(RestParamType.body).dataType("string").description("Message to use as greeting").example("application/xml", "<hello>Hi</hello>").endParam()
- .to("log:bye");
+ rest("/hello").consumes("application/json").produces("application/json").get("/hi/{name}").description("Saying hi").param().name("name").type(RestParamType.path)
+ .dataType("string").description("Who is it").example("Donald Duck").endParam().to("log:hi").get("/bye/{name}").description("Saying bye").param().name("name")
+ .type(RestParamType.path).dataType("string").description("Who is it").example("Donald Duck").endParam().responseMessage().code(200).message("A reply number")
+ .responseModel(float.class).example("success", "123").example("error", "-1").endResponseMessage().to("log:bye").post("/bye")
+ .description("To update the greeting message").consumes("application/xml").produces("application/xml").param().name("greeting").type(RestParamType.body)
+ .dataType("string").description("Message to use as greeting").example("application/xml", "<hello>Hi</hello>").endParam().to("log:bye");
}
};
}
@@ -61,7 +55,7 @@ public class RestSwaggerReaderTest extends CamelTestSupport {
public void testReaderRead() throws Exception {
BeanConfig config = new BeanConfig();
config.setHost("localhost:8080");
- config.setSchemes(new String[]{"http"});
+ config.setSchemes(new String[] {"http"});
config.setBasePath("/api");
RestSwaggerReader reader = new RestSwaggerReader();
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
index 3fcc68f..7d3def6 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetTest.java
@@ -25,8 +25,8 @@ import org.junit.Test;
public class RestSwaggerGetTest extends CamelTestSupport {
- @BindToRegistry("dummy")
- private DummyRestProducerFactory factory = new DummyRestProducerFactory();
+ @BindToRegistry("dummy")
+ private DummyRestProducerFactory factory = new DummyRestProducerFactory();
@Test
public void testSwaggerGet() throws Exception {
@@ -44,9 +44,7 @@ public class RestSwaggerGetTest extends CamelTestSupport {
public void configure() throws Exception {
restConfiguration().host("camelhost").producerComponent("dummy");
- from("direct:start")
- .to("rest:get:hello/hi/{name}?apiDoc=hello-api.json")
- .to("mock:result");
+ from("direct:start").to("rest:get:hello/hi/{name}?apiDoc=hello-api.json").to("mock:result");
}
};
}
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
index 837d27d..4112f22 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/producer/RestSwaggerGetUriParamTest.java
@@ -44,9 +44,7 @@ public class RestSwaggerGetUriParamTest extends CamelTestSupport {
public void configure() throws Exception {
restConfiguration().host("camelhost").producerComponent("dummy").producerApiDoc("hello-api.json");
- from("direct:start")
- .to("rest:get:bye?name={name}")
- .to("mock:result");
+ from("direct:start").to("rest:get:bye?name={name}").to("mock:result");
}
};
}