You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/06/20 09:47:40 UTC
svn commit: r956325 - in /camel/trunk:
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/
components/camel-jetty/src/test/java/org/apache/camel/component/jetty/
components/camel-jpa/src/test/java/org/apache/camel/component/...
Author: ningjiang
Date: Sun Jun 20 07:47:39 2010
New Revision: 956325
URL: http://svn.apache.org/viewvc?rev=956325&view=rev
Log:
Fixed some CS error and warnning
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
camel/trunk/examples/camel-example-management/src/test/java/org/apache/camel/example/management/ManagementExampleTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Sun Jun 20 07:47:39 2010
@@ -17,6 +17,8 @@
package org.apache.camel.component.cxf.soap.headers;
+
+
import java.io.StringReader;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
@@ -34,9 +36,9 @@ import javax.xml.ws.BindingProvider;
import javax.xml.ws.Endpoint;
import javax.xml.ws.Holder;
-import org.junit.Ignore;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -60,6 +62,7 @@ import org.apache.cxf.message.MessageCon
import org.apache.cxf.outofband.header.OutofBandHeader;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -71,7 +74,6 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
-
/**
* This test suite verifies message header filter features
*
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java Sun Jun 20 07:47:39 2010
@@ -57,9 +57,8 @@ public class JettyEnableJmxTest extends
releaseMBeanServers();
super.setUp();
mbsc = getMBeanConnection();
- }
+ }
- @SuppressWarnings("unchecked")
@Test
public void testEnableJmxProperty() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -78,7 +77,6 @@ public class JettyEnableJmxTest extends
assertEquals("Could not find 2 Jetty Server: " + s, 2, s.size());
}
- @SuppressWarnings("unchecked")
@Test
public void testShutdown() throws Exception {
Set<ObjectName> s = mbsc.queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null);
@@ -90,7 +88,6 @@ public class JettyEnableJmxTest extends
assertEquals("Could not find 0 Jetty Server: " + s, 0, s.size());
}
- @SuppressWarnings("unchecked")
@Test
public void testEndpointDisconnect() throws Exception {
Set<ObjectName> s = mbsc.queryNames(new ObjectName("org.eclipse.jetty.server:type=server,*"), null);
@@ -145,7 +142,6 @@ public class JettyEnableJmxTest extends
};
}
- @SuppressWarnings("unchecked")
protected void releaseMBeanServers() {
List<MBeanServer> servers = MBeanServerFactory.findMBeanServer(null);
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/component/jpa/JpaWithNamedQueryTest.java Sun Jun 20 07:47:39 2010
@@ -46,7 +46,7 @@ import org.springframework.orm.jpa.JpaTe
*/
public class JpaWithNamedQueryTest extends Assert {
- protected final transient Log LOG = LogFactory.getLog(this.getClass());
+ protected static final transient Log LOG = LogFactory.getLog(JpaWithNamedQueryTest.class);
protected CamelContext camelContext = new DefaultCamelContext();
protected ProducerTemplate template;
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlRouteTest.java Sun Jun 20 07:47:39 2010
@@ -156,13 +156,13 @@ public class SqlRouteTest extends CamelT
public void testHashesInQuery() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody("direct:no-param-insert", "GPL");
+ template.sendBody("direct:no-param-insert", "XGPL");
mock.assertIsSatisfied();
Number received = assertIsInstanceOf(Number.class, mock.getReceivedExchanges().get(0).getIn().getHeader(SqlConstants.SQL_UPDATE_COUNT));
assertEquals(1, received.intValue());
Map projectNameInserted = jdbcTemplate.queryForMap("select project, license from projects where id = 5");
assertEquals("#", projectNameInserted.get("PROJECT"));
- assertEquals("GPL", projectNameInserted.get("LICENSE"));
+ assertEquals("XGPL", projectNameInserted.get("LICENSE"));
}
@Test
Modified: camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java (original)
+++ camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityDataFormatTest.java Sun Jun 20 07:47:39 2010
@@ -18,7 +18,6 @@ package org.apache.camel.dataformat.xmls
import java.io.ByteArrayInputStream;
import java.io.InputStream;
-import java.io.StringWriter;
import org.w3c.dom.Document;
import org.w3c.dom.NodeList;
@@ -27,12 +26,12 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.converter.jaxp.XmlConverter;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.xml.security.encryption.XMLCipher;
-import org.apache.xml.serialize.OutputFormat;
-import org.apache.xml.serialize.XMLSerializer;
import org.junit.Test;
+
/**
* Unit test of the encryptXML data format.
*/
@@ -233,10 +232,8 @@ public class XMLSecurityDataFormatTest e
Document d = createDocumentfromInputStream(new ByteArrayInputStream(body));
// write to a string
- StringWriter sw = new StringWriter();
- XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(d));
- ser.serialize(d.getDocumentElement());
- String xmlStr = sw.toString();
+ XmlConverter converter = new XmlConverter();
+ String xmlStr = converter.toString(d, exchange);
System.out.println("\n\nIn EncryptedXMLMessageProcessor:" + xmlStr);
NodeList nodeList = d.getElementsByTagNameNS("http://www.w3.org/2001/04/xmlenc#", "EncryptedData");
@@ -256,10 +253,9 @@ public class XMLSecurityDataFormatTest e
Document d = createDocumentfromInputStream(new ByteArrayInputStream(body));
// write to a string
- StringWriter sw = new StringWriter();
- XMLSerializer ser = new XMLSerializer(sw, new OutputFormat(d));
- ser.serialize(d.getDocumentElement());
- String xmlStr = sw.toString();
+ XmlConverter converter = new XmlConverter();
+ String xmlStr = converter.toString(d, exchange);
+
System.out.println("\n\nIn DecryptedXMLMessageProcessor:" + xmlStr);
NodeList nodeList = d.getElementsByTagNameNS("http://www.w3.org/2001/04/xmlenc#", "EncryptedData");
Modified: camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java (original)
+++ camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/Client.java Sun Jun 20 07:47:39 2010
@@ -43,7 +43,7 @@ public final class Client {
File wsdlFile = new File(wsdlLocation);
if (wsdlFile.exists()) {
- wsdlURL = wsdlFile.toURL();
+ wsdlURL = wsdlFile.toURI().toURL();
} else {
wsdlURL = new URL(wsdlLocation);
}
Modified: camel/trunk/examples/camel-example-management/src/test/java/org/apache/camel/example/management/ManagementExampleTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-management/src/test/java/org/apache/camel/example/management/ManagementExampleTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-management/src/test/java/org/apache/camel/example/management/ManagementExampleTest.java (original)
+++ camel/trunk/examples/camel-example-management/src/test/java/org/apache/camel/example/management/ManagementExampleTest.java Sun Jun 20 07:47:39 2010
@@ -35,7 +35,6 @@ public class ManagementExampleTest exten
}
@Test
- @SuppressWarnings("unchecked")
public void testManagementExample() throws Exception {
// Give it a bit of time to run
Thread.sleep(2000);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java?rev=956325&r1=956324&r2=956325&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncTest.java Sun Jun 20 07:47:39 2010
@@ -53,7 +53,8 @@ public class HttpAsyncTest extends Camel
// (waiting if needed) and then return a string body response.
// This allows us to do this in a single code line instead of using the
// JDK Future API to get hold of it, but you can also use that if you want
- String response = template.extractFutureBody(future, String.class);
+ // Adding the (String) To make the CS happy
+ String response = (String) template.extractFutureBody(future, String.class);
assertEquals("Bye World", response);
assertMockEndpointsSatisfied();