X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=netconf-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fnetconf%2Fnotification%2FNetConfSessionUtil.java;fp=netconf-server%2Fsrc%2Fmain%2Fjava%2Forg%2Fcommscope%2Ftr069adapter%2Fnetconf%2Fnotification%2FNetConfSessionUtil.java;h=55c40b2541eceba86f8195762c6997ef4b848aa2;hb=ce4e2d38e3d42725f61c39dd172325d2def4bc44;hp=70965a077cb4b40639df2ca37308f8782b11a549;hpb=597b7c7a33b3f636263fd7297e3d257eb6b56175;p=oam%2Ftr069-adapter.git

diff --git a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NetConfSessionUtil.java b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NetConfSessionUtil.java
index 70965a0..55c40b2 100644
--- a/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NetConfSessionUtil.java
+++ b/netconf-server/src/main/java/org/commscope/tr069adapter/netconf/notification/NetConfSessionUtil.java
@@ -1,72 +1,50 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : tr-069-adapter
- * =================================================================================================
- * Copyright (C) 2020 CommScope Inc Intellectual Property.
- * =================================================================================================
- * This tr-069-adapter software file is distributed by CommScope Inc 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
- *
- * This file 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.commscope.tr069adapter.netconf.notification;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.commscope.tr069adapter.mapper.model.NetConfNotificationDTO;
-import org.commscope.tr069adapter.netconf.rpc.CreateSubscription;
-import org.opendaylight.netconf.api.NetconfMessage;
-import org.opendaylight.netconf.api.xml.XmlUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-@Component
-public class NetConfSessionUtil {
-
-  private static final Logger LOG = LoggerFactory.getLogger(NetConfSessionUtil.class);
-
-  public void sendNetConfNotification(NetConfNotificationDTO netConNotifDTO) {
-    NetconfMessage netconfMessage = convertToNetConfMessage(netConNotifDTO);
-    LOG.debug("Notification converted to NetConf format" + netconfMessage);
-    CreateSubscription.sendNotification(netconfMessage, netConNotifDTO.getDeviceID());
-  }
-
-  private NetconfMessage convertToNetConfMessage(NetConfNotificationDTO netConNotifDTO) {
-    try {
-      return new NetconfMessage(XmlUtil.readXmlToDocument(netConNotifDTO.getNotificaiton()));
-    } catch (SAXException | IOException e) {
-      throw new IllegalArgumentException("Cannot parse notifications", e);
-    }
-  }
-
-  public static String convertDocumentToString(Element element) {
-    String strxml = null;
-    try {
-      TransformerFactory transformerFactory = TransformerFactory.newInstance();
-      Transformer transformer = transformerFactory.newTransformer();
-      DOMSource source = new DOMSource(element);
-      StreamResult result = new StreamResult(new StringWriter());
-      transformer.transform(source, result);
-      strxml = result.getWriter().toString();
-    } catch (Exception e) {
-      LOG.error("Error while converting Element to String" + e);
-    }
-    LOG.debug("Converted XML is : " + strxml);
-    return strxml;
-  }
-
-}
+/*
+ * ============LICENSE_START========================================================================
+ * ONAP : tr-069-adapter
+ * =================================================================================================
+ * Copyright (C) 2020 CommScope Inc Intellectual Property.
+ * =================================================================================================
+ * This tr-069-adapter software file is distributed by CommScope Inc 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
+ *
+ * This file 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.commscope.tr069adapter.netconf.notification;
+
+import org.commscope.tr069adapter.mapper.model.NetConfNotificationDTO;
+import org.commscope.tr069adapter.netconf.error.NetconfNotificationException;
+import org.commscope.tr069adapter.netconf.rpc.CreateSubscription;
+import org.opendaylight.netconf.api.NetconfMessage;
+import org.opendaylight.netconf.api.xml.XmlUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+@Component
+public class NetConfSessionUtil {
+
+  private static final Logger LOG = LoggerFactory.getLogger(NetConfSessionUtil.class);
+
+  public void sendNetConfNotification(NetConfNotificationDTO netConNotifDTO)
+      throws NetconfNotificationException {
+    NetconfMessage netconfMessage = convertToNetConfMessage(netConNotifDTO);
+    CreateSubscription.sendNotification(netconfMessage, netConNotifDTO.getDeviceID());
+  }
+
+  private NetconfMessage convertToNetConfMessage(NetConfNotificationDTO netConNotifDTO)
+      throws NetconfNotificationException {
+    try {
+      return new NetconfMessage(XmlUtil.readXmlToDocument(netConNotifDTO.getNotificaiton()));
+    } catch (Exception e) {
+      LOG.error("Error while converting to netcon notification ");
+      throw new NetconfNotificationException("Cannot parse notifications", e);
+    }
+  }
+}