camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1171709 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/model/ camel-core/src/main/java/org/apache/camel/view/ camel-core/src/test/java/org/apache/camel/management/ components...
Date Fri, 16 Sep 2011 18:36:28 GMT
Author: dkulp
Date: Fri Sep 16 18:36:26 2011
New Revision: 1171709

URL: http://svn.apache.org/viewvc?rev=1171709&view=rev
Log:
Remove some warnings in eclipse

Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
    camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
    camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
    camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
    camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
    camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ErrorHandlerBuilderRef.java
Fri Sep 16 18:36:26 2011
@@ -113,6 +113,7 @@ public class ErrorHandlerBuilderRef exte
     }
 
     protected static ErrorHandlerFactory lookupErrorHandlerBuilder(ModelCamelContext camelContext)
{
+        @SuppressWarnings("deprecation")
         ErrorHandlerFactory answer = camelContext.getErrorHandlerBuilder();
         if (answer instanceof ErrorHandlerBuilderRef) {
             ErrorHandlerBuilderRef other = (ErrorHandlerBuilderRef) answer;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Fri Sep
16 18:36:26 2011
@@ -313,6 +313,7 @@ public abstract class RouteBuilder exten
 
     // Implementation methods
     // -----------------------------------------------------------------------
+    @SuppressWarnings("deprecation")
     protected void checkInitialized() throws Exception {
         if (initialized.compareAndSet(false, true)) {
             // Set the CamelContext ErrorHandler here

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DataFormatDefinition.java
Fri Sep 16 18:36:26 2011
@@ -58,6 +58,7 @@ public class DataFormatDefinition extend
      * @param ref          reference to lookup for a data format
      * @return the data format or null if not possible to create
      */
+    @SuppressWarnings("deprecation")
     public static DataFormat getDataFormat(RouteContext routeContext, DataFormatDefinition
type, String ref) {
         if (type == null) {
             ObjectHelper.notNull(ref, "ref or type");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Fri Sep
16 18:36:26 2011
@@ -156,6 +156,7 @@ public class RouteDefinition extends Pro
     public List<RouteContext> addRoutes(ModelCamelContext camelContext, Collection<Route>
routes) throws Exception {
         List<RouteContext> answer = new ArrayList<RouteContext>();
 
+        @SuppressWarnings("deprecation")
         ErrorHandlerFactory handler = camelContext.getErrorHandlerBuilder();
         if (handler != null) {
             setErrorHandlerBuilderIfNull(handler);
@@ -211,6 +212,7 @@ public class RouteDefinition extends Pro
      * @throws Exception can be thrown from the route builder
      * @see AdviceWithRouteBuilder
      */
+    @SuppressWarnings("deprecation")
     public RouteDefinition adviceWith(ModelCamelContext camelContext, RouteBuilder builder)
throws Exception {
         ObjectHelper.notNull(camelContext, "CamelContext");
         ObjectHelper.notNull(builder, "RouteBuilder");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
Fri Sep 16 18:36:26 2011
@@ -158,6 +158,7 @@ public final class RouteDefinitionHelper
         }
     }
 
+    @SuppressWarnings("deprecation")
     private static void initParentAndErrorHandlerBuilder(ModelCamelContext context, RouteDefinition
route,
                                                          List<ProcessorDefinition>
abstracts, List<OnExceptionDefinition> onExceptions) {
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
(original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/view/GraphGeneratorSupport.java
Fri Sep 16 18:36:26 2011
@@ -66,6 +66,7 @@ public abstract class GraphGeneratorSupp
         if (makeParentDirs) {
             parent.mkdirs();
         }
+        @SuppressWarnings("deprecation")
         List<RouteDefinition> routes = context.getRouteDefinitions();
         routeGroupMap = createRouteGroupMap(routes);
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
Fri Sep 16 18:36:26 2011
@@ -28,6 +28,7 @@ import org.apache.camel.builder.RouteBui
  */
 public class ManagedRegisterRouteTest extends ManagementTestSupport {
 
+    @SuppressWarnings("deprecation")
     public void testRoutes() throws Exception {
         MBeanServer mbeanServer = getMBeanServer();
 

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
(original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java
Fri Sep 16 18:36:26 2011
@@ -63,6 +63,7 @@ public class RemoveRouteDefinitionTest e
         boolean registered = mbeanServer.isRegistered(on);
         assertEquals("Should be registered", true, registered);
 
+        @SuppressWarnings("deprecation")
         RouteDefinition definition = context.getRouteDefinition("route1");
         List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
         routeDefinitions.add(definition);
@@ -86,6 +87,7 @@ public class RemoveRouteDefinitionTest e
         boolean registered = mbeanServer.isRegistered(on);
         assertEquals("Should be registered", true, registered);
         
+        @SuppressWarnings("deprecation")
         RouteDefinition definition = context.getRouteDefinition("route1");
         List<RouteDefinition> routeDefinitions = new ArrayList<RouteDefinition>();
         routeDefinitions.add(definition);

Modified: camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
(original)
+++ camel/trunk/components/camel-blueprint/src/main/java/org/apache/camel/blueprint/handler/CamelNamespaceHandler.java
Fri Sep 16 18:36:26 2011
@@ -615,6 +615,7 @@ public class CamelNamespaceHandler imple
             this.blueprintContainer = blueprintContainer;
         }
 
+        @SuppressWarnings("deprecation")
         public void process(ComponentDefinitionRegistry componentDefinitionRegistry) {
             CamelContextFactoryBean ccfb = (CamelContextFactoryBean) blueprintContainer.getComponentInstance(".camelBlueprint.factory."
+ camelContextName);
             CamelContext camelContext = ccfb.getContext();

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=1171709&r1=1171708&r2=1171709&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
Fri Sep 16 18:36:26 2011
@@ -37,6 +37,7 @@ import org.apache.camel.component.cxf.Cx
 import org.apache.camel.component.cxf.common.message.CxfConstants;
 import org.apache.camel.converter.IOConverter;
 import org.apache.camel.impl.DefaultProducer;
+import org.apache.camel.util.IOHelper;
 import org.apache.camel.util.LRUSoftCache;
 import org.apache.cxf.jaxrs.JAXRSServiceFactoryBean;
 import org.apache.cxf.jaxrs.client.Client;
@@ -121,7 +122,8 @@ public class CxfRsProducer extends Defau
             // Get the map from HTTP_QUERY header
             String queryString = inMessage.getHeader(Exchange.HTTP_QUERY, String.class);
             if (queryString != null) {
-                maps = getQueryParametersFromQueryString(queryString, IOConverter.getCharsetName(exchange));
+                maps = getQueryParametersFromQueryString(queryString,
+                                                         IOHelper.getCharsetName(exchange));
             }
         }
         if (maps == null) {

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/DefaultCxfBindingTest.java
Fri Sep 16 18:36:26 2011
@@ -89,7 +89,8 @@ public class DefaultCxfBindingTest exten
         verifyHeader(headers, "myFruitHeader", "peach");
         verifyHeader(headers, "MYFRUITHEADER", "peach");
         
-        Set<Attachment> attachments = (Set<Attachment>)requestContext.get(CxfConstants.CAMEL_CXF_ATTACHMENTS);
+        Set<Attachment> attachments 
+            = CastUtils.cast((Set<?>)requestContext.get(CxfConstants.CAMEL_CXF_ATTACHMENTS));
         assertNotNull(attachments);
         assertNotNull(attachments.size() == 1);
         Attachment att = attachments.iterator().next();

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
(original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpProducer.java
Fri Sep 16 18:36:26 2011
@@ -393,7 +393,7 @@ public class HttpProducer extends Defaul
                         // so we only do an instanceof check and accept String if the body
is really a String
                         // do not fallback to use the default charset as it can influence
the request
                         // (for example application/x-www-form-urlencoded forms being sent)
-                        String charset = IOConverter.getCharsetName(exchange, false);
+                        String charset = IOHelper.getCharsetName(exchange, false);
                         answer = new StringRequestEntity((String) data, contentType, charset);
                     }
                     // fallback as input stream

Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
(original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/helper/HttpHelper.java
Fri Sep 16 18:36:26 2011
@@ -45,6 +45,7 @@ public final class HttpHelper {
         // Helper class
     }
 
+    @SuppressWarnings("deprecation")
     public static void setCharsetFromContentType(String contentType, Exchange exchange) {
         if (contentType != null) {
             // find the charset and set it to the Exchange

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
(original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/language/spel/SpelExpression.java
Fri Sep 16 18:36:26 2011
@@ -34,6 +34,7 @@ import org.springframework.expression.sp
  * /spring/docs/current/spring-framework-reference/html/expressions.html">
  * Spring Expression Language</a> in the context of Camel.
  */
+@SuppressWarnings("deprecation")
 public class SpelExpression extends ExpressionSupport {
 
     private final String expressionString;

Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Fri
Sep 16 18:36:26 2011
@@ -38,6 +38,7 @@ import org.springframework.context.suppo
  *
  * @version 
  */
+@SuppressWarnings("deprecation")
 public class Main extends MainSupport {
     protected static Main instance;
 

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringCustomExpressionTest.java
Fri Sep 16 18:36:26 2011
@@ -17,7 +17,6 @@
 package org.apache.camel.spring.processor;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.impl.ExpressionAdapter;
 import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -41,7 +40,8 @@ public class SpringCustomExpressionTest 
         return new ClassPathXmlApplicationContext("org/apache/camel/spring/processor/SpringCustomExpressionTest.xml");
     }
 
-    public static class MyExpression extends ExpressionAdapter {
+    @SuppressWarnings("deprecation")
+    public static class MyExpression extends org.apache.camel.impl.ExpressionAdapter {
 
         @Override
         public Object evaluate(Exchange exchange) {

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java?rev=1171709&r1=1171708&r2=1171709&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringSetExchangePatternWithCustomIdTest.java
Fri Sep 16 18:36:26 2011
@@ -24,6 +24,7 @@ import static org.apache.camel.spring.pr
 
 public class SpringSetExchangePatternWithCustomIdTest extends SetExchangePatternTest {
 
+    @SuppressWarnings("deprecation")
     @Override
     public void testToWithInOnlyParam() throws Exception {
         super.testToWithInOnlyParam();



Mime
View raw message