Author: wtam
Date: Sun Jun 14 14:25:24 2009
New Revision: 784565
URL: http://svn.apache.org/viewvc?rev=784565&view=rev
Log:
change option name from 'uriPatterns' to 'restletUriPatterns' to be consistent.
clean up constant names
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConstants.java
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/DefaultRestletBinding.java
Sun Jun 14 14:25:24 2009
@@ -65,7 +65,7 @@
// copy query string to header
String query = request.getResourceRef().getQuery();
if (query != null) {
- inMessage.setHeader(RestletConstants.RESTLET_QUERY_STRING, query);
+ inMessage.setHeader(Exchange.HTTP_QUERY, query);
}
// copy URI to header
@@ -162,7 +162,7 @@
}
// get content type
- MediaType mediaType =
out.getHeader(RestletConstants.RESTLET_MEDIA_TYPE, MediaType.class);
+ MediaType mediaType = out.getHeader(Exchange.CONTENT_TYPE,
MediaType.class);
if (mediaType == null) {
Object body = out.getBody();
mediaType = MediaType.TEXT_PLAIN;
@@ -174,7 +174,7 @@
}
// get response code
- Integer responseCode =
out.getHeader(RestletConstants.RESTLET_RESPONSE_CODE, Integer.class);
+ Integer responseCode = out.getHeader(Exchange.HTTP_RESPONSE_CODE,
Integer.class);
if (responseCode != null) {
response.setStatus(Status.valueOf(responseCode));
}
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletComponent.java
Sun Jun 14 14:25:24 2009
@@ -110,8 +110,8 @@
attachUriPatternToRestlet(endpoint.getUriPattern(), endpoint,
consumer.getRestlet());
}
- if (endpoint.getUriPatterns() != null) {
- for (String uriPattern : endpoint.getUriPatterns()) {
+ if (endpoint.getRestletUriPatterns() != null) {
+ for (String uriPattern : endpoint.getRestletUriPatterns()) {
attachUriPatternToRestlet(uriPattern, endpoint,
consumer.getRestlet());
}
}
@@ -126,8 +126,8 @@
routers.add(getMethodRouter(endpoint.getUriPattern()));
}
- if (endpoint.getUriPatterns() != null) {
- for (String uriPattern : endpoint.getUriPatterns()) {
+ if (endpoint.getRestletUriPatterns() != null) {
+ for (String uriPattern : endpoint.getRestletUriPatterns()) {
routers.add(getMethodRouter(uriPattern));
}
}
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConstants.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConstants.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConstants.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletConstants.java
Sun Jun 14 14:25:24 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.restlet;
-import org.apache.camel.Exchange;
-
/**
* Constants for Restlet component
*
@@ -27,9 +25,6 @@
public static final String RESTLET_LOGIN = "CamelRestletLogin";
public static final String RESTLET_PASSWORD = "CamelRestletPassword";
- public static final String RESTLET_MEDIA_TYPE = Exchange.CONTENT_TYPE;
- public static final String RESTLET_RESPONSE_CODE =
Exchange.HTTP_RESPONSE_CODE;
- public static final String RESTLET_QUERY_STRING = Exchange.HTTP_QUERY;
private RestletConstants() {
}
Modified:
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
(original)
+++
camel/trunk/components/camel-restlet/src/main/java/org/apache/camel/component/restlet/RestletEndpoint.java
Sun Jun 14 14:25:24 2009
@@ -55,8 +55,8 @@
private String uriPattern;
// Optional and for consumer only. This allows a single route to service
multiple
- // uriPatterns. The uriPattern defined in the endpoint will still be
honored.
- private List<String> uriPatterns;
+ // URI patterns. The URI pattern defined in the endpoint will still be
honored.
+ private List<String> restletUriPatterns;
private Map<String, String> restletRealm;
private HeaderFilterStrategy headerFilterStrategy;
@@ -199,17 +199,17 @@
}
/**
- * @param uriPatterns the uriPatterns to set
+ * @param restletUriPatterns the restletUriPatterns to set
*/
- public void setUriPatterns(List<String> uriPatterns) {
- this.uriPatterns = uriPatterns;
+ public void setRestletUriPatterns(List<String> restletUriPatterns) {
+ this.restletUriPatterns = restletUriPatterns;
}
/**
- * @return the uriPatterns
+ * @return the restletUriPatterns
*/
- public List<String> getUriPatterns() {
- return uriPatterns;
+ public List<String> getRestletUriPatterns() {
+ return restletUriPatterns;
}
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletFaultTest.java
Sun Jun 14 14:25:24 2009
@@ -38,8 +38,8 @@
public void configure() throws Exception {
from("restlet:http://localhost:9080/users/{username}?restletMethod=POST";).process(new
Processor() {
public void process(Exchange exchange) throws Exception {
-
exchange.getFault().setHeader(RestletConstants.RESTLET_RESPONSE_CODE, "404");
-
exchange.getFault().setHeader(RestletConstants.RESTLET_MEDIA_TYPE,
"text/plain");
+
exchange.getFault().setHeader(Exchange.HTTP_RESPONSE_CODE, "404");
+ exchange.getFault().setHeader(Exchange.CONTENT_TYPE,
"text/plain");
exchange.getFault().setBody("Application fault");
}
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletMultiUriTemplatesEndpointTest.java
Sun Jun 14 14:25:24 2009
@@ -86,7 +86,7 @@
public void configure() throws Exception {
// START SNIPPET: routeDefinition
-
from("restlet:http://localhost:9080?restletMethods=post,get&uriPatterns=#uriTemplates";)
+
from("restlet:http://localhost:9080?restletMethods=post,get&restletUriPatterns=#uriTemplates";)
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
// echo the method
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletQueryTest.java
Sun Jun 14 14:25:24 2009
@@ -45,7 +45,7 @@
class SetUserProcessor implements Processor {
public void process(Exchange exchange) throws Exception {
- assertEquals(QUERY_STRING,
exchange.getIn().getHeader(RestletConstants.RESTLET_QUERY_STRING,
String.class));
+ assertEquals(QUERY_STRING,
exchange.getIn().getHeader(Exchange.HTTP_QUERY, String.class));
}
}
Modified:
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java?rev=784565&r1=784564&r2=784565&view=diff
==============================================================================
---
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
(original)
+++
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletResponseTest.java
Sun Jun 14 14:25:24 2009
@@ -44,8 +44,8 @@
String userName =
exchange.getIn().getHeader("username", String.class);
assertNotNull("userName should not be null", userName);
exchange.getOut().setBody("{" + userName + "}");
-
exchange.getOut().setHeader(RestletConstants.RESTLET_RESPONSE_CODE, "417");
-
exchange.getOut().setHeader(RestletConstants.RESTLET_MEDIA_TYPE,
"application/JSON");
+
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, "417");
+ exchange.getOut().setHeader(Exchange.CONTENT_TYPE,
"application/JSON");
}
});
}
