You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/06 06:57:19 UTC

[camel] branch master updated: Fixed usages of deprecated wrapper types constructors (#4166)

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 30dacda  Fixed usages of deprecated wrapper types constructors (#4166)
30dacda is described below

commit 30dacda0701c518bf890c460ee4c86371cb22f04
Author: Otavio Rodolfo Piske <or...@users.noreply.github.com>
AuthorDate: Sun Sep 6 08:56:50 2020 +0200

    Fixed usages of deprecated wrapper types constructors (#4166)
    
    Include changes for:
    - core/camel-core
    - camel-bindy
    - camel-cxf
    - camel-gora
    - camel-jclouds
    - camel-netty-http
    - camel-spring
    - camel-spring-ws
---
 .../bindy/format/factories/IntegerFormatFactory.java       |  2 +-
 .../bindy/format/factories/LongFormatFactory.java          |  2 +-
 .../bindy/format/factories/ShortFormatFactory.java         |  2 +-
 .../apache/camel/component/cxf/jaxrs/testbean/Order.java   |  2 +-
 .../apache/camel/component/gora/utils/GoraUtilsTest.java   |  2 +-
 .../component/jclouds/JcloudsBlobStoreProducerTest.java    | 14 +++++++-------
 .../component/jclouds/JcloudsSpringBlobstoreTest.java      |  8 ++++----
 .../camel/component/netty/http/NettyHttpStreamTest.java    |  2 +-
 .../ws/security/ProducerWss4JSecurityHeaderTest.java       |  4 ++--
 .../org/apache/camel/spring/remoting/MyMultiArgument.java  |  2 +-
 .../bean/DefaultParameterMappingStrategyTest.java          |  2 +-
 .../org/apache/camel/impl/DefaultProducerTemplateTest.java | 12 ++++++------
 12 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
index 2c02d2c..43508ed 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/IntegerFormatFactory.java
@@ -50,7 +50,7 @@ public class IntegerFormatFactory extends AbstractFormatFactory {
 
         @Override
         public Integer parse(String string) throws Exception {
-            return new Integer(string);
+            return Integer.valueOf(string);
         }
 
     }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
index 8f0bc23..ae1caf8 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/LongFormatFactory.java
@@ -50,7 +50,7 @@ public class LongFormatFactory extends AbstractFormatFactory {
 
         @Override
         public Long parse(String string) throws Exception {
-            return new Long(string);
+            return Long.valueOf(string);
         }
 
     }
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
index c91908f..9ee74ef 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/format/factories/ShortFormatFactory.java
@@ -50,7 +50,7 @@ public class ShortFormatFactory extends AbstractFormatFactory {
 
         @Override
         public Short parse(String string) throws Exception {
-            return new Short(string);
+            return Short.valueOf(string);
         }
 
     }
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
index b4ebfd5..0ac90a8 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/Order.java
@@ -53,7 +53,7 @@ public class Order {
     @GET
     @Path("products/{productId}/")
     public Product getProduct(@PathParam("productId") int productId) {
-        Product p = products.get(new Long(productId));
+        Product p = products.get(Long.valueOf(productId));
         return p;
     }
 
diff --git a/components/camel-gora/src/test/java/org/apache/camel/component/gora/utils/GoraUtilsTest.java b/components/camel-gora/src/test/java/org/apache/camel/component/gora/utils/GoraUtilsTest.java
index d3f9ad4..a95e1e5 100644
--- a/components/camel-gora/src/test/java/org/apache/camel/component/gora/utils/GoraUtilsTest.java
+++ b/components/camel-gora/src/test/java/org/apache/camel/component/gora/utils/GoraUtilsTest.java
@@ -46,6 +46,6 @@ public class GoraUtilsTest {
     public void getAttributeAsLongShouldSReturnTheCorrectValue() throws Exception {
         final GoraConfiguration conf = new GoraConfiguration();
         conf.setLimit(3L);
-        assertEquals(new Long(3), GoraUtils.getAttributeAsLong(GoraAttribute.GORA_QUERY_LIMIT, conf));
+        assertEquals(Long.valueOf(3), GoraUtils.getAttributeAsLong(GoraAttribute.GORA_QUERY_LIMIT, conf));
     }
 }
diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
index 38a8038..8355125 100644
--- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
+++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsBlobStoreProducerTest.java
@@ -87,7 +87,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.sendBody("direct:put-and-count", message);
         Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(1), result);
+        assertEquals(Long.valueOf(1), result);
     }
 
     @Test
@@ -97,7 +97,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.requestBodyAndHeader("direct:put-and-remove", null, JcloudsConstants.OPERATION, JcloudsConstants.REMOVE_BLOB);
         Object result = template.requestBodyAndHeader("direct:put-and-remove", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(0), result);
+        assertEquals(Long.valueOf(0), result);
     }
 
     @Test
@@ -106,12 +106,12 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.sendBody("direct:put-and-clear", message);
         Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(1), result);
+        assertEquals(Long.valueOf(1), result);
         template.requestBodyAndHeader("direct:put-and-clear", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.CLEAR_CONTAINER);
         result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(0), result);
+        assertEquals(Long.valueOf(0), result);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.sendBody("direct:put-and-delete-container", message);
         Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(1), result);
+        assertEquals(Long.valueOf(1), result);
         template.requestBodyAndHeader("direct:put-and-delete-container", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.DELETE_CONTAINER);
     }
