2 files changed, 4 insertions, 80 deletions

diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java b/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
index 434dbf946b..eb6d0d0b43 100644
--- a/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
+++ b/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
@@ -25,8 +25,8 @@ import org.onap.so.client.graphinventory.entities.GraphInventoryEdgeLabel;
 public enum AAIEdgeLabel implements GraphInventoryEdgeLabel {
 
 	BELONGS_TO("org.onap.relationships.inventory.BelongsTo"),
-	USES("org.onap.relationships.inventory.Uses");
-	
+	USES("org.onap.relationships.inventory.Uses"),
+	COMPOSED_OF("org.onap.relationships.inventory.ComposedOf");
 	
 	private final String label;
 	private AAIEdgeLabel(String label) {
diff --git a/common/src/main/java/org/onap/so/logger/MsoLogger.java b/common/src/main/java/org/onap/so/logger/MsoLogger.java
index 39a23b5c3e..341d7996a9 100644
--- a/common/src/main/java/org/onap/so/logger/MsoLogger.java
+++ b/common/src/main/java/org/onap/so/logger/MsoLogger.java
@@ -96,12 +96,6 @@ public class MsoLogger {
 
     public static final String PARTNER_NAME                 = "PartnerName";
 
-    
-
-
-    
-
-    
     // Audit/Metric log specific
     public static final String BEGINTIME                   = "BeginTimestamp";
     public static final String STARTTIME                   = "StartTimeMilis";
@@ -184,9 +178,7 @@ public class MsoLogger {
             this.value = value;
         }
     }
-    
-    public static final Marker ENTRY = MarkerFactory.getMarker("ENTRY");
-    public static final Marker EXIT = MarkerFactory.getMarker("EXIT");
+
 
     private Logger logger;
     private Logger metricsLogger;
@@ -194,9 +186,6 @@ public class MsoLogger {
     private static String       instanceUUID, serverIP, serverName;
     private MessageEnum         exceptionArg, defaultException, defaultWarning, defaultAudit, defaultMetrics;
 
-    // For internal logging of the initialization of MSO logs
-    private static final Logger initLOGGER      = LoggerFactory.getLogger(MsoLogger.class.getName());
-
     private MsoLogger() {
         this(MsoLogger.Catalog.GENERAL);
     }
@@ -236,12 +225,6 @@ public class MsoLogger {
      * @param targetVEntity
      *            Target VNF or VM acted opon by the component, if available
      */
-    public void recordMetricEvent() {
-        metricsLogger.info("");
-        MDC.remove(TIMER);
-        MDC.remove(TARGETENTITY);
-        MDC.remove(TARGETSERVICENAME);
-    }
 
     public void recordMetricEvent(Long startTime, StatusCode statusCode, ResponseCode responseCode, String responseDesc,
             String targetEntity, String targetServiceName, String targetVEntity) {
@@ -266,10 +249,7 @@ public class MsoLogger {
      * @param responseDesc
      *            Human redable description of the application response code
      */
-    public void recordAuditEvent(){    	
-         auditLogger.info("");
-    }
-    
+
     public void recordAuditEvent(Long startTime, StatusCode statusCode, ResponseCode responseCode,
             String responseDesc) {
     	if (StringUtils.isEmpty(MDC.get(MsoLogger.PARTNERNAME))) {
@@ -1060,15 +1040,6 @@ public class MsoLogger {
         return classArr[0].getMethodName();
     }
 
-    // Based on the discussion with Adrian, instanceUUID is used to identifiy
-    // the mso instance,
-    // it is generated during mso instance initialization period
-    // The same mso instnace will use the same instanceUUID value, even after
-    // restart
-    private static String getInstanceUUID() {       
-       return System.getProperty("mso-instance-id");
-    }
-
     /**
      * Set the requestId and serviceInstanceId
      * 
@@ -1088,36 +1059,6 @@ public class MsoLogger {
     }
 
     /**
-     * Set the remoteIp and the basic HTTP Authentication user
-     * 
-     * @param remoteIpp
-     *            The remote ip address
-     * @param userp
-     *            The basic http authencitation user
-     */
-    public static void setLoggerParameters(String remoteIpp, String userp) {
-        if (null != remoteIpp) {
-            MDC.put(REMOTE_HOST, remoteIpp);
-        }
-        if (null != userp) {
-            MDC.put(USER, userp);
-        }
-    }
-
-    /**
-     * Set the serviceName
-     * 
-     * @param serviceNamep
-     *            The service name
-     */
-    public static void setServiceName(String serviceNamep) {
-        if (null != serviceNamep) {
-            MDC.put(SERVICE_NAME, serviceNamep);
-            MDC.remove(SERVICE_NAME_IS_METHOD_NAME);
-        }
-    }
-
-    /**
      * Get the serviceName
      * 
      * @return The service name
@@ -1127,13 +1068,6 @@ public class MsoLogger {
     }
 
     /**
-     * Reset the serviceName
-     */
-    public static void resetServiceName() {
-        MDC.remove(SERVICE_NAME);
-    }
-
-    /**
      * Set the requestId and serviceInstanceId based on the mso request
      * 
      * @param msoRequest
@@ -1191,14 +1125,4 @@ public class MsoLogger {
             defaultMetrics = MessageEnum.GENERAL_METRICS;
         }
     }
-
-	public void warnSimple(String message, Exception e) {
-		logger.warn(message,e);       
-		
-	}
-
-
-
-
-
 }