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/10/10 10:02:16 UTC
[1/2] camel git commit: CAMEL-9205: cors headers should use set and
not add to avoid multi values.
Repository: camel
Updated Branches:
refs/heads/master ae9281b6a -> 44d676b18
CAMEL-9205: cors headers should use set and not add to avoid multi values.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f38e9cd3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f38e9cd3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f38e9cd3
Branch: refs/heads/master
Commit: f38e9cd3cd084a73b1cf1cf528308f527bcb9f9c
Parents: ae9281b
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 10 09:49:36 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 10 09:49:36 2015 +0200
----------------------------------------------------------------------
.../camel/swagger/RestApiResponseAdapter.java | 3 +++
.../servlet/ServletRestApiResponseAdapter.java | 3 ++-
.../RestSwaggerApiDeclarationServlet.scala | 18 +++++++++---------
3 files changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f38e9cd3/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
index 9a64140..8bf685e 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
@@ -20,6 +20,9 @@ import java.io.IOException;
public interface RestApiResponseAdapter {
+ /**
+ * Sets a header (do not add multiple values)
+ */
void addHeader(String name, String value);
void writeBytes(byte[] bytes) throws IOException;
http://git-wip-us.apache.org/repos/asf/camel/blob/f38e9cd3/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
index 5c022c3..2bbf478 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
@@ -31,7 +31,8 @@ public class ServletRestApiResponseAdapter implements RestApiResponseAdapter {
@Override
public void addHeader(String name, String value) {
- response.addHeader(name, value);
+ // use set header to avoid adding the same value multiple times (the method should have been named setHeader really)
+ response.setHeader(name, value);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/f38e9cd3/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerApiDeclarationServlet.scala
----------------------------------------------------------------------
diff --git a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerApiDeclarationServlet.scala b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerApiDeclarationServlet.scala
index c267816..117f787 100644
--- a/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerApiDeclarationServlet.scala
+++ b/components/camel-swagger/src/main/scala/org/apache/camel/component/swagger/RestSwaggerApiDeclarationServlet.scala
@@ -170,9 +170,9 @@ abstract class RestSwaggerApiDeclarationServlet extends HttpServlet {
LOG.trace("renderCamelContexts")
if (cors) {
- response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
- response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
- response.addHeader("Access-Control-Allow-Origin", "*")
+ response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
+ response.setHeader("Access-Control-Allow-Origin", "*")
}
val contexts = findCamelContexts()
@@ -198,9 +198,9 @@ abstract class RestSwaggerApiDeclarationServlet extends HttpServlet {
val headers = Map[String, List[String]]()
if (cors) {
- response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
- response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
- response.addHeader("Access-Control-Allow-Origin", "*")
+ response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
+ response.setHeader("Access-Control-Allow-Origin", "*")
}
val rests = getRestDefinitions(contextId)
@@ -241,9 +241,9 @@ abstract class RestSwaggerApiDeclarationServlet extends HttpServlet {
val pathPart = docRoot
if (cors) {
- response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
- response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
- response.addHeader("Access-Control-Allow-Origin", "*")
+ response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers")
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH")
+ response.setHeader("Access-Control-Allow-Origin", "*")
}
val rests = getRestDefinitions(contextId)
[2/2] camel git commit: CAMEL-9205: cors headers should use set and
not add to avoid multi values.
Posted by da...@apache.org.
CAMEL-9205: cors headers should use set and not add to avoid multi values.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/44d676b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/44d676b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/44d676b1
Branch: refs/heads/master
Commit: 44d676b18ffd7c3253c2652e1849c7aeb56331dc
Parents: f38e9cd
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Oct 10 10:01:58 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Oct 10 10:01:58 2015 +0200
----------------------------------------------------------------------
.../swagger/ExchangeRestApiResponseAdapter.java | 2 +-
.../camel/swagger/RestApiResponseAdapter.java | 5 +----
.../camel/swagger/RestSwaggerSupport.java | 21 ++++++++++----------
.../servlet/ServletRestApiResponseAdapter.java | 2 +-
4 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/44d676b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/ExchangeRestApiResponseAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/ExchangeRestApiResponseAdapter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/ExchangeRestApiResponseAdapter.java
index e6e911b..b5fccd8 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/ExchangeRestApiResponseAdapter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/ExchangeRestApiResponseAdapter.java
@@ -29,7 +29,7 @@ public class ExchangeRestApiResponseAdapter implements RestApiResponseAdapter {
}
@Override
- public void addHeader(String name, String value) {
+ public void setHeader(String name, String value) {
exchange.getIn().setHeader(name, value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/44d676b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
index 8bf685e..2dc7dd8 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestApiResponseAdapter.java
@@ -20,10 +20,7 @@ import java.io.IOException;
public interface RestApiResponseAdapter {
- /**
- * Sets a header (do not add multiple values)
- */
- void addHeader(String name, String value);
+ void setHeader(String name, String value);
void writeBytes(byte[] bytes) throws IOException;
http://git-wip-us.apache.org/repos/asf/camel/blob/44d676b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index e7de20d..ec4b41a 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -34,7 +34,6 @@ import io.swagger.models.Info;
import io.swagger.models.License;
import io.swagger.models.Swagger;
import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultClassResolver;
import org.apache.camel.model.ModelHelper;
import org.apache.camel.model.rest.RestDefinition;
import org.apache.camel.model.rest.RestsDefinition;
@@ -172,14 +171,14 @@ public class RestSwaggerSupport {
LOG.trace("renderResourceListing");
if (cors) {
- response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
- response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
- response.addHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
+ response.setHeader("Access-Control-Allow-Origin", "*");
}
List<RestDefinition> rests = getRestDefinitions(contextId);
if (rests != null) {
- response.addHeader(Exchange.CONTENT_TYPE, "application/json");
+ response.setHeader(Exchange.CONTENT_TYPE, "application/json");
// read the rest-dsl into swagger model
Swagger swagger = reader.read(rests, route, swaggerConfig, contextId, classResolver);
@@ -190,7 +189,7 @@ public class RestSwaggerSupport {
byte[] bytes = mapper.writeValueAsBytes(swagger);
int len = bytes.length;
- response.addHeader(Exchange.CONTENT_LENGTH, "" + len);
+ response.setHeader(Exchange.CONTENT_LENGTH, "" + len);
response.writeBytes(bytes);
} else {
@@ -205,12 +204,12 @@ public class RestSwaggerSupport {
LOG.trace("renderCamelContexts");
if (cors) {
- response.addHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
- response.addHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
- response.addHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
+ response.setHeader("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH");
+ response.setHeader("Access-Control-Allow-Origin", "*");
}
- response.addHeader(Exchange.CONTENT_TYPE, "application/json");
+ response.setHeader(Exchange.CONTENT_TYPE, "application/json");
StringBuffer sb = new StringBuffer();
@@ -245,7 +244,7 @@ public class RestSwaggerSupport {
sb.append("\n]");
int len = sb.length();
- response.addHeader(Exchange.CONTENT_LENGTH, "" + len);
+ response.setHeader(Exchange.CONTENT_LENGTH, "" + len);
response.writeBytes(sb.toString().getBytes());
}
http://git-wip-us.apache.org/repos/asf/camel/blob/44d676b1/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
index 2bbf478..8ec490d 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/servlet/ServletRestApiResponseAdapter.java
@@ -30,7 +30,7 @@ public class ServletRestApiResponseAdapter implements RestApiResponseAdapter {
}
@Override
- public void addHeader(String name, String value) {
+ public void setHeader(String name, String value) {
// use set header to avoid adding the same value multiple times (the method should have been named setHeader really)
response.setHeader(name, value);
}