Removed MsoLogger in 'mso-adapters-rest-interface'

Removed MsoLogger from adapters ('mso-adapters-rest-interface')
Replaced MsoLogger with plain slf4j.
Refactored login output.
Fixed imports.

Change-Id: I2623c14dda55ae471bc11d40345c5f91c62bd94f
Issue-ID: LOG-631
Signed-off-by: Robert Bogacki <r.bogacki@samsung.com>

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkRequestCommon.java
index 3d66da3..5e4e015 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkRequestCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkRequestCommon.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,19 +30,19 @@ import java.io.Serializable;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Everything that is common between all Network Requests.
  */
 public abstract class NetworkRequestCommon implements Serializable {
        private static final long serialVersionUID = -6732431343649282079L;
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, NetworkRequestCommon.class);
+       private static final Logger logger =  LoggerFactory.getLogger(NetworkRequestCommon.class);
        private Boolean skipAAI = false;
        private String messageId;
        private String notificationUrl;
@@ -88,7 +89,7 @@ public abstract class NetworkRequestCommon implements Serializable {
                        mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
                        jsonString = mapper.writeValueAsString(this);
                } catch (Exception e) {
-                   LOGGER.debug("Exception:", e);
+                   logger.debug("Exception:", e);
                }
                return jsonString;
        }
@@ -102,7 +103,7 @@ public abstract class NetworkRequestCommon implements Serializable {
                        marshaller.marshal(this, bs);
                        return bs.toString();
                } catch (Exception e) {
-                   LOGGER.debug("Exception:", e);
+                   logger.debug("Exception:", e);
                        return "";
                }
        }

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkResponseCommon.java
index d626f26..d1907a2 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkResponseCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/nwrest/NetworkResponseCommon.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,10 +30,11 @@ import java.io.Serializable;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Everything that is common between all Volume Group Responses, except for QueryVolumeGroupResponse.
  */
@@ -40,7 +42,7 @@ public abstract class NetworkResponseCommon implements Serializable {
 
        private static final long serialVersionUID = 1233520856935129726L;
        private String messageId;
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, NetworkResponseCommon.class);
+       private static final Logger logger = LoggerFactory.getLogger(NetworkResponseCommon.class);
 
        public NetworkResponseCommon() {
                messageId = null;
@@ -65,7 +67,7 @@ public abstract class NetworkResponseCommon implements Serializable {
                        mapper.enable(SerializationFeature.WRAP_ROOT_VALUE);
                        jsonString = mapper.writeValueAsString(this);
                } catch (Exception e) {
-                   LOGGER.debug("Exception:", e);
+                       logger.debug("Exception:", e);
                }
                return jsonString;
        }
@@ -79,7 +81,7 @@ public abstract class NetworkResponseCommon implements Serializable {
                        marshaller.marshal(this, bs);
                        return bs.toString();
                } catch (Exception e) {
-                   LOGGER.debug("Exception:", e);
+                       logger.debug("Exception:", e);
                        return "";
                }
        }

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCEvent.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCEvent.java
index 7d6aebd..f577fa9 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCEvent.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCEvent.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,14 +30,14 @@ import java.util.Map;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonRootName;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 // NOTE: the JAXB (XML) annotations are required with JBoss AS7 and RESTEasy,
 //       even though we are using JSON exclusively.  The @NoJackson annotation
@@ -53,7 +54,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
 public class SDNCEvent implements Serializable {
        private static final long serialVersionUID = 1L;
        
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, SDNCEvent.class);
+       private static final Logger logger = LoggerFactory.getLogger(SDNCEvent.class);
 
        // Event type
        private String eventType;
@@ -134,7 +135,7 @@ public class SDNCEvent implements Serializable {
                        mapper.setSerializationInclusion(Include.NON_NULL);
                        return mapper.writeValueAsString(this);
                } catch (IOException e) {
-                   LOGGER.debug("Exception:", e);
+                       logger.debug("Exception:", e);
                        throw new UnsupportedOperationException("Cannot convert "
                                + getClass().getSimpleName() + " to JSON", e);
                }

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCRequestCommon.java
index 9ddf55c..4080705 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCRequestCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCRequestCommon.java
@@ -4,6 +4,8 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (c) 2019 Samsung
+ * ================================================================================
  * 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
@@ -25,21 +27,22 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Base class for all SDNC adapter requests.
  */
 public abstract class SDNCRequestCommon implements Serializable {
        private static final long serialVersionUID = 1L;
        
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, SDNCRequestCommon.class);
+       private static final Logger logger = LoggerFactory.getLogger(SDNCRequestCommon.class);
 
        // Endpoint on which BPMN can receive notifications from the SDNC adapter.
        private String bpNotificationUrl;
@@ -107,9 +110,9 @@ public abstract class SDNCRequestCommon implements Serializable {
                        mapper.setSerializationInclusion(Include.NON_NULL);
                        return mapper.writeValueAsString(this);
                } catch (IOException e) {
-                   LOGGER.debug("Exception:", e);
+                       logger.debug("Exception:", e);
                        throw new UnsupportedOperationException("Cannot convert "
                                + getClass().getSimpleName() + " to JSON", e);
                }
        }
