You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/03/07 05:56:14 UTC
[camel] branch main updated: CAMEL-15520: fixed several deprecation warnings
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 4d05852 CAMEL-15520: fixed several deprecation warnings
4d05852 is described below
commit 4d058525e35e34a8030bc3cb2121dc46c036c92c
Author: Otavio R. Piske <an...@gmail.com>
AuthorDate: Sun Mar 6 22:18:10 2022 +0100
CAMEL-15520: fixed several deprecation warnings
---
.../apache/camel/component/arangodb/integration/BaseArangoDb.java | 5 +++--
.../azure/storage/blob/operations/BlobOperationsTest.java | 4 ++--
.../java/org/apache/camel/http/common/HttpCommonEndpoint.java | 8 --------
.../java/org/apache/camel/component/jetty/JettyHttpComponent.java | 2 +-
.../camel/component/schematron/SchematronComponentTest.java | 8 ++++++--
.../java/org/apache/camel/component/servlet/ServletComponent.java | 2 +-
.../camel/component/spring/ws/bean/CamelEndpointDispatcher.java | 2 +-
.../CamelSpringOverridePropertiesForPropertyInjectTest.java | 3 ++-
.../service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java | 4 ++--
9 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/BaseArangoDb.java b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/BaseArangoDb.java
index 9416789..01f2954 100644
--- a/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/BaseArangoDb.java
+++ b/components/camel-arangodb/src/test/java/org/apache/camel/component/arangodb/integration/BaseArangoDb.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.arangodb.integration;
import com.arangodb.ArangoDB;
import com.arangodb.ArangoDatabase;
+import com.arangodb.DbName;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.infra.arangodb.services.ArangoDBService;
@@ -42,8 +43,8 @@ public class BaseArangoDb extends CamelTestSupport {
@BeforeAll
public static void doBeforeAll() {
arangoDb = new ArangoDB.Builder().build();
- arangoDb.createDatabase(DATABASE_NAME);
- arangoDatabase = arangoDb.db(DATABASE_NAME);
+ arangoDb.createDatabase(DbName.of(DATABASE_NAME));
+ arangoDatabase = arangoDb.db(DbName.of(DATABASE_NAME));
}
@AfterAll
diff --git a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
index 8a57b0b..38ecc16 100644
--- a/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
+++ b/components/camel-azure/camel-azure-storage-blob/src/test/java/org/apache/camel/component/azure/storage/blob/operations/BlobOperationsTest.java
@@ -123,7 +123,7 @@ class BlobOperationsTest extends CamelTestSupport {
void testUploadBlockBlob() throws Exception {
// mocking
final BlockBlobItem blockBlobItem = new BlockBlobItem("testTag", OffsetDateTime.now(), null, false, null);
- final HttpHeaders httpHeaders = new HttpHeaders().put("x-test-header", "123");
+ final HttpHeaders httpHeaders = new HttpHeaders().set("x-test-header", "123");
when(client.uploadBlockBlob(any(), anyLong(), any(), any(), any(), any(), any(), any()))
.thenReturn(new ResponseBase<>(null, 200, httpHeaders, blockBlobItem, null));
@@ -146,7 +146,7 @@ class BlobOperationsTest extends CamelTestSupport {
@Test
void testStageBlockBlobList() throws Exception {
- final HttpHeaders httpHeaders = new HttpHeaders().put("x-test-header", "123");
+ final HttpHeaders httpHeaders = new HttpHeaders().set("x-test-header", "123");
when(client.stageBlockBlob(anyString(), any(), anyLong(), any(), any(), any())).thenReturn(httpHeaders);
final Exchange exchange = new DefaultExchange(context);
diff --git a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
index 4c239a5..506ef8d 100644
--- a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
+++ b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpCommonEndpoint.java
@@ -227,14 +227,6 @@ public abstract class HttpCommonEndpoint extends DefaultEndpoint implements Head
return httpBinding;
}
- /**
- * @deprecated use {@link #setHttpBinding(HttpBinding)}
- */
- @Deprecated
- public void setBinding(HttpBinding httpBinding) {
- setHttpBinding(httpBinding);
- }
-
public HttpBinding getHttpBinding() {
if (httpBinding == null) {
// create a new binding and use the options from this endpoint
diff --git a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index 389966f..a3cd4e3 100644
--- a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -231,7 +231,7 @@ public abstract class JettyHttpComponent extends HttpCommonComponent
binding = getHttpBinding();
}
if (binding != null) {
- endpoint.setBinding(binding);
+ endpoint.setHttpBinding(binding);
}
if (enableJmx != null) {
endpoint.setEnableJmx(enableJmx);
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
index 8217a26..2b99b1f 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronComponentTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.schematron;
+import java.nio.charset.Charset;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.schematron.constant.Constants;
@@ -39,7 +41,8 @@ public class SchematronComponentTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"));
+ String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"),
+ Charset.defaultCharset());
template.sendBody("direct:start", payload);
assertMockEndpointsSatisfied();
String result = mock.getExchanges().get(0).getIn().getHeader(Constants.VALIDATION_REPORT, String.class);
@@ -55,7 +58,8 @@ public class SchematronComponentTest extends CamelTestSupport {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(1);
- String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-2.xml"));
+ String payload = IOUtils.toString(ClassLoader.getSystemResourceAsStream("xml/article-2.xml"),
+ Charset.defaultCharset());
template.sendBody("direct:start", payload);
assertMockEndpointsSatisfied();
String result = mock.getExchanges().get(0).getIn().getHeader(Constants.VALIDATION_REPORT, String.class);
diff --git a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
index 4e503e4..fe563ab 100644
--- a/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
+++ b/components/camel-servlet/src/main/java/org/apache/camel/component/servlet/ServletComponent.java
@@ -122,7 +122,7 @@ public class ServletComponent extends HttpCommonComponent implements RestConsume
binding = getHttpBinding();
}
if (binding != null) {
- endpoint.setBinding(binding);
+ endpoint.setHttpBinding(binding);
}
// should we use an exception for failed error codes?
if (throwExceptionOnFailure != null) {
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java
index 9b289ca..6422e42 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointDispatcher.java
@@ -42,7 +42,7 @@ public class CamelEndpointDispatcher implements MessageEndpoint {
@Override
public void invoke(MessageContext messageContext) throws Exception {
- Assert.notNull(consumerMessageEndpoint);
+ Assert.notNull(consumerMessageEndpoint, "The required 'consumerMessageEndpoint' was not null");
consumerMessageEndpoint.invoke(messageContext);
}
diff --git a/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java b/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
index 064f069..4d46cb9 100644
--- a/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
+++ b/components/camel-test/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
@@ -20,6 +20,7 @@ import java.util.Properties;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
+import org.hamcrest.MatcherAssert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.annotation.DirtiesContext;
@@ -51,7 +52,7 @@ public class CamelSpringOverridePropertiesForPropertyInjectTest {
public void testOverride() throws Exception {
String response = start.requestBody((Object) "ignored", String.class);
- assertThat(response, is(EXPECTED_PROPERTY_VALUE));
+ MatcherAssert.assertThat(response, is(EXPECTED_PROPERTY_VALUE));
}
}
diff --git a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
index 02e667d..d59b985 100644
--- a/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
+++ b/components/camel-wordpress/src/test/java/org/apache/camel/component/wordpress/api/service/impl/ignored/WordpressServiceTaxonomyAdapterIT.java
@@ -30,7 +30,7 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.emptyOrNullString;
@Disabled("Not implemented yet")
public class WordpressServiceTaxonomyAdapterIT {
@@ -48,7 +48,7 @@ public class WordpressServiceTaxonomyAdapterIT {
public void testRetrieve() {
final Taxonomy taxonomy = serviceTaxonomy.retrieve(null, "category");
assertThat(taxonomy, not(nullValue()));
- assertThat(taxonomy.getName(), not(isEmptyOrNullString()));
+ assertThat(taxonomy.getName(), not(emptyOrNullString()));
}
@Test