You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/03/09 10:34:39 UTC
[camel-quarkus] 07/11: Fix warnings in json dataformats itests
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 37252f3e1d4b815b2e3204ad4b61b1ba85a82fc6
Author: aldettinger <al...@gmail.com>
AuthorDate: Fri Mar 4 17:43:07 2022 +0100
Fix warnings in json dataformats itests
---
.../dataformats/jackson/json/JacksonJsonResource.java | 13 ++++++-------
.../dataformats/jackson/xml/JacksonXmlResource.java | 13 ++++++-------
.../quarkus/component/dataformats/json/model/MyModule.java | 6 ++++--
.../component/dataformats/jackson/xml/JacksonXmlTest.java | 3 +--
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java
index 8a9e55a..33d865e 100644
--- a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java
+++ b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/json/JacksonJsonResource.java
@@ -53,7 +53,6 @@ import org.jboss.logging.Logger;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
@Path("/dataformats-json")
@ApplicationScoped
@@ -100,7 +99,7 @@ public class JacksonJsonResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
@@ -184,18 +183,18 @@ public class JacksonJsonResource {
Exchange out = producerTemplate.request("direct:jackson-marshal-ct-yes", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertEquals("application/json", out.getMessage().getHeader(Exchange.CONTENT_TYPE));
out = producerTemplate.request("direct:jackson-marshal-ct-yes2", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertEquals("application/json", out.getMessage().getHeader(Exchange.CONTENT_TYPE));
out = producerTemplate.request("direct:jackson-marshal-ct-no", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertNull(out.getMessage().getHeader(Exchange.CONTENT_TYPE));
}
@@ -334,7 +333,7 @@ public class JacksonJsonResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
@@ -460,7 +459,7 @@ public class JacksonJsonResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
diff --git a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlResource.java b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlResource.java
index 7c1d122..590b71c 100644
--- a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlResource.java
+++ b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlResource.java
@@ -50,7 +50,6 @@ import org.jboss.logging.Logger;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
@Path("/dataformats-json")
@ApplicationScoped
@@ -91,7 +90,7 @@ public class JacksonXmlResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
@@ -149,18 +148,18 @@ public class JacksonXmlResource {
Exchange out = producerTemplate.request("direct:jacksonxml-marshal-ct-yes", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertEquals("application/xml", out.getMessage().getHeader(Exchange.CONTENT_TYPE));
out = producerTemplate.request("direct:jacksonxml-marshal-ct-yes2", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertEquals("application/xml", out.getMessage().getHeader(Exchange.CONTENT_TYPE));
out = producerTemplate.request("direct:jacksonxml-marshal-ct-no", exchange -> exchange.getIn().setBody(in));
assertNotNull(out);
- assertTrue(out.hasOut());
+ assertNotNull(out.getMessage());
assertNull(out.getMessage().getHeader(Exchange.CONTENT_TYPE));
}
@@ -259,7 +258,7 @@ public class JacksonXmlResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
@@ -334,7 +333,7 @@ public class JacksonXmlResource {
mock.assertIsSatisfied();
- List list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list = mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertNotNull(list);
assertEquals(2, list.size());
diff --git a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/MyModule.java b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/MyModule.java
index aeb42d2..0af321c 100644
--- a/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/MyModule.java
+++ b/integration-tests/dataformats-json/src/main/java/org/apache/camel/quarkus/component/dataformats/json/model/MyModule.java
@@ -18,7 +18,7 @@ package org.apache.camel.quarkus.component.dataformats.json.model;
import com.fasterxml.jackson.core.Version;
import com.fasterxml.jackson.databind.Module;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import io.quarkus.runtime.annotations.RegisterForReflection;
@RegisterForReflection
@@ -36,7 +36,9 @@ public class MyModule extends Module {
@Override
public void setupModule(SetupContext context) {
- context.setNamingStrategy(new PropertyNamingStrategy.PropertyNamingStrategyBase() {
+ context.setNamingStrategy(new PropertyNamingStrategies.NamingBase() {
+ private static final long serialVersionUID = 1L;
+
@Override
public String translate(String propertyName) {
return "my-" + propertyName;
diff --git a/integration-tests/dataformats-json/src/test/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlTest.java b/integration-tests/dataformats-json/src/test/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlTest.java
index affdb23..bd1893c 100644
--- a/integration-tests/dataformats-json/src/test/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlTest.java
+++ b/integration-tests/dataformats-json/src/test/java/org/apache/camel/quarkus/component/dataformats/jackson/xml/JacksonXmlTest.java
@@ -74,7 +74,7 @@ public class JacksonXmlTest {
.statusCode(200)
.body(equalTo(listJson));
await().atMost(10, TimeUnit.SECONDS).until(() -> {
- List<DummyObject> records = RestAssured.given()
+ List<?> records = RestAssured.given()
.contentType("text/xml")
.body(json)
.post("/dataformats-json/jacksonxml/unmarshal-listsplit")
@@ -84,7 +84,6 @@ public class JacksonXmlTest {
return records.size() == 2;
});
-
}
@Test