X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-xsql%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fxsql%2FXSQLAdapter.java;h=386d925b00d02de486500cab807d0d5ce865ea0f;hp=a5658ccc9ed661b9b2d616f2ca70a2303e875bb0;hb=53b6d3519de3efe352a4a589c971cc30a82453e1;hpb=294e250fa1c11f36a6ddb9470f985df978039355

diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLAdapter.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLAdapter.java
index a5658ccc9e..386d925b00 100644
--- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLAdapter.java
+++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLAdapter.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.opendaylight.controller.md.sal.dom.xsql;
 
 import java.io.File;
@@ -8,7 +15,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Calendar;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -24,7 +31,13 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.Module;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-
+/**
+ * @author Sharon Aicler(saichler@gmail.com)
+ **/
+/**
+ * To be removed in Nitrogen
+ */
+@Deprecated
 public class XSQLAdapter extends Thread implements SchemaContextListener {
 
     private static final int SLEEP = 10000;
@@ -33,7 +46,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
     private static String tmpDir = null;
     private static File xqlLog = null;
     public boolean stopped = false;
-    private List<String> elementHosts = new ArrayList<String>();
+    private List<String> elementHosts = new ArrayList<>();
     private String username;
     private String password;
     private String transport = "tcp";
@@ -41,7 +54,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
     private int nThreads;
     private int qsize;
     private String applicationName = "NQL Adapter";
-    private Map<String, NEEntry> elements = new ConcurrentHashMap<String, XSQLAdapter.NEEntry>();
+    private Map<String, NEEntry> elements = new ConcurrentHashMap<>();
     private StringBuffer lastInputString = new StringBuffer();
     private XSQLBluePrint bluePrint = new XSQLBluePrint();
     private boolean toCsv = false;
@@ -51,6 +64,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
     private String pinningFile;
     private ServerSocket serverSocket = null;
     private DOMDataBroker domDataBroker = null;
+    private static final String REFERENCE_FIELD_NAME = "reference";
 
     private XSQLAdapter() {
         XSQLAdapter.log("Starting Adapter");
@@ -102,7 +116,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
                     }
                 }
             }
-            l.print(Calendar.getInstance().getTime());
+            l.print(new Date());
             l.print(" - ");
             l.println(str);
         } catch (Exception err) {
@@ -120,7 +134,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
                     }
                 }
             }
-            l.print(Calendar.getInstance().getTime());
+            l.print(new Date());
             l.print(" - ");
             e.printStackTrace(l);
         } catch (Exception err) {
@@ -149,31 +163,21 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
     public List<Object> collectModuleRoots(XSQLBluePrintNode table,LogicalDatastoreType type) {
         if (table.getParent().isModule()) {
             try {
-                List<Object> result = new LinkedList<Object>();
+                List<Object> result = new LinkedList<>();
                 YangInstanceIdentifier instanceIdentifier = YangInstanceIdentifier
                         .builder()
-                        .node(XSQLODLUtils.getPath(table.getODLNode()).get(0))
-                        .toInstance();
+                        .node(XSQLODLUtils.getPath(table.getFirstFromSchemaNodes()).get(0))
+                        .build();
                 DOMDataReadTransaction t = this.domDataBroker
                         .newReadOnlyTransaction();
                 Object node = t.read(type,
                         instanceIdentifier).get();
 
-                node = XSQLODLUtils.get(node, "reference");
+                node = XSQLODLUtils.get(node, REFERENCE_FIELD_NAME);
                 if (node == null) {
                     return result;
                 }
-
-                Map<?, ?> children = XSQLODLUtils.getChildren(node);
-                for (Object c : children.values()) {
-                    result.add(c);
-                    /* I don't remember why i did this... possibly to prevent different siblings queried together
-                    Map<?, ?> sons = XSQLODLUtils.getChildren(c);
-                    for (Object child : sons.values()) {
-                        result.add(child);
-                    }*/
-                }
-
+                result.add(node);
                 return result;
             } catch (Exception err) {
                 XSQLAdapter.log(err);
@@ -196,7 +200,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
             rs.setFinished(true);
         }
         XSQLBluePrintNode main = rs.getMainTable();
-        List<NETask> tasks = new LinkedList<XSQLAdapter.NETask>();
+        List<NETask> tasks = new LinkedList<>();
 
         for (Object entry : roots) {
             NETask task = new NETask(rs, entry, main, bluePrint);
@@ -251,7 +255,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
                 sout.println("Unknown Interface " + substr);
                 return;
             }
-            List<String> fld = new ArrayList<String>();
+            List<String> fld = new ArrayList<>();
             for (XSQLBluePrintRelation r : node.getRelations()) {
                 fld.add(r.toString());
             }
@@ -268,7 +272,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener {
                 sout.println("Unknown Interface " + substr);
                 return;
             }
-            List<String> fld = new ArrayList<String>();
+            List<String> fld = new ArrayList<>();
             for (XSQLColumn c : node.getColumns()) {
                 fld.add(c.getName());
             }