1 files changed, 8 insertions, 28 deletions

diff --git a/common-app-logging/src/main/java/org/openecomp/sdc/common/log/elements/LoggerFactory.java b/common-app-logging/src/main/java/org/openecomp/sdc/common/log/elements/LoggerFactory.java
index 59e2777966..f2f33b2457 100644
--- a/common-app-logging/src/main/java/org/openecomp/sdc/common/log/elements/LoggerFactory.java
+++ b/common-app-logging/src/main/java/org/openecomp/sdc/common/log/elements/LoggerFactory.java
@@ -1,23 +1,3 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
- * 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.openecomp.sdc.common.log.elements;
 
 import org.slf4j.Logger;
@@ -35,19 +15,19 @@ public class LoggerFactory {
     @SuppressWarnings("unchecked")
     public static <T, V> V getLogger(Class<T> type, Logger logger) {
 
-        if (type.getName().equals(LoggerAudit.class.getName())) {
+        if (type.isAssignableFrom(LoggerAudit.class)) {
             return (V) new LoggerAudit(new LogFieldsMdcHandler(), logger);
         }
 
-        if (type.getName().equals(LoggerDebug.class.getName())) {
+        if (type.isAssignableFrom(LoggerDebug.class)) {
             return (V) new LoggerDebug(new LogFieldsMdcHandler(), logger);
         }
 
-        if (type.getName().equals(LoggerMetric.class.getName())) {
+        if (type.isAssignableFrom(LoggerMetric.class)) {
             return (V) new LoggerMetric(new LogFieldsMdcHandler(), logger);
         }
 
-        if (type.getName().equals(LoggerError.class.getName())) {
+        if (type.isAssignableFrom(LoggerError.class)) {
             return (V) new LoggerError(new LogFieldsMdcHandler(), logger);
         }
 
@@ -57,19 +37,19 @@ public class LoggerFactory {
     @SuppressWarnings("unchecked")
     public static <T, V> V getMdcLogger(Class<T> type, Logger logger) {
 
-        if (type.getName().equals(LoggerAudit.class.getName())) {
+        if (type.isAssignableFrom(LoggerAudit.class)) {
             return (V) new LoggerAudit(LogFieldsMdcHandler.getInstance(), logger);
         }
 
-        if (type.getName().equals(LoggerDebug.class.getName())) {
+        if (type.isAssignableFrom(LoggerDebug.class)) {
             return (V) new LoggerDebug(LogFieldsMdcHandler.getInstance(), logger);
         }
 
-        if (type.getName().equals(LoggerMetric.class.getName())) {
+        if (type.isAssignableFrom(LoggerMetric.class)) {
             return (V) new LoggerMetric(LogFieldsMdcHandler.getInstance(), logger);
         }
 
-        if (type.getName().equals(LoggerError.class.getName())) {
+        if (type.isAssignableFrom(LoggerError.class)) {
             return (V) new LoggerError(LogFieldsMdcHandler.getInstance(), logger);
         }