camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r1307636 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/language/simple/types/ camel-core/src/main/java/org/apache/camel/management/event/ camel-core/src/main/java/org/apache/cam...
Date Fri, 30 Mar 2012 22:06:22 GMT
Author: hadrian
Date: Fri Mar 30 22:06:21 2012
New Revision: 1307636

URL: http://svn.apache.org/viewvc?rev=1307636&view=rev
Log:
Remove warnings. Minor fixes

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/util/LRUSoftCache.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
    camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConfiguration.java
    camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
    camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
    camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcGeneratedKeysTest.java
    camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hit.java
    camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/CamelEvent.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionRollbackException.java
    camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java
    camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
    camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
    camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Fri
Mar 30 22:06:21 2012
@@ -133,6 +133,7 @@ import org.slf4j.LoggerFactory;
  *
  * @version 
  */
+@SuppressWarnings("deprecation")
 public class DefaultCamelContext extends ServiceSupport implements ModelCamelContext, SuspendableService
{
     private final transient Logger log = LoggerFactory.getLogger(getClass());
     private JAXBContext jaxbContext;
@@ -2078,7 +2079,6 @@ public class DefaultCamelContext extends
     /**
      * Lazily create a default implementation
      */
-    @SuppressWarnings("deprecation")
     protected TypeConverter createTypeConverter() {
         BaseTypeConverterRegistry answer;
         if (isLazyLoadTypeConverters()) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
Fri Mar 30 22:06:21 2012
@@ -22,7 +22,7 @@ import org.apache.camel.ExpressionIllega
  * Syntax error in the simple language expression.
  */
 public class SimpleIllegalSyntaxException extends ExpressionIllegalSyntaxException {
-
+    private static final long serialVersionUID = 1L;
     private final int index;
     private final String message;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
Fri Mar 30 22:06:21 2012
@@ -23,7 +23,7 @@ import org.apache.camel.RuntimeCamelExce
  * in the input.
  */
 public class SimpleParserException extends RuntimeCamelException {
-
+    private static final long serialVersionUID = 1L;
     private final int index;
 
     public SimpleParserException(String message, int index) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/event/AbstractExchangeEvent.java
Fri Mar 30 22:06:21 2012
@@ -26,7 +26,7 @@ import org.apache.camel.Exchange;
  * @version 
  */
 public abstract class AbstractExchangeEvent extends EventObject {
-
+    private static final long serialVersionUID = 1L;
     private final Exchange exchange;
 
     public AbstractExchangeEvent(Exchange source) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/ClosedCorrelationKeyException.java
Fri Mar 30 22:06:21 2012
@@ -25,6 +25,7 @@ import org.apache.camel.Exchange;
  * @version 
  */
 public class ClosedCorrelationKeyException extends CamelExchangeException {
+    private static final long serialVersionUID = 1L;
     private final String correlationKey;
 
     public ClosedCorrelationKeyException(String correlationKey, Exchange exchange) {

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=1307636&r1=1307635&r2=1307636&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 Fri Mar 30
22:06:21 2012
@@ -50,6 +50,7 @@ import java.util.Set;
  * @see LRUCache
  */
 public class LRUSoftCache<K, V> extends LRUCache<K, V> {
+    private static final long serialVersionUID = 1L;
 
     public LRUSoftCache(int maximumCacheSize) {
         super(maximumCacheSize);

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/BigDataSetTest.java
Fri Mar 30 22:06:21 2012
@@ -16,12 +16,10 @@
  */
 package org.apache.camel.component.dataset;
 
-import java.util.concurrent.TimeUnit;
 import javax.naming.Context;
 
 import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
 
 /**
  * @version 

Modified: camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
(original)
+++ camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
Fri Mar 30 22:06:21 2012
@@ -88,7 +88,7 @@ public class FopProducer extends Default
     private void setEncryptionParameters(FOUserAgent userAgent, Map<String, Object>
headers)
         throws Exception {
         Map<String, Object> encryptionParameters = IntrospectionSupport
-                .extractProperties(headers, FopConstants.CAMEL_FOP_ENCRYPT);
+            .extractProperties(headers, FopConstants.CAMEL_FOP_ENCRYPT);
         if (!encryptionParameters.isEmpty()) {
             PDFEncryptionParams encryptionParams = new PDFEncryptionParams();
             IntrospectionSupport.setProperties(encryptionParams, encryptionParameters);

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConfiguration.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConfiguration.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConfiguration.java
(original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpConfiguration.java
Fri Mar 30 22:06:21 2012
@@ -22,6 +22,7 @@ import java.io.Serializable;
  * @version 
  */
 public class HttpConfiguration implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private AuthMethod authMethod;
     private String authUsername;

Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
(original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
Fri Mar 30 22:06:21 2012
@@ -247,6 +247,7 @@ public class HttpComponent extends Heade
         return port;
     }
     
+    @SuppressWarnings("deprecation")
     protected void registerPort(boolean secure, X509HostnameVerifier x509HostnameVerifier,
int port, SSLContextParameters sslContextParams) throws Exception {
         SchemeRegistry registry = clientConnectionManager.getSchemeRegistry();
         if (secure) {

Modified: camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
(original)
+++ camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsComputeProducer.java
Fri Mar 30 22:06:21 2012
@@ -114,6 +114,7 @@ public class JcloudsComputeProducer exte
      * @param exchange
      * @throws CamelException
      */
+    @SuppressWarnings("deprecation")
     protected void runScriptOnNode(Exchange exchange) throws CamelException {
         String script = exchange.getIn().getBody(String.class);
         String nodeId = getNodeId(exchange);

Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcGeneratedKeysTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcGeneratedKeysTest.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcGeneratedKeysTest.java
(original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcGeneratedKeysTest.java
Fri Mar 30 22:06:21 2012
@@ -21,17 +21,12 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
-import org.apache.camel.component.mock.MockEndpoint;
 import org.junit.Test;
 
 
 public class JdbcGeneratedKeysTest extends JdbcRouteTest {
 
-    @EndpointInject(uri = "mock:result")
-    private MockEndpoint mock;
-
     @Test
     @SuppressWarnings("unchecked")
     public void testRetrieveGeneratedKeys() throws Exception {
@@ -141,7 +136,7 @@ public class JdbcGeneratedKeysTest exten
         exchange.getIn().setHeader(JdbcConstants.JDBC_GENERATED_COLUMNS, new Object[]{});
 
         // now we send the exchange to the endpoint, and receives the response from Camel
-        Exchange out = template.send(endpoint, exchange);
+        template.send(endpoint, exchange);
 
         assertTrue(exchange.isFailed());
     }

Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hit.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hit.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hit.java
(original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hit.java
Fri Mar 30 22:06:21 2012
@@ -19,6 +19,8 @@ package org.apache.camel.processor.lucen
 import java.io.Serializable;
 
 public class Hit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private int hitLocation;
     private float score;
     private String data;

Modified: camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
(original)
+++ camel/trunk/components/camel-lucene/src/main/java/org/apache/camel/processor/lucene/support/Hits.java
Fri Mar 30 22:06:21 2012
@@ -21,6 +21,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class Hits implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     private int numberOfHits;
     private List<Hit> hit;
@@ -44,5 +45,4 @@ public class Hits implements Serializabl
     public String toString() {
         return "Hits[numberOfHits=" + numberOfHits + "]";
     }
-
 }

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/CamelEvent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/CamelEvent.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/CamelEvent.java
(original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/component/event/CamelEvent.java
Fri Mar 30 22:06:21 2012
@@ -25,6 +25,8 @@ import org.springframework.context.Appli
  * @version 
  */
 public class CamelEvent extends ApplicationEvent {
+    private static final long serialVersionUID = 1L;
+
     private final Exchange exchange;
 
     public CamelEvent(EventEndpoint source, Exchange exchange) {

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionRollbackException.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionRollbackException.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionRollbackException.java
(original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/spi/TransactionRollbackException.java
Fri Mar 30 22:06:21 2012
@@ -22,6 +22,7 @@ package org.apache.camel.spring.spi;
  * @version 
  */
 public class TransactionRollbackException extends RuntimeException {
+    private static final long serialVersionUID = 1L;
 
     public TransactionRollbackException() {
     }

Modified: camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java
(original)
+++ camel/trunk/components/camel-twitter/src/test/java/org/apache/camel/component/twitter/mocks/StatusMock.java
Fri Mar 30 22:06:21 2012
@@ -29,6 +29,7 @@ import twitter4j.URLEntity;
 import twitter4j.User;
 import twitter4j.UserMentionEntity;
 
+@SuppressWarnings("deprecation")
 public class StatusMock implements Status {
 
     private static final long serialVersionUID = 1L;
@@ -129,7 +130,6 @@ public class StatusMock implements Statu
     }
 
     @Override
-    @SuppressWarnings("deprecation")
     public Annotations getAnnotations() {
         return null;
     }

Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
(original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/DefaultWebsocket.java
Fri Mar 30 22:06:21 2012
@@ -25,8 +25,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class DefaultWebsocket implements WebSocket, OnTextMessage, Serializable {
-
+    private static final long serialVersionUID = 1L;
     private static final Logger LOG = LoggerFactory.getLogger(DefaultWebsocket.class);
+
     private final WebsocketConsumer consumer;
     private final NodeSynchronization sync;
     private Connection connection;

Modified: camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
(original)
+++ camel/trunk/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponentServlet.java
Fri Mar 30 22:06:21 2012
@@ -22,6 +22,7 @@ import org.eclipse.jetty.websocket.WebSo
 import org.eclipse.jetty.websocket.WebSocketServlet;
 
 public class WebsocketComponentServlet extends WebSocketServlet {
+    private static final long serialVersionUID = 1L;
 
     private final NodeSynchronization sync;
     private WebsocketConsumer consumer;

Modified: camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java?rev=1307636&r1=1307635&r2=1307636&view=diff
==============================================================================
--- camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
(original)
+++ camel/trunk/components/camel-websocket/src/test/java/org/apache/camel/component/websocket/WebsocketComponentTest.java
Fri Mar 30 22:06:21 2012
@@ -51,7 +51,6 @@ public class WebsocketComponentTest {
     private static final String PATH_ONE = "foo";
     private static final String PATH_TWO = "bar";
     private static final String PATH_SPEC_ONE = "/" + PATH_ONE + "/*";
-    private static final String PATH_SPEC_TWO = "/" + PATH_TWO + "/*";
 
     @Mock
     private WebsocketConsumer consumer;



Mime
View raw message