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 2014/08/10 11:42:15 UTC
[09/11] git commit: Rest DSL. camel-swagger work in progress.
Rest DSL. camel-swagger work in progress.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a53b2da7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a53b2da7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a53b2da7
Branch: refs/heads/master
Commit: a53b2da7716a9a6fd2ff232364195435e604cfac
Parents: 3f821b0
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 10 11:16:57 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 10 11:16:57 2014 +0200
----------------------------------------------------------------------
apache-camel/pom.xml | 4 ++++
apache-camel/src/main/descriptors/common-bin.xml | 1 +
components/camel-swagger/pom.xml | 7 ++++---
.../camel/component/swagger/RestSwaggerReaderTest.java | 8 ++++++--
components/camel-swagger/src/test/resources/log4j.properties | 7 +++----
components/pom.xml | 1 +
.../src/main/resources/log4j.properties | 3 ++-
parent/pom.xml | 6 ++++++
8 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/apache-camel/pom.xml
----------------------------------------------------------------------
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index acfeb72..781f831 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -616,6 +616,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-swagger</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index cef837d..a7ed332 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -171,6 +171,7 @@
<include>org.apache.camel:camel-stream</include>
<include>org.apache.camel:camel-stringtemplate</include>
<include>org.apache.camel:camel-syslog</include>
+ <include>org.apache.camel:camel-swagger</include>
<include>org.apache.camel:camel-tagsoup</include>
<include>org.apache.camel:camel-test</include>
<include>org.apache.camel:camel-test-blueprint</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/components/camel-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index fe978c8..e55c542 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -44,6 +44,7 @@
<artifactId>camel-core</artifactId>
</dependency>
+ <!-- TODO: we should avoid spring dependency and have some plugin/spi -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
@@ -52,17 +53,17 @@
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-annotations</artifactId>
- <version>1.3.7</version>
+ <version>${swagger-version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-jaxrs_2.10</artifactId>
- <version>1.3.7</version>
+ <version>${swagger-version}</version>
</dependency>
<dependency>
<groupId>com.wordnik</groupId>
<artifactId>swagger-servlet_2.10</artifactId>
- <version>1.3.7</version>
+ <version>${swagger-version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/components/camel-swagger/src/test/java/org/apache/camel/component/swagger/RestSwaggerReaderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger/src/test/java/org/apache/camel/component/swagger/RestSwaggerReaderTest.java b/components/camel-swagger/src/test/java/org/apache/camel/component/swagger/RestSwaggerReaderTest.java
index d1be9c9..95b4da8 100644
--- a/components/camel-swagger/src/test/java/org/apache/camel/component/swagger/RestSwaggerReaderTest.java
+++ b/components/camel-swagger/src/test/java/org/apache/camel/component/swagger/RestSwaggerReaderTest.java
@@ -61,9 +61,13 @@ public class RestSwaggerReaderTest extends CamelTestSupport {
ApiListing listing = option.get();
assertNotNull(listing);
- System.out.println(listing);
String json = JsonSerializer.asJson(listing);
- System.out.println(json);
+ log.info(json);
+
+ assertTrue(json.contains("\"basePath\":\"http://localhost:8080/api\""));
+ assertTrue(json.contains("\"resourcePath\":\"/hello\""));
+ assertTrue(json.contains("\"method\":\"GET\""));
+ assertTrue(json.contains("\"nickname\":\"getHelloHi\""));
context.stop();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/components/camel-swagger/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-swagger/src/test/resources/log4j.properties b/components/camel-swagger/src/test/resources/log4j.properties
index 89fc1bd..fc97cab 100644
--- a/components/camel-swagger/src/test/resources/log4j.properties
+++ b/components/camel-swagger/src/test/resources/log4j.properties
@@ -21,9 +21,8 @@
log4j.rootLogger=INFO, file
# uncomment the following to enable camel debugging
-#log4j.logger.org.apache.camel.component.ahc=TRACE
-#log4j.logger.org.apache.camel.util.jsse=DEBUG
-#log4j.logger.com.ning=TRACE
+#log4j.logger.org.apache.camel.component.swagger=TRACE
+#log4j.logger.com.wordnik.swagger=DEBUG
# CONSOLE appender not used by default
log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -35,7 +34,7 @@ log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%
# File appender
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.file=target/camel-ahc-test.log
+log4j.appender.file.file=target/camel-swagger-test.log
log4j.appender.file.append=true
log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
# MDC
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index 4894ef0..bc980a4 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -190,6 +190,7 @@
<module>camel-stream</module>
<module>camel-stringtemplate</module>
<module>camel-syslog</module>
+ <module>camel-swagger</module>
<module>camel-tagsoup</module>
<module>camel-twitter</module>
<module>camel-urlrewrite</module>
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties b/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
index e822239..ed9a8f1 100755
--- a/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
+++ b/examples/camel-example-servlet-rest-tomcat/src/main/resources/log4j.properties
@@ -19,8 +19,9 @@
log4j.rootLogger=INFO, console
# settings for specific packages
-log4j.logger.com.wordnik.swagger=DEBUG
+#log4j.logger.com.wordnik.swagger=DEBUG
#log4j.logger.org.apache.camel.component.servlet=DEBUG
+#log4j.logger.org.apache.camel.component.swagger=DEBUG
#log4j.logger.org.apache.camel=DEBUG
# Console appender
http://git-wip-us.apache.org/repos/asf/camel/blob/a53b2da7/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index bde5978..38ae8ed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -402,6 +402,7 @@
<spymemcached-version>2.8.4</spymemcached-version>
<sshd-version>0.11.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
+ <swagger-version>1.3.7</swagger-version>
<stax-api-version>1.0.1</stax-api-version>
<stax2-api-bundle-version>3.1.4</stax2-api-bundle-version>
<stringtemplate-bundle-version>4.0.2_2</stringtemplate-bundle-version>
@@ -1269,6 +1270,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-swagger</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-tagsoup</artifactId>
<version>${project.version}</version>
</dependency>