Using multi-catch statements in EventPublisher

Issue-Id: DCAEGEN2-129
Change-Id: I501334e555e8c83a48525a5f1a059634c266f837
Signed-off-by: Konstantinos Kanonakis <konstantinos.kanonakis@huawei.com>

diff --git a/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java b/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java
index f870ffa..0d9cf91 100644 (file)
--- a/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java
+++ b/src/main/java/org/onap/dcae/commonFunction/EventPublisher.java
@@ -153,16 +153,8 @@ public class EventPublisher {
             CommonStartup.oplog.info(String.format("URL:%sTOPIC:%sEvent Published:%s",
                 ueburl, topic, event));
 
-        } catch (IOException e) {
-            log.error("IOException:Unable to publish event:" + event + " streamid:" + streamid
-                + " Exception:" + e);
-        } catch (GeneralSecurityException e) {
-            // TODO Auto-generated catch block
-            log.error("GeneralSecurityException:Unable to publish event:" + event + " streamid:"
-                + streamid + " Exception:" + e);
-        } catch (IllegalArgumentException e) {
-            log.error("IllegalArgumentException:Unable to publish event:" + event + " streamid:"
-                + streamid + " Exception:" + e);
+        } catch (IOException | GeneralSecurityException | IllegalArgumentException e) {
+            log.error("Unable to publish event: {} streamid: {}. Exception: {}", event, streamid, e);
         }
 
     }
@@ -177,10 +169,8 @@ public class EventPublisher {
                     log.error(stuck.size() + " messages unsent");
                 }
             }
-        } catch (InterruptedException ie) {
-            log.error("Caught an Interrupted Exception on Close event");
-        } catch (IOException ioe) {
-            log.error("Caught IO Exception: " + ioe);
+        } catch (InterruptedException | IOException e) {
+            log.error("Caught Exception on Close event: {}", e);
         }
 
     }