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 2022/03/09 15:24:06 UTC
[camel] branch camel-3.14.x updated (298a75a -> 800cfbc)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 298a75a CAMEL-17761: do respect user-provided Cassandra containers (#7164)
new 8762698 CAMEL-17768 Camel-cm-sms: Handle changed error message correctly (#7168)
new 800cfbc CAMEL-17767: Check for null and empty String (#7171)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/camel/component/cm/CMConstants.java | 1 +
.../main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java | 2 +-
.../src/test/java/org/apache/camel/component/cm/test/CMTest.java | 2 +-
.../src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
[camel] 01/02: CAMEL-17768 Camel-cm-sms: Handle changed error message correctly (#7168)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8762698840dd9ab5d58e2cf10afd706e92e4e977
Author: JiriOndrusek <on...@gmail.com>
AuthorDate: Wed Mar 9 16:20:17 2022 +0100
CAMEL-17768 Camel-cm-sms: Handle changed error message correctly (#7168)
---
.../src/main/java/org/apache/camel/component/cm/CMConstants.java | 1 +
.../main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java | 2 +-
.../src/test/java/org/apache/camel/component/cm/test/CMTest.java | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConstants.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConstants.java
index 26b3da0..822ee1d 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConstants.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMConstants.java
@@ -30,6 +30,7 @@ public interface CMConstants {
// status code 200 - Error substrings - check it contains.
String ERROR_UNKNOWN = "Unknown error";
String ERROR_NO_ACCOUNT = "No account found";
+ String ERROR_NO_USER = "No or incorrect User node found";
String ERROR_INSUFICIENT_BALANCE = "Insufficient balance";
String ERROR_UNROUTABLE_MESSAGE = "Message is unroutable";
String ERROR_INVALID_PRODUCT_TOKEN = "Invalid product token";
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
index e3a19e0..7fe25e2 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
@@ -228,7 +228,7 @@ public class CMSenderOneMessageImpl implements CMSender {
if (line.contains(CMConstants.ERROR_UNKNOWN)) {
throw new UnknownErrorException();
- } else if (line.contains(CMConstants.ERROR_NO_ACCOUNT)) {
+ } else if (line.contains(CMConstants.ERROR_NO_ACCOUNT) || line.contains(CMConstants.ERROR_NO_USER)) {
throw new NoAccountFoundForProductTokenException();
} else if (line.contains(CMConstants.ERROR_INSUFICIENT_BALANCE)) {
throw new InsufficientBalanceException();
diff --git a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
index a0662da..9c244c3 100644
--- a/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
+++ b/components/camel-cm-sms/src/test/java/org/apache/camel/component/cm/test/CMTest.java
@@ -161,7 +161,7 @@ public class CMTest {
// Body
final SMSMessage smsMessage = new SMSMessage(generateIdAsString(), generateUnicodeMessage(), validNumber, null);
- assertThrows(CMResponseException.class,
+ assertThrows(NoAccountFoundForProductTokenException.class,
() -> cmProxy.send(smsMessage));
}
[camel] 02/02: CAMEL-17767: Check for null and empty String (#7171)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 800cfbc6895a1f65ec4e8a200b43eefd35c0398b
Author: Benjamin Graf <gr...@users.noreply.github.com>
AuthorDate: Wed Mar 9 16:20:29 2022 +0100
CAMEL-17767: Check for null and empty String (#7171)
---
.../src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index 77e1d9f..32e095e 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -59,7 +59,7 @@ public abstract class CsvMarshaller {
}
String header = dataFormat.getHeader();
- if (header != null) {
+ if (header != null && !header.isEmpty()) {
String[] columns = header.split(",");
return new FixedColumnsMarshaller(format, columns);
}