Merge "Update dmaap 1.1.9 changes" into casablanca

[policy/engine.git] / PolicyEngineUtils / src / main / java / org / onap / policy / utils / BusPublisher.java

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
index 792c389..7452135 100644 (file)
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
@@ -1,14 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * PolicyEngineUtils
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
 package org.onap.policy.utils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
-
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
 import org.onap.policy.common.logging.eelf.PolicyLogger;
-
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 
 public interface BusPublisher {
        
@@ -20,7 +40,7 @@ public interface BusPublisher {
         * @return true if success, false otherwise
         * @throws IllegalArgumentException if no message provided
         */
-       public boolean send(String partitionId, String message) throws IllegalArgumentException;
+       public boolean send(String partitionId, String message);
        
        /**
         * closes the publisher
@@ -31,6 +51,7 @@ public interface BusPublisher {
         * DmaapClient library wrapper
         */
        public static class DmaapPublisherWrapper implements BusPublisher {
+           private static Logger logger = FlexLogger.getLogger(DmaapPublisherWrapper.class);
                /**
                 * MR based Publisher
                 */             
@@ -74,16 +95,16 @@ public interface BusPublisher {
                 */
                @Override
                public void close() {
-                       if (PolicyLogger.isInfoEnabled())
-                               PolicyLogger.info(DmaapPublisherWrapper.class.getName(), 
+                       if (logger.isInfoEnabled())
+                           logger.info(DmaapPublisherWrapper.class.getName()+ 
                                                  "CREATION: " + this);
                        
                        try {
                                this.publisher.close(1, TimeUnit.SECONDS);
                        } catch (Exception e) {
-                               PolicyLogger.warn(DmaapPublisherWrapper.class.getName(), 
+                           logger.warn(DmaapPublisherWrapper.class.getName()+ 
                                                  "CLOSE: " + this + " because of " + 
-                                                                 e.getMessage());
+                                                                 e.getMessage(), e);
                        }
                }
                
@@ -91,8 +112,7 @@ public interface BusPublisher {
                 * {@inheritDoc}
                 */
                @Override
-               public boolean send(String partitionId, String message) 
-                               throws IllegalArgumentException {
+               public boolean send(String partitionId, String message){
                        if (message == null)
                                throw new IllegalArgumentException("No message provided");