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=1d71d23c9e9a62ae0db2614a9731074ebdd1e8be;hp=beab6d2fb1a0014e3dece9b1c07f77aa611ee090;hb=0f1c2bc494711636246c127eff476043ff61445a;hpb=b3c034675957f963c5878ce1e5e183ec2de8b5e2 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 beab6d2fb1..1d71d23c9e 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,14 +31,18 @@ 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) + **/ public class XSQLAdapter extends Thread implements SchemaContextListener { private static final int SLEEP = 10000; private static XSQLAdapter a = new XSQLAdapter(); private static PrintStream l = null; + private static String tmpDir = null; + private static File xqlLog = null; public boolean stopped = false; - private List elementHosts = new ArrayList(); + private List elementHosts = new ArrayList<>(); private String username; private String password; private String transport = "tcp"; @@ -39,7 +50,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { private int nThreads; private int qsize; private String applicationName = "NQL Adapter"; - private Map elements = new ConcurrentHashMap(); + private Map elements = new ConcurrentHashMap<>(); private StringBuffer lastInputString = new StringBuffer(); private XSQLBluePrint bluePrint = new XSQLBluePrint(); private boolean toCsv = false; @@ -49,6 +60,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"); @@ -79,6 +91,12 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { return a; } + public static File getXQLLogfile() { + tmpDir = System.getProperty("java.io.tmpdir"); + xqlLog = new File(tmpDir + "/xql.log"); + return xqlLog; + } + public static void main(String args[]) { XSQLAdapter adapter = new XSQLAdapter(); adapter.start(); @@ -90,11 +108,11 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { synchronized (XSQLAdapter.class) { if (l == null) { l = new PrintStream( - new FileOutputStream("/tmp/xql.log")); + new FileOutputStream(getXQLLogfile())); } } } - l.print(Calendar.getInstance().getTime()); + l.print(new Date()); l.print(" - "); l.println(str); } catch (Exception err) { @@ -108,11 +126,11 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { synchronized (XSQLAdapter.class) { if (l == null) { l = new PrintStream( - new FileOutputStream("/tmp/xql.log")); + new FileOutputStream(getXQLLogfile())); } } } - l.print(Calendar.getInstance().getTime()); + l.print(new Date()); l.print(" - "); e.printStackTrace(l); } catch (Exception err) { @@ -141,30 +159,21 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { public List collectModuleRoots(XSQLBluePrintNode table,LogicalDatastoreType type) { if (table.getParent().isModule()) { try { - List result = new LinkedList(); + List 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; } - - // XSQLAdapter.log(""+node); - Map children = XSQLODLUtils.getChildren(node); - for (Object c : children.values()) { - Map sons = XSQLODLUtils.getChildren(c); - for (Object child : sons.values()) { - result.add(child); - } - } - + result.add(node); return result; } catch (Exception err) { XSQLAdapter.log(err); @@ -187,7 +196,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { rs.setFinished(true); } XSQLBluePrintNode main = rs.getMainTable(); - List tasks = new LinkedList(); + List tasks = new LinkedList<>(); for (Object entry : roots) { NETask task = new NETask(rs, entry, main, bluePrint); @@ -242,7 +251,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { sout.println("Unknown Interface " + substr); return; } - List fld = new ArrayList(); + List fld = new ArrayList<>(); for (XSQLBluePrintRelation r : node.getRelations()) { fld.add(r.toString()); } @@ -259,7 +268,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { sout.println("Unknown Interface " + substr); return; } - List fld = new ArrayList(); + List fld = new ArrayList<>(); for (XSQLColumn c : node.getColumns()) { fld.add(c.getName()); } @@ -341,7 +350,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { JDBCResultSet rs = new JDBCResultSet(sql); try { int count = 0; - jdbcServer.execute(rs, this); + JDBCServer.execute(rs, this); boolean isFirst = true; int loc = rs.getFields().size() - 1; int totalWidth = 0;