camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/4] camel git commit: Polished
Date Wed, 16 Dec 2015 07:14:50 GMT
Polished


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35b55e25
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35b55e25
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35b55e25

Branch: refs/heads/camel-2.16.x
Commit: 35b55e257338cae43ac3a3e1df48db316c721306
Parents: b4aa854
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Dec 16 08:12:54 2015 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Dec 16 08:14:35 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/35b55e25/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/35b55e25/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);
     }


Mime
View raw message