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/08/26 14:51:29 UTC
[camel] 01/02: CAMEL-15453: Migrated deprecated api
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
commit 645b8449f420715a7d2ef6aa77abf8a9befe3c2e
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Aug 26 16:45:22 2020 +0200
CAMEL-15453: Migrated deprecated api
---
.../jdbc/AbstractJdbcGeneratedKeysTest.java | 36 +++++++++++-----------
.../camel/component/jdbc/JdbcColumnTypeTest.java | 5 ++-
.../camel/component/jdbc/JdbcRSMetaDataTest.java | 5 ++-
.../component/jdbc/JdbcRouteKeyOrderingTest.java | 5 ++-
.../apache/camel/component/jdbc/JdbcRouteTest.java | 3 +-
.../jdbc/JdbcRouteUsingSqlSelectAliasTest.java | 5 ++-
6 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcGeneratedKeysTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcGeneratedKeysTest.java
index 32007a7..5648ce7 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcGeneratedKeysTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/AbstractJdbcGeneratedKeysTest.java
@@ -46,18 +46,18 @@ public abstract class AbstractJdbcGeneratedKeysTest extends AbstractJdbcTestSupp
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
- List<Map<String, Object>> generatedKeys = out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
- assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getOut().getBody());
+ List<Map<String, Object>> generatedKeys
+ = out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
+ assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getMessage().getBody());
assertEquals(1, generatedKeys.size());
Map<String, Object> row = generatedKeys.get(0);
assertEquals(BigDecimal.valueOf(2), row.get("1"), "auto increment value should be 2");
- assertEquals(1, out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
+ assertEquals(1, out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
"generated keys row count should be one");
}
@@ -85,18 +85,18 @@ public abstract class AbstractJdbcGeneratedKeysTest extends AbstractJdbcTestSupp
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
- List<Map<String, Object>> generatedKeys = out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
- assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getOut().getBody());
+ List<Map<String, Object>> generatedKeys
+ = out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
+ assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getMessage().getBody());
assertEquals(1, generatedKeys.size());
Map<String, Object> row = generatedKeys.get(0);
assertEquals(BigDecimal.valueOf(2), row.get("1"), "auto increment value should be 2");
- assertEquals(1, out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
+ assertEquals(1, out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
"generated keys row count should be one");
}
@@ -124,18 +124,18 @@ public abstract class AbstractJdbcGeneratedKeysTest extends AbstractJdbcTestSupp
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
- assertNotNull(out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA));
+ assertNotNull(out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT));
- List<Map<String, Object>> generatedKeys = out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
- assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getOut().getBody());
+ List<Map<String, Object>> generatedKeys
+ = out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_DATA, List.class);
+ assertNotNull(generatedKeys, "out body could not be converted to an ArrayList - was: " + out.getMessage().getBody());
assertEquals(1, generatedKeys.size());
Map<String, Object> row = generatedKeys.get(0);
assertEquals(BigDecimal.valueOf(2), row.get("1"), "auto increment value should be 2");
- assertEquals(1, out.getOut().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
+ assertEquals(1, out.getMessage().getHeader(JdbcConstants.JDBC_GENERATED_KEYS_ROW_COUNT),
"generated keys row count should be one");
}
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
index da95252..7254872 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcColumnTypeTest.java
@@ -42,16 +42,15 @@ public class JdbcColumnTypeTest extends AbstractJdbcTestSupport {
Exchange out = template.send(directHelloEndpoint, directHelloExchange);
assertNotNull(out);
- assertNotNull(out.getOut());
- List<Map<String, Object>> returnValues = out.getOut().getBody(List.class);
+ List<Map<String, Object>> returnValues = out.getMessage().getBody(List.class);
assertNotNull(returnValues);
assertEquals(1, returnValues.size());
Map<String, Object> row = returnValues.get(0);
assertEquals("id1", row.get("ID"));
assertNotNull(row.get("PICTURE"));
- Set<String> columnNames = (Set<String>) out.getOut().getHeader(JdbcConstants.JDBC_COLUMN_NAMES);
+ Set<String> columnNames = (Set<String>) out.getMessage().getHeader(JdbcConstants.JDBC_COLUMN_NAMES);
assertNotNull(columnNames);
assertEquals(2, columnNames.size());
assertTrue(columnNames.contains("ID"));
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRSMetaDataTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRSMetaDataTest.java
index 8276afb..b9809ad 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRSMetaDataTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRSMetaDataTest.java
@@ -41,16 +41,15 @@ public class JdbcRSMetaDataTest extends AbstractJdbcTestSupport {
Exchange out = template.send(directHelloEndpoint, directHelloExchange);
assertNotNull(out);
- assertNotNull(out.getOut());
- List<Map<String, Object>> returnValues = out.getOut().getBody(List.class);
+ List<Map<String, Object>> returnValues = out.getMessage().getBody(List.class);
assertNotNull(returnValues);
assertEquals(3, returnValues.size());
Map<String, Object> row = returnValues.get(0);
assertEquals("cust1", row.get("ID"));
assertEquals("jstrachan", row.get("NAME"));
- Set<String> columnNames = (Set<String>) out.getOut().getHeader(JdbcConstants.JDBC_COLUMN_NAMES);
+ Set<String> columnNames = (Set<String>) out.getMessage().getHeader(JdbcConstants.JDBC_COLUMN_NAMES);
assertNotNull(columnNames);
assertEquals(2, columnNames.size());
assertTrue(columnNames.contains("ID"));
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java
index d8348f9..26a86e9 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteKeyOrderingTest.java
@@ -52,9 +52,8 @@ public class JdbcRouteKeyOrderingTest extends JdbcRouteTest {
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- List<Map<String, Object>> rowList = out.getOut().getBody(List.class);
- assertNotNull(rowList, "out body could not be converted to a List - was: " + out.getOut().getBody());
+ List<Map<String, Object>> rowList = out.getMessage().getBody(List.class);
+ assertNotNull(rowList, "out body could not be converted to a List - was: " + out.getMessage().getBody());
assertEquals(3, rowList.size());
Map<String, Object> row = rowList.get(0);
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
index 63d4a59..f30d5f7 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteTest.java
@@ -52,8 +52,7 @@ public class JdbcRouteTest extends AbstractJdbcTestSupport {
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- List<Map<String, Object>> data = out.getOut().getBody(List.class);
+ List<Map<String, Object>> data = out.getMessage().getBody(List.class);
assertNotNull(data);
assertEquals(3, data.size());
Map<String, Object> row = data.get(0);
diff --git a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java
index 901ec19..5cd528e 100644
--- a/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java
+++ b/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcRouteUsingSqlSelectAliasTest.java
@@ -44,9 +44,8 @@ public class JdbcRouteUsingSqlSelectAliasTest extends AbstractJdbcTestSupport {
// assertions of the response
assertNotNull(out);
- assertNotNull(out.getOut());
- List<Map<String, Object>> data = out.getOut().getBody(List.class);
- assertNotNull(data, "out body could not be converted to a List - was: " + out.getOut().getBody());
+ List<Map<String, Object>> data = out.getMessage().getBody(List.class);
+ assertNotNull(data, "out body could not be converted to a List - was: " + out.getMessage().getBody());
assertEquals(3, data.size());
Map<String, Object> row = data.get(0);
assertEquals("cust1", row.get("IDENTIFIER"));