Author: cmueller
Date: Sat Jun 18 21:24:27 2011
New Revision: 1137250
URL: http://svn.apache.org/viewvc?rev=1137250&view=rev
Log:
fixed a few critical issues spotted by Sonar:
https://analysis.apache.org/drilldown/violations/37401?priority=CRITICAL
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
Sat Jun 18 21:24:27 2011
@@ -392,11 +392,10 @@ public class XPathBuilder implements Exp
}
}
- if (xpathFactory == null) {
- LOG.debug("Creating default XPathFactory");
- xpathFactory = XPathFactory.newInstance();
- }
+ LOG.debug("Creating default XPathFactory");
+ xpathFactory = XPathFactory.newInstance();
}
+
return xpathFactory;
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java
Sat Jun 18 21:24:27 2011
@@ -77,8 +77,8 @@ public class LRUSoftCache<K, V> extends
@Override
public void putAll(Map<? extends K, ? extends V> map) {
// do not use entrySet but copy one by one
- for (K key : map.keySet()) {
- put(key, map.get(key));
+ for (Map.Entry<? extends K, ? extends V> entry : map.entrySet()) {
+ put(entry.getKey(), entry.getValue());
}
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
Sat Jun 18 21:24:27 2011
@@ -132,10 +132,10 @@ public class LRUSoftCacheTest extends Te
cache.put(1, "foo");
cache.put(2, "bar");
- Collection col = cache.values();
+ Collection<Object> col = cache.values();
assertEquals(2, col.size());
- Iterator it = col.iterator();
+ Iterator<Object> it = col.iterator();
assertEquals("foo", it.next());
assertEquals("bar", it.next());
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
Sat Jun 18 21:24:27 2011
@@ -210,7 +210,7 @@ public class BindyKeyValuePairFactory ex
if (obj != null) {
// Check mandatory field
- if (keyValuePairField.required() && values == null) {
+ if (keyValuePairField.required()) {
throw new IllegalArgumentException("The mandatory
key/tag : " + key + " has not been defined !");
}
Modified:
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
(original)
+++
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/component/crypto/DigitalSignatureConfiguration.java
Sat Jun 18 21:24:27 2011
@@ -35,7 +35,7 @@ public class DigitalSignatureConfigurati
private KeyStore keystore;
private SecureRandom secureRandom;
private String algorithm = "DSA";
- private Integer bufferSize = new Integer(2048);
+ private Integer bufferSize = Integer.valueOf(2048);
private String provider;
private String signatureHeaderName;
private String alias;
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/blueprint/CxfNamespaceHandler.java
Sat Jun 18 21:24:27 2011
@@ -46,11 +46,8 @@ public class CxfNamespaceHandler impleme
String s = element.getLocalName();
if ("cxfEndpoint".equals(s)) {
return new EndpointDefinitionParser().parse(element, context);
- } else if ("server".equals(s)) {
- //return new
RsServerDefinitionParser(JaxWsServerFactoryBean.class).parse(element, context);
- } else if ("client".equals(s)) {
- //return new
RsClientDefinitionParser(JaxWsProxyFactoryBean.class).parse(element, context);
}
+
return null;
}
Modified:
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
(original)
+++
camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
Sat Jun 18 21:24:27 2011
@@ -122,10 +122,6 @@ public class CxfRsProducer extends Defau
client.query(entry.getKey(), entry.getValue());
}
}
- String queryString = inMessage.getHeader(Exchange.HTTP_QUERY,
String.class);
- if (queryString != null) {
-
- }
CxfRsBinding binding = cxfRsEndpoint.getBinding();
Modified:
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
(original)
+++
camel/trunk/components/camel-protobuf/src/main/java/org/apache/camel/dataformat/protobuf/ProtobufDataFormat.java
Sat Jun 18 21:24:27 2011
@@ -66,9 +66,7 @@ public class ProtobufDataFormat implemen
if (instanceClassName == null) {
throw new CamelException("There is not defaultInstance for
protobuf unmarshaling");
} else {
- if (defaultInstance == null) {
- defaultInstance = loadDefaultInstance(instanceClassName,
exchange.getContext());
- }
+ defaultInstance = loadDefaultInstance(instanceClassName,
exchange.getContext());
}
}
return defaultInstance;
Modified:
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
(original)
+++
camel/trunk/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppConfiguration.java
Sat Jun 18 21:24:27 2011
@@ -31,7 +31,7 @@ import org.jsmpp.bean.TypeOfNumber;
public class SmppConfiguration implements Cloneable {
private String host = "localhost";
- private Integer port = new Integer(2775);
+ private Integer port = Integer.valueOf(2775);
private String systemId = "smppclient";
private String password = "password";
private String systemType = "cp";
Modified:
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
(original)
+++
camel/trunk/components/camel-snmp/src/main/java/org/apache/camel/component/snmp/SnmpOIDPoller.java
Sat Jun 18 21:24:27 2011
@@ -55,7 +55,7 @@ public class SnmpOIDPoller extends Sched
super(endpoint, processor);
this.endpoint = endpoint;
// convert delay from seconds to millis
- setDelay(endpoint.getDelay() * 1000);
+ setDelay(endpoint.getDelay() * 1000l);
}
@Override
Modified:
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
(original)
+++
camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
Sat Jun 18 21:24:27 2011
@@ -95,7 +95,7 @@ public class SoapJaxbDataFormat extends
if (nameStrategy instanceof ElementNameStrategy) {
this.elementNameStrategy = (ElementNameStrategy) nameStrategy;
} else {
- new IllegalArgumentException("The argument for
setElementNameStrategy should be subClass of "
+ throw new IllegalArgumentException("The argument for
setElementNameStrategy should be subClass of "
+ ElementNameStrategy.class.getName());
}
}
Modified:
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
(original)
+++
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionErrorHandlerBuilder.java
Sat Jun 18 21:24:27 2011
@@ -58,13 +58,11 @@ public class TransactionErrorHandlerBuil
// lookup in context if no transaction template has been configured
LOG.debug("No TransactionTemplate configured on
TransactionErrorHandlerBuilder. Will try find it in the registry.");
- if (transactionTemplate == null) {
- Map<String, TransactedPolicy> map =
routeContext.lookupByType(TransactedPolicy.class);
- if (map != null && map.size() == 1) {
- TransactedPolicy policy = map.values().iterator().next();
- if (policy != null && policy instanceof
SpringTransactionPolicy) {
- transactionTemplate = ((SpringTransactionPolicy)
policy).getTransactionTemplate();
- }
+ Map<String, TransactedPolicy> map =
routeContext.lookupByType(TransactedPolicy.class);
+ if (map != null && map.size() == 1) {
+ TransactedPolicy policy = map.values().iterator().next();
+ if (policy != null && policy instanceof
SpringTransactionPolicy) {
+ transactionTemplate = ((SpringTransactionPolicy)
policy).getTransactionTemplate();
}
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
Sat Jun 18 21:24:27 2011
@@ -16,8 +16,6 @@
*/
package org.apache.camel.web.resources;
-import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
@@ -41,8 +39,6 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import com.sun.jersey.api.view.Viewable;
-
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.RouteDefinition;
@@ -51,6 +47,8 @@ import org.apache.camel.view.RouteDotGen
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.sun.jersey.api.view.Viewable;
+
/**
* A single Camel Route which is used to implement one or more
* <a
href="http://camel.apache.org/enterprise-integration-patterns.html";>Enterprise
Integration Patterns</a>
@@ -231,21 +229,6 @@ public class RouteResource extends Camel
}
/**
- * Stores the route definition class into a file
- */
- private File storeRoute(String route, String language) throws IOException {
- // create a temporary file to store the route definition class
- File file = File.createTempFile("Route-", "." + language);
- FileWriter fw = new FileWriter(file);
-
- // write the route into the file
- fw.write(route);
- fw.flush();
- fw.close();
- return file;
- }
-
- /**
* Returns the language
*/
public String getLanguage() {
Modified:
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
(original)
+++
camel/trunk/examples/camel-example-cxf/src/main/java/org/apache/camel/example/cxf/provider/Client.java
Sat Jun 18 21:24:27 2011
@@ -25,7 +25,6 @@ import javax.xml.soap.SOAPMessage;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceException;
import javax.xml.ws.soap.SOAPBinding;
/**
@@ -81,18 +80,12 @@ public final class Client {
System.out.println("Send out the request: Hello Camel!!");
// Invoke the endpoint synchronously
- SOAPMessage reply = null;
-
- try {
- // Invoke endpoint operation and read response
- reply = dispatch.invoke(request);
- } catch (WebServiceException wse) {
- wse.printStackTrace();
- }
-
+ // Invoke endpoint operation and read response
+ SOAPMessage reply = dispatch.invoke(request);
+
// process the reply
body = reply.getSOAPBody();
-
+
QName responseName = new
QName("http://apache.org/hello_world_soap_http/types";, "greetMeResponse");
SOAPElement bodyElement =
(SOAPElement)body.getChildElements(responseName).next();
Modified:
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java?rev=1137250&r1=1137249&r2=1137250&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
(original)
+++
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Bank.java
Sat Jun 18 21:24:27 2011
@@ -44,7 +44,7 @@ public class Bank implements Processor {
exchange.getOut().setBody("Bank processed the request.");
// Sleep some time
try {
- Thread.sleep((int) (Math.random() * 10) * 100);
+ Thread.sleep((long) (Math.random() * 10) * 100);
} catch (InterruptedException e) {
// Discard
}
