This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 8840bb6d3632 chore(components): clean sql compilation warnings
8840bb6d3632 is described below
commit 8840bb6d363250f21851c23298f1441661e735e3
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Fri Jan 16 11:31:45 2026 +0100
chore(components): clean sql compilation warnings
Ref CAMEL-22549
---
.../camel/component/sql/DefaultSqlEndpoint.java | 3 ++-
.../sql/DefaultSqlPrepareStatementStrategy.java | 2 +-
.../org/apache/camel/component/sql/SqlConsumer.java | 1 +
.../sql/SqlConsumerOutputTypeSelectListTest.java | 1 +
.../sql/SqlConsumerOutputTypeSelectOneTest.java | 1 +
.../camel/component/sql/SqlDynamicKameletTest.java | 5 +++--
.../camel/component/sql/SqlProducerAndInTest.java | 15 +++++++++------
.../sql/SqlProducerCustomDataSourceTest.java | 5 +++--
.../component/sql/SqlProducerFetchSizeTest.java | 5 +++--
.../camel/component/sql/SqlProducerInBodyTest.java | 15 +++++++++------
.../camel/component/sql/SqlProducerInMultiTest.java | 15 +++++++++------
.../camel/component/sql/SqlProducerInTest.java | 15 +++++++++------
.../component/sql/SqlProducerInVariablesTest.java | 15 +++++++++------
.../sql/SqlProducerOutputTypeSelectListTest.java | 1 +
.../sql/SqlProducerOutputTypeSelectOneTest.java | 1 +
.../camel/component/sql/SqlProducerToDTest.java | 5 +++--
.../component/sql/SqlProducerWhereIssueTest.java | 5 +++--
.../sql/stored/CallableStatementWrapperTest.java | 5 +++--
.../camel/component/sql/stored/ParserTest.java | 11 ++++++-----
.../component/sql/stored/ProducerInOutTest.java | 1 +
.../ClassLoadingAwareObjectInputStreamTest.java | 21 +++++++++++----------
.../jdbc/JdbcAggregateStoreAsTextTest.java | 1 +
.../jdbc/JdbcRemoveConfirmOrderAggregateTest.java | 3 +--
23 files changed, 91 insertions(+), 61 deletions(-)
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
index 93800859f9da..0be0ec8ad8da 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlEndpoint.java
@@ -503,7 +503,7 @@ public abstract class DefaultSqlEndpoint extends
DefaultPollingEndpoint implemen
this.rowMapperFactory = rowMapperFactory;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public List<?> queryForList(ResultSet rs, boolean allowMapToClass) throws
SQLException {
if (allowMapToClass && outputClass != null) {
Class<?> outputClazz =
getCamelContext().getClassResolver().resolveClass(outputClass);
@@ -517,6 +517,7 @@ public abstract class DefaultSqlEndpoint extends
DefaultPollingEndpoint implemen
}
}
+ @SuppressWarnings({ "rawtypes", "unchecked" })
public Object queryForObject(ResultSet rs) throws SQLException {
Object result = null;
if (outputClass == null) {
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
index 69c3b8cf00ab..b2ea06e537fe 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
@@ -264,7 +264,7 @@ public class DefaultSqlPrepareStatementStrategy implements
SqlPrepareStatementSt
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected static CompositeIterator<?> createInParameterIterator(Object
value) {
Iterator<?> it;
// if the body is a String then honor quotes etc.
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
index 1ae2d6ecbce0..44b466247df6 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/SqlConsumer.java
@@ -215,6 +215,7 @@ public class SqlConsumer extends
ScheduledBatchPollingConsumer {
return messagePolled;
}
+ @SuppressWarnings("rawtypes")
private void addListToQueue(Object data, Queue<DataHolder> answer) {
if (data instanceof List) {
// create a list of exchange objects with the data
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
index 2786b8369af9..3f96e0d02070 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
@@ -57,6 +57,7 @@ public class SqlConsumerOutputTypeSelectListTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testOutputType() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index 9cb542f58576..22bc24986c09 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -85,6 +85,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
assertThat(result.getLicense(), CoreMatchers.is("XXX"));
}
+ @SuppressWarnings("unchecked")
@Test
public void testSelectOneWithoutClass() throws Exception {
camel1.addRoutes(new RouteBuilder() {
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java
index 20995c8d2ad0..a2c903411bf6 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlDynamicKameletTest.java
@@ -49,6 +49,7 @@ public class SqlDynamicKameletTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testSimulateDynamicKamelet() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -58,9 +59,9 @@ public class SqlDynamicKameletTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
index 94d7cdc16559..7893f539a5dc 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAndInTest.java
@@ -52,6 +52,7 @@ public class SqlProducerAndInTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInArray() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -61,14 +62,15 @@ public class SqlProducerAndInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInList() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -82,14 +84,15 @@ public class SqlProducerAndInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInString() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -99,9 +102,9 @@ public class SqlProducerAndInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java
index 34c098d5a360..601e914140b7 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerCustomDataSourceTest.java
@@ -59,6 +59,7 @@ public class SqlProducerCustomDataSourceTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testCustomDataSource() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -74,9 +75,9 @@ public class SqlProducerCustomDataSourceTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java
index 49f580572b1e..e2a6386acb4c 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerFetchSizeTest.java
@@ -50,6 +50,7 @@ public class SqlProducerFetchSizeTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testFetchSize() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -59,9 +60,9 @@ public class SqlProducerFetchSizeTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
index 98ac9d2488bf..2d57eb80796f 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
@@ -51,6 +51,7 @@ public class SqlProducerInBodyTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInArray() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -60,14 +61,15 @@ public class SqlProducerInBodyTest extends CamelTestSupport
{
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInList() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -81,14 +83,15 @@ public class SqlProducerInBodyTest extends CamelTestSupport
{
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInString() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -98,9 +101,9 @@ public class SqlProducerInBodyTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
index 75bdde57a6f6..23429b312f7a 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInMultiTest.java
@@ -53,6 +53,7 @@ public class SqlProducerInMultiTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInArray() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -65,9 +66,9 @@ public class SqlProducerInMultiTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(6, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
assertEquals("ASF", row.get("license"));
row = (Map) list.get(1);
@@ -87,6 +88,7 @@ public class SqlProducerInMultiTest extends CamelTestSupport {
assertEquals("YYY", row.get("license"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInList() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -100,9 +102,9 @@ public class SqlProducerInMultiTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(6, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
assertEquals("ASF", row.get("license"));
row = (Map) list.get(1);
@@ -122,6 +124,7 @@ public class SqlProducerInMultiTest extends
CamelTestSupport {
assertEquals("YYY", row.get("license"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInString() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -134,9 +137,9 @@ public class SqlProducerInMultiTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(6, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
assertEquals("ASF", row.get("license"));
row = (Map) list.get(1);
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
index 8b8cae5211ee..16859985c70a 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
@@ -52,6 +52,7 @@ public class SqlProducerInTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInArray() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -61,14 +62,15 @@ public class SqlProducerInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInList() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -82,14 +84,15 @@ public class SqlProducerInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInString() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -99,9 +102,9 @@ public class SqlProducerInTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java
index 0d1b50db75f8..02dac15e0ad4 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInVariablesTest.java
@@ -52,6 +52,7 @@ public class SqlProducerInVariablesTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInArray() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -62,14 +63,15 @@ public class SqlProducerInVariablesTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInList() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -83,14 +85,15 @@ public class SqlProducerInVariablesTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryInString() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -100,9 +103,9 @@ public class SqlProducerInVariablesTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(2, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("Camel", row.get("PROJECT"));
row = (Map) list.get(1);
assertEquals("AMQ", row.get("PROJECT"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
index 78a31da3e902..42125b5983b0 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectListTest.java
@@ -52,6 +52,7 @@ public class SqlProducerOutputTypeSelectListTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("unchecked")
@Test
public void testOutputType() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
index 580313c5838d..dc0f58072ce1 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerOutputTypeSelectOneTest.java
@@ -113,6 +113,7 @@ public class SqlProducerOutputTypeSelectOneTest {
List<Exchange> exchanges = mock.getReceivedExchanges();
assertThat(exchanges.size(), CoreMatchers.is(1));
+ @SuppressWarnings("unchecked")
Map<String, Object> result =
exchanges.get(0).getIn().getBody(Map.class);
assertThat((Integer) result.get("ID"), CoreMatchers.is(3));
assertThat((String) result.get("PROJECT"), CoreMatchers.is("Linux"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
index 2aca173523f8..e3366ee8f428 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerToDTest.java
@@ -53,6 +53,7 @@ public class SqlProducerToDTest extends CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testToD() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -62,9 +63,9 @@ public class SqlProducerToDTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
assertEquals(1, list.size());
- Map row = (Map) list.get(0);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("AMQ", row.get("PROJECT"));
}
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
index c6ec48d53062..38f56d60aadd 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerWhereIssueTest.java
@@ -49,6 +49,7 @@ public class SqlProducerWhereIssueTest extends
CamelTestSupport {
}
}
+ @SuppressWarnings("rawtypes")
@Test
public void testQueryWhereIssue() throws InterruptedException {
MockEndpoint mock = getMockEndpoint("mock:query");
@@ -58,8 +59,8 @@ public class SqlProducerWhereIssueTest extends
CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
- List list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
- Map row = (Map) list.get(0);
+ List<?> list =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ Map<?, ?> row = (Map) list.get(0);
assertEquals("ASF", row.get("LICENSE"));
assertEquals(2L, row.get("ROWCOUNT"));
row = (Map) list.get(1);
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
index db084f27297e..8abe6e72dbab 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/CallableStatementWrapperTest.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.camel.Exchange;
import org.apache.camel.component.sql.stored.template.TemplateParser;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.dao.DataAccessException;
@@ -64,7 +65,7 @@ public class CallableStatementWrapperTest extends
CamelTestSupport {
+
"(INTEGER ${header.v1},INTEGER ${header.v2},OUT INTEGER resultofsub)",
factory);
- final Exchange exchange = createExchangeWithBody(null);
+ final Exchange exchange =
TestSupport.createExchangeWithBody(this.context, null);
exchange.getIn().setHeader("v1", 1);
exchange.getIn().setHeader("v2", 2);
@@ -88,7 +89,7 @@ public class CallableStatementWrapperTest extends
CamelTestSupport {
+
"(OUT INTEGER resultofsub, INTEGER ${header.v1},INTEGER ${header.v2})",
factory);
- final Exchange exchange = createExchangeWithBody(null);
+ final Exchange exchange =
TestSupport.createExchangeWithBody(this.context, null);
exchange.getIn().setHeader("v1", 1);
exchange.getIn().setHeader("v2", 2);
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
index 3d0ba740bdf1..382d5928aa47 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
@@ -33,6 +33,7 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.support.DefaultExchange;
import org.apache.camel.test.junit5.CamelTestSupport;
+import org.apache.camel.test.junit5.TestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -56,7 +57,7 @@ public class ParserTest extends CamelTestSupport {
assertEquals("addnumbers", template.getProcedureName());
assertEquals(5, template.getParameterList().size());
- Exchange exchange = createExchangeWithBody(null);
+ Exchange exchange = TestSupport.createExchangeWithBody(this.context,
null);
exchange.getIn().setHeader("header1", 1);
exchange.setProperty("property1", "constant string");
exchange.getIn().setHeader("header2", BigInteger.valueOf(2));
@@ -103,7 +104,7 @@ public class ParserTest extends CamelTestSupport {
@Test
public void nestedSimpleExpression() {
- Exchange exchange = createExchangeWithBody(1);
+ Exchange exchange = TestSupport.createExchangeWithBody(this.context,
1);
exchange.getIn().setHeader("foo", 1);
exchange.getIn().setHeader("bar", 3);
Template template = parser.parseTemplate("ADDNUMBERS2(INTEGER
${header.foo},INTEGER ${header.bar})");
@@ -127,7 +128,7 @@ public class ParserTest extends CamelTestSupport {
public void colonInSimple() {
PropertiesComponent pc = context.getPropertiesComponent();
pc.setLocation("classpath:jndi.properties");
- Exchange exchange = createExchangeWithBody(1);
+ Exchange exchange = TestSupport.createExchangeWithBody(this.context,
1);
Template template = parser.parseTemplate("ADDNUMBERS2(-1342
${properties:java.naming.factory.initial})");
assertEquals("org.apache.camel.support.jndi.CamelInitialContextFactory",
((InParameter)
template.getParameterList().get(0)).getValueExtractor().eval(exchange, null));
@@ -136,9 +137,9 @@ public class ParserTest extends CamelTestSupport {
@Test
public void colonInLocation() {
Template template = parser.parseTemplate("ADDNUMBERS2(-1342 :#a:)");
- Exchange exchange = createExchangeWithBody(1);
+ Exchange exchange = TestSupport.createExchangeWithBody(this.context,
1);
- Map container = new HashMap();
+ Map<String, Integer> container = new HashMap<>();
container.put("a:", 1);
assertEquals(1, ((InParameter)
template.getParameterList().get(0)).getValueExtractor().eval(exchange,
container));
}
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
index ffc218d4f9ff..32f2170f256e 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ProducerInOutTest.java
@@ -66,6 +66,7 @@ public class ProducerInOutTest extends CamelTestSupport {
Exchange exchange = mock.getExchanges().get(0);
+ @SuppressWarnings("rawtypes")
Map results = exchange.getIn().getBody(Map.class);
assertEquals(1, results.get("out1"));
assertEquals(2, results.get("out2"));
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java
index 9e24dc1728ad..a8c9f188415e 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/ClassLoadingAwareObjectInputStreamTest.java
@@ -56,16 +56,17 @@ public class ClassLoadingAwareObjectInputStreamTest {
oos.flush();
final byte[] serialized = baos.toByteArray();
- final ObjectInputStream bis = new ClassLoadingAwareObjectInputStream(
- context.getApplicationContextClassLoader(), new
ByteArrayInputStream(serialized));
- final DefaultExchangeHolder deserialized = (DefaultExchangeHolder)
bis.readObject();
-
- final DefaultExchange exchange2 = new DefaultExchange(context);
- DefaultExchangeHolder.unmarshal(exchange2, deserialized);
-
- List<MyObject> receivedObjects = exchange2.getIn().getBody(List.class);
- assertEquals(1, receivedObjects.size());
- assertEquals(o, receivedObjects.get(0));
+ try (final ObjectInputStream bis = new
ClassLoadingAwareObjectInputStream(
+ context.getApplicationContextClassLoader(), new
ByteArrayInputStream(serialized))) {
+ final DefaultExchangeHolder deserialized = (DefaultExchangeHolder)
bis.readObject();
+ final DefaultExchange exchange2 = new DefaultExchange(context);
+ DefaultExchangeHolder.unmarshal(exchange2, deserialized);
+
+ @SuppressWarnings("unchecked")
+ List<MyObject> receivedObjects =
exchange2.getIn().getBody(List.class);
+ assertEquals(1, receivedObjects.size());
+ assertEquals(o, receivedObjects.get(0));
+ }
}
}
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
index 6451048219cf..6e37111f48d6 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateStoreAsTextTest.java
@@ -97,6 +97,7 @@ public class JdbcAggregateStoreAsTextTest extends
CamelSpringTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+ @SuppressWarnings({ "unchecked", "rawtypes" })
@Test
public void testStoreBodyAsTextAndNoHeaders() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:aggregated");
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
index e3cca38a39e3..925a9748a6cb 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcRemoveConfirmOrderAggregateTest.java
@@ -23,7 +23,6 @@ import java.util.concurrent.TimeUnit;
import javax.sql.DataSource;
-import org.apache.camel.AggregationStrategy;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -56,7 +55,7 @@ public class JdbcRemoveConfirmOrderAggregateTest extends
AbstractJdbcAggregation
}
}
- public static class MyAggregationStrategyWithDelay extends
MyAggregationStrategy implements AggregationStrategy {
+ public static class MyAggregationStrategyWithDelay extends
MyAggregationStrategy {
@Override
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
