[camel] branch main updated: CAMEL-17271: camel-cm-test - Fix failing CMTest

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus 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 f2c200d  CAMEL-17271: camel-cm-test - Fix failing CMTest
f2c200d is described below

commit f2c200d9e0ffbf715ed7a17c25d5436ee7298551
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Dec 4 10:25:49 2021 +0100

    CAMEL-17271: camel-cm-test - Fix failing CMTest
---
 .../apache/camel/component/cm/CMSenderOneMessageImpl.java   | 13 ++++---------
 .../cmresponse/NoAccountFoundForProductTokenException.java  |  2 --
 .../java/org/apache/camel/component/cm/test/CMTest.java     |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

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 25bee7f..e3a19e0 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
@@ -20,7 +20,7 @@ import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
 import javax.xml.XMLConstants;
@@ -181,7 +181,7 @@ public class CMSenderOneMessageImpl implements CMSender {
 
         final HttpClient client = HttpClientBuilder.create().build();
         final HttpPost post = new HttpPost(urlString);
-        post.setEntity(new StringEntity(requestString, 
Charset.forName("UTF-8")));
+        post.setEntity(new StringEntity(requestString, 
StandardCharsets.UTF_8));
 
         try {
 
@@ -237,17 +237,12 @@ public class CMSenderOneMessageImpl implements CMSender {
                     } else if 
(line.contains(CMConstants.ERROR_INVALID_PRODUCT_TOKEN)) {
                         throw new InvalidProductTokenException();
                     } else {
-
-                        // SO FAR i would expect other kind of ERROR.
-
-                        // MSISDN correctness and message validity is client
-                        // responsibility
-                        throw new CMResponseException("CHECK ME. I am not 
expecting this. ");
+                        throw new CMResponseException(line);
                     }
                 }
 
                 // Ok. Line is EMPTY - successfully submitted
-                LOG.debug("Result of the request processing: Successfully 
submited");
+                LOG.debug("Result of the request processing: Successfully 
submitted");
             }
         } catch (final IOException io) {
             throw new CMDirectException(io);
diff --git 
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
 
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
index 84f6bbf..16a718d 100644
--- 
a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
+++ 
b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/exceptions/cmresponse/NoAccountFoundForProductTokenException.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.cm.exceptions.cmresponse;
 
 /**
  * No account found for the provided product token.
- *
- * @author Omar
  */
 public class NoAccountFoundForProductTokenException extends 
CMResponseException {
 
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 9c244c3..a0662da 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(NoAccountFoundForProductTokenException.class,
+        assertThrows(CMResponseException.class,
                 () -> cmProxy.send(smsMessage));
     }