-}
\ No newline at end of file
+}

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCResponseCommon.java
index 2da9401..a7d14cc 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCResponseCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/sdncrest/SDNCResponseCommon.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,20 +27,21 @@ import java.io.Serializable;
 
 import javax.xml.bind.annotation.XmlElement;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Base class for all SDNC adapter responses, including errors.
  */
 public abstract class SDNCResponseCommon implements Serializable {
        private static final long serialVersionUID = 1L;
        
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, SDNCResponseCommon.class);
+       private static final Logger logger = LoggerFactory.getLogger(SDNCResponseCommon.class);
 
        // Identifies the MSO transaction with SDNC.
        private String sdncRequestId;
@@ -116,9 +118,9 @@ public abstract class SDNCResponseCommon implements Serializable {
                        mapper.setSerializationInclusion(Include.NON_NULL);
                        return mapper.writeValueAsString(this);
                } catch (IOException e) {
-                   LOGGER.debug("Exception:", e);
+                       logger.debug("Exception:", e);
                        throw new UnsupportedOperationException("Cannot convert "
                                + getClass().getSimpleName() + " to JSON", e);
                }
        }
-}
\ No newline at end of file
+}

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/tenantrest/TenantRequestCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/tenantrest/TenantRequestCommon.java
index 168200e..7d629cb 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/tenantrest/TenantRequestCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/tenantrest/TenantRequestCommon.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,15 +29,16 @@ import java.io.Serializable;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public abstract class TenantRequestCommon implements Serializable {
 
        private static final long serialVersionUID = 1486834308868170854L;
-       private static MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, TenantRequestCommon.class);
+       private static Logger logger = LoggerFactory.getLogger(TenantRequestCommon.class);
        public String toJsonString() {
                try {
                        String jsonString;
@@ -45,7 +47,7 @@ public abstract class TenantRequestCommon implements Serializable {
                        jsonString = mapper.writeValueAsString(this);
                        return jsonString;
                } catch (Exception e) {
-                       LOGGER.debug("Exception :",e);
+                       logger.debug("Exception :", e);
                        return "";
                }
        }
@@ -59,7 +61,7 @@ public abstract class TenantRequestCommon implements Serializable {
                        marshaller.marshal(this, bs);
                        return bs.toString();
                } catch (Exception e) {
-                       LOGGER.debug("Exception :",e);
+                       logger.debug("Exception :", e);
                        return "";
                }
        }

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVfModuleResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVfModuleResponse.java
index 0214d15..3b480d8 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVfModuleResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVfModuleResponse.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,16 +25,15 @@ package org.onap.so.adapters.vnfrest;
 import java.util.Map;
 
 import javax.xml.bind.annotation.XmlRootElement;
-
-import org.onap.so.logger.MsoLogger;
 import org.onap.so.openstack.beans.VnfStatus;
-
 import com.fasterxml.jackson.annotation.JsonRootName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @JsonRootName("queryVfModuleResponse")
 @XmlRootElement(name = "queryVfModuleResponse")
 public class QueryVfModuleResponse extends VfResponseCommon{
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, QueryVfModuleResponse.class);
+       private static final Logger logger = LoggerFactory.getLogger(QueryVfModuleResponse.class);
        private String vnfId;
        private String vfModuleId;
        private String vfModuleStackId;

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVolumeGroupResponse.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVolumeGroupResponse.java
index 6e8027c..f15c624 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVolumeGroupResponse.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/QueryVolumeGroupResponse.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,15 +27,17 @@ import java.util.Map;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.onap.so.logger.MsoLogger;
 import org.onap.so.openstack.beans.VnfStatus;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 @XmlRootElement(name = "queryVolumeGroupResponse")
 public class QueryVolumeGroupResponse {
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, QueryVolumeGroupResponse.class);
+       private static final Logger logger = LoggerFactory.getLogger(QueryVolumeGroupResponse.class);
        private String volumeGroupId;
        private String volumeGroupStackId;
        private VnfStatus volumeGroupStatus;
@@ -96,7 +99,7 @@ public class QueryVolumeGroupResponse {
                        jsonString = mapper.writeValueAsString(this);
                }
                catch (Exception e) {
-                       LOGGER.debug("Exception :",e);
+                       logger.debug("Exception :", e);
                }
                return jsonString;
        }

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfResponseCommon.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfResponseCommon.java
index 2828ac3..73414a3 100644 (file)
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfResponseCommon.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfResponseCommon.java
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved.
+ * Modifications Copyright (c) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,17 +28,18 @@ import java.io.ByteArrayOutputStream;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.onap.so.logger.MsoLogger;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * Everything that is common between all VfModule and VolumeGroup Responses,
  * except for QueryVfModuleResponse and QueryVolumeGroupResponse.
  */
 public abstract class VfResponseCommon {
-       private static final MsoLogger LOGGER = MsoLogger.getMsoLogger (MsoLogger.Catalog.RA, VfResponseCommon.class);
+       private static final Logger logger = LoggerFactory.getLogger(VfResponseCommon.class);
        private String messageId;
 
        public VfResponseCommon() {
@@ -64,7 +66,7 @@ public abstract class VfResponseCommon {
                        jsonString = mapper.writeValueAsString(this);
                        return jsonString;
                } catch (Exception e) {
-                       LOGGER.debug("Exception :",e);
+                       logger.debug("Exception :",e);
                        return "";
                }
        }
@@ -78,7 +80,7 @@ public abstract class VfResponseCommon {
                        marshaller.marshal(this, bs);
                        return bs.toString();
                } catch (Exception e) {
-                       LOGGER.debug("Exception :",e);
+                       logger.debug("Exception :",e);
                        return "";
                }
        }