Updated champ-lib to use the correct logger

[aai/champ.git] / champ-lib / champ-core / src / main / java / org / onap / aai / champcore / graph / impl / ChampAPIImpl.java

diff --git a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java
index 607ba78..2350d00 100644 (file)
--- a/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java
+++ b/champ-lib/champ-core/src/main/java/org/onap/aai/champcore/graph/impl/ChampAPIImpl.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START==========================================
  * org.onap.aai
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
  * ===================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END============================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.champcore.graph.impl;
 
@@ -26,13 +25,15 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.onap.aai.champcore.ChampAPI;
+import org.onap.aai.champcore.ChampCoreMsgs;
 import org.onap.aai.champcore.ChampGraph;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onap.aai.cl.api.Logger;
+import org.onap.aai.cl.eelf.LoggerFactory;
+
 
 public class ChampAPIImpl implements ChampAPI {
 
-       private static final Logger LOGGER = LoggerFactory.getLogger(ChampAPIImpl.class);
+       private static final Logger LOGGER = LoggerFactory.getInstance().getLogger(ChampAPIImpl.class);
 
        private final AtomicBoolean shutdown;
        private final String type;
@@ -68,13 +69,16 @@ public class ChampAPIImpl implements ChampAPI {
        public void shutdown() {
                if (shutdown.compareAndSet(false, true)) {
                        for (Entry<String, ChampGraph> graphEntry : graphs.entrySet()) {
-                               LOGGER.info("Shutting down graph {}", graphEntry.getKey());
+                               LOGGER.info(ChampCoreMsgs.CHAMPCORE_CHAMP_API_IMPL_INFO, 
+                                   String.format("Shutting down graph %s", graphEntry.getKey()));
                                
                                try {
                                        graphEntry.getValue().shutdown();
-                                       LOGGER.info("Graph {} shutdown successfully", graphEntry.getKey());
+                                       LOGGER.info(ChampCoreMsgs.CHAMPCORE_CHAMP_API_IMPL_INFO,
+                                           String.format("Graph %s shutdown successfully", graphEntry.getKey()));
                                } catch (Throwable t) {
-                                       LOGGER.warn("Caught exception while shutting down graph " + graphEntry.getKey(), t);
+                                       LOGGER.warn(ChampCoreMsgs.CHAMPCORE_CHAMP_API_IMPL_WARN,
+                                           String.format("Caught exception while shutting down graph %s: %s", graphEntry.getKey(), t.getMessage()));
                                }
                        }
                }