Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 6795 - Deprecated sal-dom-xsql
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-xsql
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
xsql
/
XSQLAdapter.java
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 05f65225eaec15755b520bf1f00e44038416e849..386d925b00d02de486500cab807d0d5ce865ea0f 100644
(file)
--- 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
@@
-15,7
+15,7
@@
import java.net.ServerSocket;
import java.net.Socket;
import java.util.ArrayList;
import java.util.Arrays;
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;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@
-34,6
+34,10
@@
import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
/**
* @author Sharon Aicler(saichler@gmail.com)
**/
/**
* @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;
public class XSQLAdapter extends Thread implements SchemaContextListener {
private static final int SLEEP = 10000;
@@
-42,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 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";
private String username;
private String password;
private String transport = "tcp";
@@
-50,7
+54,7
@@
public class XSQLAdapter extends Thread implements SchemaContextListener {
private int nThreads;
private int qsize;
private String applicationName = "NQL Adapter";
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;
private StringBuffer lastInputString = new StringBuffer();
private XSQLBluePrint bluePrint = new XSQLBluePrint();
private boolean toCsv = false;
@@
-112,7
+116,7
@@
public class XSQLAdapter extends Thread implements SchemaContextListener {
}
}
}
}
}
}
- l.print(
Calendar.getInstance().getTim
e());
+ l.print(
new Dat
e());
l.print(" - ");
l.println(str);
} catch (Exception err) {
l.print(" - ");
l.println(str);
} catch (Exception err) {
@@
-130,7
+134,7
@@
public class XSQLAdapter extends Thread implements SchemaContextListener {
}
}
}
}
}
}
- l.print(
Calendar.getInstance().getTim
e());
+ l.print(
new Dat
e());
l.print(" - ");
e.printStackTrace(l);
} catch (Exception err) {
l.print(" - ");
e.printStackTrace(l);
} catch (Exception err) {
@@
-159,11
+163,11
@@
public class XSQLAdapter extends Thread implements SchemaContextListener {
public List<Object> collectModuleRoots(XSQLBluePrintNode table,LogicalDatastoreType type) {
if (table.getParent().isModule()) {
try {
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.getFirstFromSchemaNodes()).get(0))
YangInstanceIdentifier instanceIdentifier = YangInstanceIdentifier
.builder()
.node(XSQLODLUtils.getPath(table.getFirstFromSchemaNodes()).get(0))
- .
toInstance
();
+ .
build
();
DOMDataReadTransaction t = this.domDataBroker
.newReadOnlyTransaction();
Object node = t.read(type,
DOMDataReadTransaction t = this.domDataBroker
.newReadOnlyTransaction();
Object node = t.read(type,
@@
-196,7
+200,7
@@
public class XSQLAdapter extends Thread implements SchemaContextListener {
rs.setFinished(true);
}
XSQLBluePrintNode main = rs.getMainTable();
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);
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;
}
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());
}
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;
}
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());
}
for (XSQLColumn c : node.getColumns()) {
fld.add(c.getName());
}