Author: bvahdat
Date: Wed Aug 29 13:22:42 2012
New Revision: 1378534
URL: http://svn.apache.org/viewvc?rev=1378534&view=rev
Log:
Polished.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeURIResolverTest.java
camel/trunk/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbException.java
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbChangesetTrackerTest.java
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbProducerTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeURIResolverTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeURIResolverTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeURIResolverTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/xslt/XsltCustomizeURIResolverTest.java
Wed Aug 29 13:22:42 2012
@@ -27,16 +27,12 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
*
*/
public class XsltCustomizeURIResolverTest extends ContextTestSupport {
- private static final transient Logger LOG =
LoggerFactory.getLogger(XsltCustomizeURIResolverTest.class);
-
private static final String EXPECTED_XML_CONSTANT = "<data>FOO
DATA</data>";
public void testXsltCustomURIResolverDirectInRouteUri() throws Exception {
Modified:
camel/trunk/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbException.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbException.java
(original)
+++
camel/trunk/components/camel-couchdb/src/main/java/org/apache/camel/component/couchdb/CouchDbException.java
Wed Aug 29 13:22:42 2012
@@ -21,6 +21,8 @@ import org.apache.camel.Exchange;
public class CouchDbException extends CamelExchangeException {
+ private static final long serialVersionUID = 1L;
+
public CouchDbException(String message, Exchange exchange) {
super(message, exchange);
}
Modified:
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbChangesetTrackerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbChangesetTrackerTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbChangesetTrackerTest.java
(original)
+++
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbChangesetTrackerTest.java
Wed Aug 29 13:22:42 2012
@@ -31,7 +31,6 @@ import org.mockito.runners.MockitoJUnitR
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.endsWith;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks;
Modified:
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbProducerTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbProducerTest.java
(original)
+++
camel/trunk/components/camel-couchdb/src/test/java/org/apache/camel/component/couchdb/CouchDbProducerTest.java
Wed Aug 29 13:22:42 2012
@@ -60,6 +60,7 @@ public class CouchDbProducerTest {
when(exchange.getIn()).thenReturn(msg);
}
+ @SuppressWarnings("unchecked")
@Test(expected = InvalidPayloadException.class)
public void testBodyMandatory() throws Exception {
when(msg.getMandatoryBody()).thenThrow(InvalidPayloadException.class);
@@ -87,6 +88,7 @@ public class CouchDbProducerTest {
verify(msg).setHeader(CouchDbConstants.HEADER_DOC_REV, rev);
}
+ @SuppressWarnings("unchecked")
@Test(expected = InvalidPayloadException.class)
public void testNullSaveResponseThrowsError() throws Exception {
when(exchange.getIn().getMandatoryBody()).thenThrow(InvalidPayloadException.class);
@@ -97,11 +99,11 @@ public class CouchDbProducerTest {
@Test
public void testStringBodyIsConvertedToJsonTree() throws Exception {
when(msg.getMandatoryBody()).thenReturn("{ \"name\" : \"coldplay\" }");
- when(client.save(anyObject())).thenAnswer(new Answer() {
+ when(client.save(anyObject())).thenAnswer(new Answer<Response>() {
@Override
- public Object answer(InvocationOnMock invocation) throws Throwable
{
- assertTrue(invocation.getArguments()[0].getClass() + " but
wanted " + JsonObject.class,
+ public Response answer(InvocationOnMock invocation) throws
Throwable {
+ assertTrue(invocation.getArguments()[0].getClass() + " but
wanted " + JsonElement.class,
invocation.getArguments()[0] instanceof JsonElement);
return new Response();
}
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanAndIoCTest.java
Wed Aug 29 13:22:42 2012
@@ -20,6 +20,7 @@ import org.apache.camel.component.cxf.CX
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
@@ -45,7 +46,7 @@ public class CxfBeanWithWsdlLocationInBe
+ "<soap:Body><GetPerson
xmlns=\"http://camel.apache.org/wsdl-first/types\";>"
+
"<personId>hello</personId></GetPerson></soap:Body></soap:Envelope>";
- StringEntity entity = new StringEntity(body, "text/xml", "ISO-8859-1");
+ StringEntity entity = new StringEntity(body,
ContentType.create("text/xml", "ISO-8859-1"));
post.setEntity(entity);
HttpClient httpclient = new DefaultHttpClient();
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanWithWsdlLocationInBeanTest.java
Wed Aug 29 13:22:42 2012
@@ -20,6 +20,7 @@ import org.apache.camel.component.cxf.CX
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
@@ -44,7 +45,7 @@ public class CxfBeanWithWsdlLocationInBe
+ "<soap:Body><GetPerson
xmlns=\"http://camel.apache.org/wsdl-first/types\";>"
+
"<personId>hello</personId></GetPerson></soap:Body></soap:Envelope>";
- StringEntity entity = new StringEntity(body, "text/xml", "ISO-8859-1");
+ StringEntity entity = new StringEntity(body,
ContentType.create("text/xml", "ISO-8859-1"));
post.setEntity(entity);
HttpClient httpclient = new DefaultHttpClient();
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
Wed Aug 29 13:22:42 2012
@@ -34,7 +34,6 @@ import org.apache.camel.component.file.F
import org.apache.camel.component.file.GenericFile;
import org.apache.camel.component.file.GenericFileEndpoint;
import org.apache.camel.component.file.GenericFileExist;
-import org.apache.camel.component.file.GenericFileMessage;
import org.apache.camel.component.file.GenericFileOperationFailedException;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
@@ -139,7 +138,7 @@ public class FtpOperations implements Re
// must set soTimeout after connect
if (endpoint instanceof FtpEndpoint) {
- FtpEndpoint ftpEndpoint = (FtpEndpoint) endpoint;
+ FtpEndpoint<?> ftpEndpoint = (FtpEndpoint<?>) endpoint;
if (ftpEndpoint.getSoTimeout() > 0) {
log.trace("Using SoTimeout=" + ftpEndpoint.getSoTimeout());
try {
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpChangedExclusiveReadLockStrategy.java
Wed Aug 29 13:22:42 2012
@@ -25,7 +25,6 @@ import org.apache.camel.component.file.G
import org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy;
import org.apache.camel.component.file.GenericFileOperations;
import org.apache.camel.util.StopWatch;
-import org.apache.commons.net.ftp.FTPFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
(original)
+++
camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/strategy/SftpProcessStrategyFactory.java
Wed Aug 29 13:22:42 2012
@@ -35,7 +35,6 @@ public final class SftpProcessStrategyFa
private SftpProcessStrategyFactory() {
}
- @SuppressWarnings("unchecked")
public static GenericFileProcessStrategy<ChannelSftp.LsEntry>
createGenericFileProcessStrategy(CamelContext context, Map<String, Object>
params) {
// We assume a value is present only if its value not null for String
and 'true' for boolean
@@ -48,7 +47,7 @@ public final class SftpProcessStrategyFa
if (isDelete) {
GenericFileDeleteProcessStrategy<ChannelSftp.LsEntry> strategy =
new GenericFileDeleteProcessStrategy<ChannelSftp.LsEntry>();
-
strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<ChannelSftp.LsEntry>)
getExclusiveReadLockStrategy(params));
+
strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (preMoveExpression != null) {
GenericFileExpressionRenamer<ChannelSftp.LsEntry> renamer =
new GenericFileExpressionRenamer<ChannelSftp.LsEntry>();
renamer.setExpression(preMoveExpression);
@@ -62,7 +61,7 @@ public final class SftpProcessStrategyFa
return strategy;
} else if (isMove || isNoop) {
GenericFileRenameProcessStrategy<ChannelSftp.LsEntry> strategy =
new GenericFileRenameProcessStrategy<ChannelSftp.LsEntry>();
-
strategy.setExclusiveReadLockStrategy((GenericFileExclusiveReadLockStrategy<ChannelSftp.LsEntry>)
getExclusiveReadLockStrategy(params));
+
strategy.setExclusiveReadLockStrategy(getExclusiveReadLockStrategy(params));
if (!isNoop && moveExpression != null) {
// move on commit is only possible if not noop
GenericFileExpressionRenamer<ChannelSftp.LsEntry> renamer =
new GenericFileExpressionRenamer<ChannelSftp.LsEntry>();
@@ -90,7 +89,7 @@ public final class SftpProcessStrategyFa
}
}
- @SuppressWarnings({"unchecked", "rawtypes"})
+ @SuppressWarnings("unchecked")
private static GenericFileExclusiveReadLockStrategy<ChannelSftp.LsEntry>
getExclusiveReadLockStrategy(Map<String, Object> params) {
GenericFileExclusiveReadLockStrategy<ChannelSftp.LsEntry> strategy =
(GenericFileExclusiveReadLockStrategy<ChannelSftp.LsEntry>)
params.get("exclusiveReadLockStrategy");
if (strategy != null) {
Modified:
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
(original)
+++
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpProducer.java
Wed Aug 29 13:22:42 2012
@@ -52,6 +52,7 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.methods.HttpRequestBase;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.entity.ByteArrayEntity;
+import org.apache.http.entity.ContentType;
import org.apache.http.entity.FileEntity;
import org.apache.http.entity.InputStreamEntity;
import org.apache.http.entity.StringEntity;
@@ -424,7 +425,7 @@ public class HttpProducer extends Defaul
// file based (could potentially also be a FTP file
etc)
File file = in.getBody(File.class);
if (file != null) {
- answer = new FileEntity(file, contentType);
+ answer = new FileEntity(file,
ContentType.parse(contentType));
}
} else if (data instanceof String) {
// be a bit careful with String as any type can most
likely be converted to String
Modified:
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
(original)
+++
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoHeadersWithSameKeyTest.java
Wed Aug 29 13:22:42 2012
@@ -29,7 +29,6 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.StringEntity;
import org.apache.http.localserver.LocalTestServer;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.junit.Test;
@@ -77,7 +76,7 @@ public class HttpProducerTwoHeadersWithS
response.setHeader("bar", "yes");
response.addHeader("foo", "123");
response.addHeader("foo", "456");
- response.setEntity(new StringEntity("OK", HTTP.ASCII));
+ response.setEntity(new StringEntity("OK", "ASCII"));
response.setStatusCode(HttpStatus.SC_OK);
}
});
Modified:
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
(original)
+++
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerTwoParametersWithSameKeyTest.java
Wed Aug 29 13:22:42 2012
@@ -26,7 +26,6 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.StringEntity;
import org.apache.http.localserver.LocalTestServer;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.junit.Test;
@@ -63,7 +62,7 @@ public class HttpProducerTwoParametersWi
response.setHeader("bar", "yes");
response.addHeader("foo", "123");
response.addHeader("foo", "456");
- response.setEntity(new StringEntity("OK", HTTP.ASCII));
+ response.setEntity(new StringEntity("OK", "ASCII"));
response.setStatusCode(HttpStatus.SC_OK);
}
});
Modified:
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
(original)
+++
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
Wed Aug 29 13:22:42 2012
@@ -42,7 +42,6 @@ import org.apache.http.client.HttpClient
import org.apache.http.conn.params.ConnRoutePNames;
import org.apache.http.localserver.LocalTestServer;
import org.apache.http.protocol.BasicHttpProcessor;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.ResponseContent;
import org.junit.After;
@@ -225,10 +224,10 @@ public class HttpProxyServerTest extends
String authscheme = auth.substring(0, i);
if (authscheme.equalsIgnoreCase("basic")) {
String s = auth.substring(i + 1).trim();
- byte[] credsRaw = s.getBytes(HTTP.ASCII);
+ byte[] credsRaw = s.getBytes("ASCII");
BinaryDecoder codec = new Base64();
try {
- String creds = new String(codec.decode(credsRaw),
HTTP.ASCII);
+ String creds = new String(codec.decode(credsRaw),
"ASCII");
context.setAttribute("proxy-creds", creds);
} catch (DecoderException ex) {
throw new ProtocolException("Malformed BASIC
credentials");
Modified:
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
(original)
+++
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/handler/BasicValidationHandler.java
Wed Aug 29 13:22:42 2012
@@ -27,7 +27,6 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.apache.http.util.EntityUtils;
@@ -81,7 +80,7 @@ public class BasicValidationHandler impl
response.setStatusCode(HttpStatus.SC_OK);
if (responseContent != null) {
- response.setEntity(new StringEntity(responseContent, HTTP.ASCII));
+ response.setEntity(new StringEntity(responseContent, "ASCII"));
}
}
Modified:
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
(original)
+++
camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
Wed Aug 29 13:22:42 2012
@@ -194,8 +194,8 @@ public abstract class XQueryBuilder impl
initialize(exchange);
StringWriter buffer = new StringWriter();
- SequenceIterator iter =
getExpression().iterator(createDynamicContext(exchange));
- for (Item item = iter.next(); item != null; item = iter.next()) {
+ SequenceIterator<?> iter =
getExpression().iterator(createDynamicContext(exchange));
+ for (Item<?> item = iter.next(); item != null; item = iter.next()) {
buffer.append(item.getStringValueCS());
}
@@ -463,7 +463,7 @@ public abstract class XQueryBuilder impl
DynamicQueryContext dynamicQueryContext = new
DynamicQueryContext(config);
Message in = exchange.getIn();
- Item item = null;
+ Item<?> item = null;
if (ObjectHelper.isNotEmpty(getHeaderName())) {
item = in.getHeader(getHeaderName(), Item.class);
} else {
Modified:
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java
(original)
+++
camel/trunk/components/camel-test-blueprint/src/test/java/org/apache/camel/test/blueprint/FilterTest.java
Wed Aug 29 13:22:42 2012
@@ -20,7 +20,6 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Ignore;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
(original)
+++
camel/trunk/components/camel-twitter/src/main/java/org/apache/camel/component/twitter/consumer/streaming/FilterConsumer.java
Wed Aug 29 13:22:42 2012
@@ -19,7 +19,6 @@ package org.apache.camel.component.twitt
import org.apache.camel.component.twitter.TwitterEndpoint;
import twitter4j.FilterQuery;
-import twitter4j.TwitterException;
/**
* Consumes the filter stream
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4EndpointTest.java
Wed Aug 29 13:22:42 2012
@@ -22,12 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.http.Consts;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.junit.AfterClass;
@@ -59,7 +59,7 @@ public class Http4EndpointTest extends A
public void handle(HttpRequest request, HttpResponse response,
HttpContext context) throws HttpException, IOException {
response.setStatusCode(HttpStatus.SC_OK);
- response.setEntity(new StringEntity("OK", HTTP.ISO_8859_1));
+ response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
}
});
localServer.start();
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java?rev=1378534&r1=1378533&r2=1378534&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/Http4MaxConnectionPerHostTest.java
Wed Aug 29 13:22:42 2012
@@ -22,12 +22,12 @@ import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.http.Consts;
import org.apache.http.HttpException;
import org.apache.http.HttpRequest;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.entity.StringEntity;
-import org.apache.http.protocol.HTTP;
import org.apache.http.protocol.HttpContext;
import org.apache.http.protocol.HttpRequestHandler;
import org.junit.AfterClass;
@@ -58,7 +58,7 @@ public class Http4MaxConnectionPerHostTe
public void handle(HttpRequest request, HttpResponse response,
HttpContext context) throws HttpException, IOException {
response.setStatusCode(HttpStatus.SC_OK);
- response.setEntity(new StringEntity("OK", HTTP.ISO_8859_1));
+ response.setEntity(new StringEntity("OK", Consts.ISO_8859_1));
}
});
localServer.start();
