Incorrect errormessage when publishing with a domainId larger than 255 chars (#246)

* Added proper error message when domainId is long

Co-authored-by: Vishnu <vishnu.alapati@ericsson.com>

Author: vishnu-alapati

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 2.0.25
 - Implemented "publisher confirms " in REMReM so that this  can be used to get confirmation about the messages sent to MB.
 - Implemented configurable parameters for TCP connection timeout against LDAP and MB
+- Implemented changes to return proper error messages when DomainId value is greater than 255 chars.
 
 ## 2.0.24
 - Updated all the curl commands in documentation

publish-common/src/main/java/com/ericsson/eiffel/remrem/publish/helper/RMQHelper.java

@@ -89,7 +89,7 @@ private void protocolInit(String protocol) throws RemRemPublishException {
         rabbitmqProtocolProperties.init();
     }
 
-    public void send(String routingKey, String msg, MsgService msgService) throws IOException, NackException, TimeoutException, RemRemPublishException {
+    public void send(String routingKey, String msg, MsgService msgService) throws IOException, NackException, TimeoutException, RemRemPublishException, IllegalArgumentException {
         String protocol = msgService.getServiceName();
         RabbitMqProperties rabbitmqProtocolProperties = rabbitMqPropertiesMap.get(protocol);
         if (rabbitmqProtocolProperties != null) {

publish-common/src/main/java/com/ericsson/eiffel/remrem/publish/helper/RabbitMqProperties.java

@@ -447,7 +447,7 @@ private boolean hasExchange() throws RemRemPublishException {
      * @throws RemRemPublishException
      */
     public void send(String routingKey, String msg)
-            throws IOException, NackException, TimeoutException, RemRemPublishException {
+            throws IOException, NackException, TimeoutException, RemRemPublishException, IllegalArgumentException {
             Channel channel = giveMeRandomChannel();
             channel.addShutdownListener(new ShutdownListener() {
                 public void shutdownCompleted(ShutdownSignalException cause) {
@@ -481,6 +481,9 @@ public void shutdownCompleted(ShutdownSignalException cause) {
         } catch (TimeoutException e) {
             log.error("Failed to publish message due to " + e.getMessage());
             throw new TimeoutException("Timeout waiting for ACK " + e.getMessage());
+        } catch (IllegalArgumentException e) {
+            log.error("Failed to publish message due to " + e.getMessage());
+            throw new IllegalArgumentException("DomainId limit exceeded " + e.getMessage());
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             if(!channel.isOpen()&& rabbitConnection.isOpen()){

publish-common/src/main/java/com/ericsson/eiffel/remrem/publish/service/MessageServiceRMQImpl.java

@@ -85,7 +85,10 @@ public SendResult send(Map<String, String> routingKeyMap, Map<String, String> ms
                 } catch (RemRemPublishException e) {
                     event = new PublishResultItem(entryKey, HttpStatus.INTERNAL_SERVER_ERROR.value(), PropertiesConfig.SERVER_DOWN,
                             e.getMessage());
-                } catch (IOException e) {
+                } catch (IllegalArgumentException e) {
+                    event = new PublishResultItem(entryKey, HttpStatus.BAD_REQUEST.value(), PropertiesConfig.INVALID_MESSAGE,
+                            e.getMessage());
+	        }catch (IOException e) {
                     event = new PublishResultItem(entryKey, HttpStatus.INTERNAL_SERVER_ERROR.value(), PropertiesConfig.SERVER_DOWN,
                             PropertiesConfig.SERVER_DOWN_MESSAGE);
                 }