@@ -142,7 +142,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.sendBody("direct:put", "test message");
         Object result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(1), result);
+        assertEquals(Long.valueOf(1), result);
         List blobsToRemove = new ArrayList<>();
         blobsToRemove.add(TEST_BLOB_IN_DIR);
         Map<String, Object> headers = new HashMap<>();
@@ -152,7 +152,7 @@ public class JcloudsBlobStoreProducerTest extends CamelTestSupport {
         template.sendBodyAndHeaders("direct:remove-blobs", null, headers);
         result = template.requestBodyAndHeader("direct:put-and-count", null, JcloudsConstants.OPERATION,
                 JcloudsConstants.COUNT_BLOBS, Long.class);
-        assertEquals(new Long(0), result);
+        assertEquals(Long.valueOf(0), result);
     }
 
     @Override
diff --git a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
index 419afa6..282a56b 100644
--- a/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
+++ b/components/camel-jclouds/src/test/java/org/apache/camel/component/jclouds/JcloudsSpringBlobstoreTest.java
@@ -79,19 +79,19 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
     @Test
     public void testBlobStoreCount() throws InterruptedException {
         Long count = template.requestBody("direct:count", "Some message", Long.class);
-        assertEquals(new Long(1), count);
+        assertEquals(Long.valueOf(1), count);
     }
 
     @Test
     public void testBlobStoreRemove() throws InterruptedException {
         Long count = template.requestBody("direct:remove", "Some message", Long.class);
-        assertEquals(new Long(0), count);
+        assertEquals(Long.valueOf(0), count);
     }
 
     @Test
     public void testBlobStoreClear() throws InterruptedException {
         Long count = template.requestBody("direct:clear", "Some message", Long.class);
-        assertEquals(new Long(0), count);
+        assertEquals(Long.valueOf(0), count);
     }
 
     @Test
@@ -118,6 +118,6 @@ public class JcloudsSpringBlobstoreTest extends CamelSpringTestSupport {
         headers.put(JcloudsConstants.BLOB_NAME_LIST, blobsToRemove);
         template.sendBodyAndHeaders("direct:remove-blobs", null, headers);
         Long count = template.requestBody("direct:count-after-remove-blobs", null, Long.class);
-        assertEquals(new Long(0), count);
+        assertEquals(Long.valueOf(0), count);
     }
 }
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamTest.java
index b4fa057..0861138 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpStreamTest.java
@@ -107,7 +107,7 @@ final class Helper {
             total += read;
         }
 
-        exchange.getIn().setBody(new Long(total));
+        exchange.getIn().setBody(Long.valueOf(total));
     }
 
     public static CompletableFuture<Void> asyncProcessStream(Exchange exchange) {
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
index 0d8eb06..905dfd6 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/security/ProducerWss4JSecurityHeaderTest.java
@@ -80,8 +80,8 @@ public class ProducerWss4JSecurityHeaderTest extends CamelSpringTestSupport {
 
     private PlusResponse createSampleRequestResponsePair() {
         PlusRequest request = new PlusRequest();
-        request.setA(new Integer(1));
-        request.setB(new Integer(2));
+        request.setA(Integer.valueOf(1));
+        request.setB(Integer.valueOf(2));
 
         PlusResponse result = (PlusResponse) template.requestBody("direct:testHeader", request);
 
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java
index 6dc4649..5771aa5 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/MyMultiArgument.java
@@ -24,7 +24,7 @@ public class MyMultiArgument {
     MyMultiArgumentServiceInterface myMultiArgumentServiceInterface;
 
     public void doSomethingMultiple() {
-        myMultiArgumentServiceInterface.doSomething("Hello World 1", "Hello World 2", new Long(3));
+        myMultiArgumentServiceInterface.doSomething("Hello World 1", "Hello World 2", Long.valueOf(3));
     }
 
 }
diff --git a/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java b/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
index 2e554ba..4618c18 100644
--- a/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/component/bean/DefaultParameterMappingStrategyTest.java
@@ -134,7 +134,7 @@ public class DefaultParameterMappingStrategyTest extends ContextTestSupport {
             assertNotNull(body);
             assertNotNull(converter);
             assertEquals("Hello", body);
-            assertEquals(new Integer(123), converter.convertTo(Integer.class, "123"));
+            assertEquals(Integer.valueOf(123), converter.convertTo(Integer.class, "123"));
             return "TypeConverter";
         }
 
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
index c4f2248..0f8297d 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultProducerTemplateTest.java
@@ -187,26 +187,26 @@ public class DefaultProducerTemplateTest extends ContextTestSupport {
     public void testRequestBody() throws Exception {
         // with endpoint as string uri
         Integer out = template.requestBody("direct:inout", "Hello", Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
 
         out = template.requestBodyAndHeader("direct:inout", "Hello", "foo", "bar", Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
 
         Map<String, Object> headers = new HashMap<>();
         out = template.requestBodyAndHeaders("direct:inout", "Hello", headers, Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
 
         // with endpoint object
         Endpoint endpoint = context.getEndpoint("direct:inout");
         out = template.requestBody(endpoint, "Hello", Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
 
         out = template.requestBodyAndHeader(endpoint, "Hello", "foo", "bar", Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
 
         headers = new HashMap<>();
         out = template.requestBodyAndHeaders(endpoint, "Hello", headers, Integer.class);
-        assertEquals(new Integer(123), (Object) out);
+        assertEquals(Integer.valueOf(123), (Object) out);
     }
 
     @Test