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 2015/12/16 08:14:48 UTC
[2/4] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e3aa8ae4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e3aa8ae4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e3aa8ae4
Branch: refs/heads/master
Commit: e3aa8ae42160dd5801e979f05f1d0ceb733b492e
Parents: c96a7c8
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Dec 16 08:12:54 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 16 08:12:54 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/model/rest/RestConfigurationDefinition.java | 2 +-
.../org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e3aa8ae4/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
index 155a513..5dc4804 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestConfigurationDefinition.java
@@ -600,7 +600,7 @@ public class RestConfigurationDefinition {
}
/**
- * For additional configuration options on data format level
+ * For configuring an api property, such as <tt>api.title</tt>, or <tt>api.version</tt>.
*/
public RestConfigurationDefinition apiProperty(String key, String value) {
RestPropertyDefinition prop = new RestPropertyDefinition();
http://git-wip-us.apache.org/repos/asf/camel/blob/e3aa8ae4/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
index 373db45..7b0f5df 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/SwaggerRestApiProcessorFactory.java
@@ -50,7 +50,9 @@ public class SwaggerRestApiProcessorFactory implements RestApiProcessorFactory {
}
// and context path is the base.path
String path = configuration.getContextPath();
- options.put("base.path", path);
+ if (path != null) {
+ options.put("base.path", path);
+ }
return new RestSwaggerProcessor(contextIdPattern, contextIdListing, options);
}