From 93a3d55ec5529a3f3950b92e3a78125928f60379 Mon Sep 17 00:00:00 2001
From: vempo <vitaliy.emporopulo@amdocs.com>
Date: Wed, 10 Jan 2018 11:44:21 +0200
Subject: Removed unused code in logger

Change-Id: I04da65e3470d6444dd77a52a7c8371811d0941b6
Issue-ID: SDC-772
Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
---
 .../org/openecomp/sdc/logging/api/BaseFactory.java | 54 -----------------
 .../java/org/openecomp/sdc/logging/api/Logger.java |  2 +-
 .../src/main/resources/factoryConfiguration.json   |  3 -
 ...openecomp.sdc.logging.api.LoggerCreationService |  1 -
 ...c.logging.api.context.ContextPropagationService |  1 -
 .../org/openecomp/sdc/logging/api/LoggerTest.java  | 70 +++++++++++-----------
 6 files changed, 36 insertions(+), 95 deletions(-)
 delete mode 100644 openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/BaseFactory.java
 delete mode 100644 openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/resources/factoryConfiguration.json
 delete mode 100644 openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.LoggerCreationService
 delete mode 100644 openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.context.ContextPropagationService

diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/BaseFactory.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/BaseFactory.java
deleted file mode 100644
index 7893543953..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/BaseFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2016-2017 European Support Limited
- *
- * 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.
- */
-
-package org.openecomp.sdc.logging.api;
-
-import java.util.Iterator;
-import java.util.ServiceLoader;
-
-/**
- * Contains common functionality for factories used in the logging framework.
- *
- * <p>In order to use the factory, a particular (e.g. framework-specific) implementation of a service must be
- * configured as described in
- * <a href="http://docs.oracle.com/javase/8/docs/api/java/util/ServiceLoader.html">java.util.ServiceLoader</a>).</p>
- *
- * @author evitaliy
- * @since 13/09/2016.
- *
- * @see ServiceLoader
- */
-public class BaseFactory {
-
-    protected static <T> T locateService(Class<T> clazz) {
-
-        T service;
-        ServiceLoader<T> loader = ServiceLoader.load(clazz);
-        Iterator<T> iterator = loader.iterator();
-        if (iterator.hasNext()) {
-
-            service = iterator.next();
-            if (iterator.hasNext()) {
-                System.err.println(String.format("Warning! Configured more than one implementation of %s",
-                        clazz.getName()));
-            }
-
-            return service;
-        }
-
-        throw new IllegalArgumentException((String.format("No implementations configured for %s", clazz.getName())));
-    }
-}
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
index 52357491c4..cf5bdf6721 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/api/Logger.java
@@ -17,7 +17,7 @@
 package org.openecomp.sdc.logging.api;
 
 /**
- * <p>This interface defines logging as specified by Open OPENECOMP logging requirements.</p>
+ * <p>This interface defines logging as specified by ONAP logging requirements.</p>
  *
  * <p>Formatted messages must follow the <a href="http://www.slf4j.org/api/org/slf4j/helpers/MessageFormatter.html>SLF4J
  * format</a>.</p>
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/resources/factoryConfiguration.json b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/resources/factoryConfiguration.json
deleted file mode 100644
index 33163b32bb..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/resources/factoryConfiguration.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "org.openecomp.sdc.logging.api.BaseFactory": "org.openecomp.sdc.logging.api.LoggerFactory"
-}
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.LoggerCreationService b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.LoggerCreationService
deleted file mode 100644
index ee01c4d871..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.LoggerCreationService
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.sdc.logging.SLF4JLoggerCreationService
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.context.ContextPropagationService b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.context.ContextPropagationService
deleted file mode 100644
index 2c401614ae..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/resources/META-INF/services/org.openecomp.sdc.logging.api.context.ContextPropagationService
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.sdc.logging.context.MDCPropagationService
\ No newline at end of file
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/api/LoggerTest.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/api/LoggerTest.java
index b2f968b978..1359a1ff2a 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/api/LoggerTest.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/test/java/org/openecomp/sdc/logging/api/LoggerTest.java
@@ -4,9 +4,9 @@
  * 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.
@@ -19,43 +19,43 @@ package org.openecomp.sdc.logging.api;
 import org.testng.annotations.Test;
 
 /**
- * This is only for manual testing - change ENABLE to 'true'
+ * This is only for manual testing - change {@link #ENABLED} to 'true'
  *
  * @author evitaliy
  * @since 13/09/2016.
  */
 public class LoggerTest {
 
-  private static final boolean ENABLED = false;
-  private static final Logger LOGGER = LoggerFactory.getLogger(LoggerTest.class);
-
-  @Test(enabled = ENABLED)
-  public void testMetrics() throws Exception {
-    LOGGER.metrics("This is metrics");
-  }
-
-  @Test(enabled = ENABLED)
-  public void testAudit() throws Exception {
-    LOGGER.audit("This is audit");
-  }
-
-  @Test(enabled = ENABLED)
-  public void testDebug() throws Exception {
-    LOGGER.debug("This is debug");
-  }
-
-  @Test(enabled = ENABLED)
-  public void testInfo() throws Exception {
-    LOGGER.info("This is info");
-  }
-
-  @Test(enabled = ENABLED)
-  public void testWarn() throws Exception {
-    LOGGER.warn("This is warning");
-  }
-
-  @Test(enabled = ENABLED)
-  public void testError() throws Exception {
-    LOGGER.error("This is error");
-  }
+    private static final boolean ENABLED = false; // for manual testing change to 'true'
+    private static final Logger LOGGER = LoggerFactory.getLogger(LoggerTest.class);
+
+    @Test(enabled = ENABLED)
+    public void testMetrics() {
+        LOGGER.metrics("This is metrics");
+    }
+
+    @Test(enabled = ENABLED)
+    public void testAudit() {
+        LOGGER.audit("This is audit");
+    }
+
+    @Test(enabled = ENABLED)
+    public void testDebug() {
+        LOGGER.debug("This is debug");
+    }
+
+    @Test(enabled = ENABLED)
+    public void testInfo() {
+        LOGGER.info("This is info");
+    }
+
+    @Test(enabled = ENABLED)
+    public void testWarn() {
+        LOGGER.warn("This is warning");
+    }
+
+    @Test(enabled = ENABLED)
+    public void testError() {
+        LOGGER.error("This is error");
+    }
 }
-- 
cgit 1.2.3-korg