From: Stephen Kitt Date: Thu, 22 Sep 2016 15:31:11 +0000 (+0200) Subject: Mechanical code cleanup (sal-dom-xsql) X-Git-Tag: release/carbon~476 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0f1c2bc494711636246c127eff476043ff61445a Mechanical code cleanup (sal-dom-xsql) * Remove unnecessary type specifiers (use Java 7 <>) * Remove unnecessary "extends Object" declarations * Remove unnecessary semi-colons * Merge identical catch blocks * Remove redundant modifiers: - enum constructors are private by default - interface properties are public static final by default - interface methods are public abstract by default - interfaces are abstract by default - inner interfaces are static by default - inner classes in interfaces are public static by default Change-Id: I213dd654c1ba13675ebba3c85d4cb549a86e11b8 Signed-off-by: Stephen Kitt --- 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 818f4ebfbb..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 @@ -42,7 +42,7 @@ public class XSQLAdapter extends Thread implements SchemaContextListener { 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"; @@ -50,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; @@ -159,7 +159,7 @@ 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.getFirstFromSchemaNodes()).get(0)) @@ -196,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); @@ -251,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()); } @@ -268,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()); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java index 76152966d0..0c222321f7 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrint.java @@ -39,8 +39,8 @@ public class XSQLBluePrint implements DatabaseMetaData, Serializable { public static final String CACHE_FILE_NAME = "./BluePrintCache.dat"; - private Map tableNameToBluePrint = new HashMap(); - private Map> odlNameToBluePrint = new HashMap>(); + private Map tableNameToBluePrint = new HashMap<>(); + private Map> odlNameToBluePrint = new HashMap<>(); private boolean cacheLoadedSuccessfuly = false; private DatabaseMetaData myProxy = null; @@ -221,7 +221,7 @@ public class XSQLBluePrint implements DatabaseMetaData, Serializable { this.tableNameToBluePrint.put(blNode.getBluePrintNodeName(), blNode); Map map = this.odlNameToBluePrint.get(blNode.getODLTableName()); if (map == null) { - map = new HashMap(); + map = new HashMap<>(); this.odlNameToBluePrint.put(blNode.getODLTableName(), map); } map.put(blNode.getBluePrintNodeName(), blNode); @@ -253,7 +253,7 @@ public class XSQLBluePrint implements DatabaseMetaData, Serializable { } public List getAllTableNames() { - List names = new ArrayList(); + List names = new ArrayList<>(); for (XSQLBluePrintNode n : this.tableNameToBluePrint.values()) { if (!n.isModule() && !n.getColumns().isEmpty()) { names.add(n.getBluePrintNodeName()); @@ -265,7 +265,7 @@ public class XSQLBluePrint implements DatabaseMetaData, Serializable { public List getInterfaceNames(XSQLBluePrintNode node) { Set children = node.getChildren(); - List names = new ArrayList(); + List names = new ArrayList<>(); for (XSQLBluePrintNode n : children) { if (!n.isModule() && !n.getColumns().isEmpty()) { names.add(n.toString()); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java index d3cd91a6bd..b5db163dcd 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintNode.java @@ -23,16 +23,16 @@ public class XSQLBluePrintNode implements Serializable { private static final long serialVersionUID = 1L; private Class myInterface = null; private String myInterfaceString = null; - private Set relations = new HashSet(); - private Set inheritingNodes = new HashSet(); - private Set children = new HashSet(); + private Set relations = new HashSet<>(); + private Set inheritingNodes = new HashSet<>(); + private Set children = new HashSet<>(); private XSQLBluePrintNode parent = null; private int level = -1; private transient Set parentHierarchySet = null; private String myInterfaceName = null; - private Set columns = new HashSet(); - private Map origNameToColumn = new HashMap(); + private Set columns = new HashSet<>(); + private Map origNameToColumn = new HashMap<>(); private transient Object[] odlSchemaNodes = null; private boolean module = false; @@ -249,7 +249,7 @@ public class XSQLBluePrintNode implements Serializable { } public Set getClonedParents() { - Set result = new HashSet(); + Set result = new HashSet<>(); result.addAll(this.relations); return result; } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLCriteria.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLCriteria.java index b51e0bb278..9da12b20e0 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLCriteria.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLCriteria.java @@ -44,7 +44,7 @@ public class XSQLCriteria implements Serializable { private String criteria = null; private static final Map, Map> methodCache = - new ConcurrentHashMap, Map>(); + new ConcurrentHashMap<>(); public XSQLCriteria(final String data, final int parentOperation) { criteria = data; @@ -124,7 +124,7 @@ public class XSQLCriteria implements Serializable { try { Map cache = methodCache.get(element.getClass()); if (cache == null) { - cache = new ConcurrentHashMap(); + cache = new ConcurrentHashMap<>(); methodCache.put(element.getClass(), cache); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLODLUtils.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLODLUtils.java index 96c6d89d23..c9db91a6da 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLODLUtils.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLODLUtils.java @@ -37,7 +37,7 @@ import org.opendaylight.yangtools.yang.model.util.type.DerivedTypes; public class XSQLODLUtils { private static Map, Class> types = - new ConcurrentHashMap, Class>(); + new ConcurrentHashMap<>(); static { types.put(QName.class, QName.class); @@ -174,7 +174,7 @@ public class XSQLODLUtils { } public static Map refFieldsCache = - new HashMap(); + new HashMap<>(); public static Field findField(Class c, String name) { if (c == null) { @@ -219,7 +219,7 @@ public class XSQLODLUtils { public static List getMChildren(Object o) { Map children = getChildren(o); - List result = new LinkedList(); + List result = new LinkedList<>(); for (Object val : children.values()) { result.add((Object) val); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLThreadPool.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLThreadPool.java index ef507345cd..ab059d9e64 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLThreadPool.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLThreadPool.java @@ -11,7 +11,7 @@ package org.opendaylight.controller.md.sal.dom.xsql; import java.util.LinkedList; public class XSQLThreadPool { - private LinkedList tasks = new LinkedList(); + private LinkedList tasks = new LinkedList<>(); private int threadCount = 0; private int maxThreadCount = 10; private String threadPoolName = "Simple Thread Pool"; diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java index a6b5ca6063..b6499af98f 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCConnection.java @@ -45,7 +45,7 @@ public class JDBCConnection implements Connection, Runnable { private Socket socket = null; private DataInputStream in = null; private DataOutputStream out = null; - private LinkedList queue = new LinkedList(); + private LinkedList queue = new LinkedList<>(); private XSQLAdapter adapter = null; private XSQLBluePrint metaData = null; private String addr = null; diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java index 355565eb6b..7c5d560558 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCResultSet.java @@ -58,18 +58,18 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData private static int nextID = 0; private String sql = null; - private List tablesInQuery = new ArrayList(); - private Map tablesInQueryMap = new ConcurrentHashMap(); - private List fieldsInQuery = new ArrayList(); + private List tablesInQuery = new ArrayList<>(); + private Map tablesInQueryMap = new ConcurrentHashMap<>(); + private List fieldsInQuery = new ArrayList<>(); private transient LinkedList> records = new LinkedList<>(); private transient Map currentRecord = null; private boolean finished = false; private int id = 0; public int numberOfTasks = 0; - private Map>> criteria = new ConcurrentHashMap>>(); + private Map>> criteria = new ConcurrentHashMap<>(); private Exception err = null; - private List EMPTY_RESULT = new LinkedList(); - private transient Map subQueries = new HashMap(); + private List EMPTY_RESULT = new LinkedList<>(); + private transient Map subQueries = new HashMap<>(); public ResultSet getProxy() { return this; @@ -82,7 +82,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData public JDBCResultSet addSubQuery(String _sql, String logicalName) { if (subQueries == null) { - subQueries = new HashMap(); + subQueries = new HashMap<>(); } JDBCResultSet rs = new JDBCResultSet(_sql); this.subQueries.put(logicalName, rs); @@ -319,8 +319,8 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData } public static class RecordsContainer { - public List records = new LinkedList(); - public List fitRecords = new LinkedList(); + public List records = new LinkedList<>(); + public List fitRecords = new LinkedList<>(); public Object currentObject = null; } @@ -394,7 +394,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData private boolean beenHere(Set beenHereElement, Object element) { if (beenHereElement == null) { - beenHereElement = new HashSet(); + beenHereElement = new HashSet<>(); } String elementKey = null; @@ -417,7 +417,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData XSQLBluePrint bluePrint) { List children = XSQLODLUtils.getMChildren(node); - List result = new LinkedList(); + List result = new LinkedList<>(); for (Object child : children) { @@ -475,7 +475,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData public List addRecords(Object element, XSQLBluePrintNode node, boolean root, String tableName, XSQLBluePrint bluePrint) { - List result = new LinkedList(); + List result = new LinkedList<>(); String nodeID = XSQLODLUtils.getNodeIdentiofier(element); if (node.getODLTableName().equals(nodeID)) { XSQLBluePrintNode bluePrintNode = bluePrint diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java index 8bde2dcde3..9b65d6080c 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCServer.java @@ -106,8 +106,8 @@ public class JDBCServer extends Thread { return; } - Map logicalNameToNode = new HashMap(); - Map origNameToName = new HashMap(); + Map logicalNameToNode = new HashMap<>(); + Map origNameToName = new HashMap<>(); List columnOrder = new ArrayList<>(); int nextLogField = addNextLogicalField(sql, 0, logicalNameToNode, origNameToName,columnOrder); @@ -269,12 +269,12 @@ public class JDBCServer extends Thread { Map> tblCriteria = rs.getCriteria().get( col.getTableName()); if (tblCriteria == null) { - tblCriteria = new ConcurrentHashMap>(); + tblCriteria = new ConcurrentHashMap<>(); rs.getCriteria().put(col.getTableName(), tblCriteria); } List lstCriteria = tblCriteria.get(col); if (lstCriteria == null) { - lstCriteria = new ArrayList(); + lstCriteria = new ArrayList<>(); tblCriteria.put(col, lstCriteria); } lstCriteria.add(c); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java index a83f1f16b9..4dbdcc9f42 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCStatement.java @@ -37,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; public class JDBCStatement implements PreparedStatement { private JDBCResultSet rs = null; private transient JDBCConnection connection = null; - private static Map queries = new ConcurrentHashMap(); + private static Map queries = new ConcurrentHashMap<>(); private String sql = null; public JDBCStatement(JDBCConnection con,String _sql) {