Merge "update odlux for notification change"

[ccsdk/features.git] / sdnr / wt / devicemanager / provider / src / main / java / org / onap / ccsdk / features / sdnr / wt / devicemanager / impl / xml / MwtNotificationBase.java

diff --git a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
index 156f922..de7ccc3 100644 (file)
--- a/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
+++ b/sdnr/wt/devicemanager/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/impl/xml/MwtNotificationBase.java
@@ -1,4 +1,4 @@
-/*******************************************************************************
+/*
  * ============LICENSE_START========================================================================
  * ONAP : ccsdk feature sdnr wt
  * =================================================================================================
@@ -14,19 +14,15 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  * ============LICENSE_END==========================================================================
- ******************************************************************************/
+ */
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.xml;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import javax.annotation.Nonnull;
 import javax.xml.bind.annotation.XmlElement;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.impl.util.InternalDateAndTime;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus.ConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionLogStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev190801.ConnectionlogEntity;
 
+@Deprecated
 public class MwtNotificationBase {
 
     private static String EMPTY = "empty";
@@ -38,6 +34,7 @@ public class MwtNotificationBase {
 
     public MwtNotificationBase() {
         // For Jaxb
+        this.objectId = EMPTY;
     }
 
     public MwtNotificationBase(String nodeName, Integer counter, InternalDateAndTime timeStamp, String objectId) {
@@ -70,48 +67,9 @@ public class MwtNotificationBase {
         return objectId;
     }
 
-    /**
-     * Provide ConnectionlogEntity type
-     * @return ConnectionlogEntity
-     */
-    public ConnectionlogEntity getConnectionlogEntity() {
-        return new ConnectionlogBuilder()
-                .setNodeId(objectId)
-                .setStatus(getStatus())
-                .setTimestamp(new DateAndTime(timeStamp))
-                .build();
-    }
-
-    /**
-     * Provide connection status for mountpoint log.
-     * TODO Add status disconnected if mountpoint is required, but does not exists.
-     * @return
-     */
-    private ConnectionLogStatus getStatus() {
-
-        if (this instanceof ObjectCreationNotificationXml) {
-            return ConnectionLogStatus.Mounted;
-
-        } else if (this instanceof ObjectDeletionNotificationXml) {
-            return ConnectionLogStatus.Unmounted;
-
-        } else if (this instanceof AttributeValueChangedNotificationXml) {
-            String pnx = ((AttributeValueChangedNotificationXml)this).getNewValue();
-            if (pnx.equals(ConnectionStatus.Connected.getName())) {
-                return ConnectionLogStatus.Connected;
-
-            } else if (pnx.equals(ConnectionStatus.Connecting.getName())) {
-                return ConnectionLogStatus.Connecting;
-
-            } else if (pnx.equals(ConnectionStatus.UnableToConnect.getName())) {
-                return ConnectionLogStatus.UnableToConnect;
-            }
-        }
-        return ConnectionLogStatus.Undefined;
-    }
-
     /**
      * Type for the Database to document the the same name that is used in the websockets.
+     *
      * @return String with type name of child class
      */
     @JsonProperty("type")
@@ -121,8 +79,8 @@ public class MwtNotificationBase {
 
     @Override
     public String toString() {
-        return "MwtNotificationBase [getType()="+ getType() + ", nodeName=" + nodeName + ", counter=" + counter + ", timeStamp=" + timeStamp
-                + ", objectId=" + objectId + "]";
+        return "MwtNotificationBase [getType()=" + getType() + ", nodeName=" + nodeName + ", counter=" + counter
+                + ", timeStamp=" + timeStamp + ", objectId=" + objectId + "]";
     }