From 8decf2dbd1e08651d98c9292ba012b3a46005549 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 7 Nov 2014 19:53:12 +0100 Subject: [PATCH] Remove raw references to Map in XSQL This adds the proper types to map, removing some casts and improving efficiency slightly. Fixes quite a few of eclipse warnings. Change-Id: Ia8cc61961a1898dd17e4e5d0e6e7a247475a007a Signed-off-by: Robert Varga --- .../sal/dom/xsql/XSQLBluePrintRelation.java | 4 +-- .../md/sal/dom/xsql/jdbc/JDBCCommand.java | 6 ++-- .../md/sal/dom/xsql/jdbc/JDBCResultSet.java | 36 +++++++++---------- .../md/sal/dom/xsql/jdbc/JDBCServer.java | 16 ++++----- 4 files changed, 29 insertions(+), 33 deletions(-) diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintRelation.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintRelation.java index 38a96dc457..9053f00aae 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintRelation.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLBluePrintRelation.java @@ -99,7 +99,7 @@ public class XSQLBluePrintRelation implements Serializable { } return result; } else if (Map.class.isAssignableFrom(o.getClass())) { - Map map = (Map) o; + Map map = (Map) o; for (Object oo : map.values()) { addToResult(result, execute(oo)); } @@ -126,7 +126,7 @@ public class XSQLBluePrintRelation implements Serializable { result.add(oo); } } else if (Map.class.isAssignableFrom(o.getClass())) { - Map map = (Map) o; + Map map = (Map) o; for (Object oo : map.values()) { result.add(oo); } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCCommand.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCCommand.java index ba0626fdfe..649709ecf3 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCCommand.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCCommand.java @@ -18,7 +18,7 @@ public class JDBCCommand implements Serializable { public static final int TYPE_METADATA_REPLY = 7; private JDBCResultSet rs = null; - private Map record = null; + private Map record = null; private int rsID = -1; private Exception err = null; private XSQLBluePrint bluePrint = null; @@ -49,7 +49,7 @@ public class JDBCCommand implements Serializable { this.rsID = rs.getID(); } - public JDBCCommand(Map _record, int _rsID) { + public JDBCCommand(Map _record, int _rsID) { this.record = _record; this.rsID = _rsID; this.type = TYPE_QUERY_RECORD; @@ -68,7 +68,7 @@ public class JDBCCommand implements Serializable { return this.rs; } - public Map getRecord() { + public Map getRecord() { return this.record; } 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 5abe8a3165..37eacd5595 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 @@ -46,8 +46,8 @@ public class JDBCResultSet implements Serializable, ResultSet, 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 transient LinkedList> records = new LinkedList<>(); + private transient Map currentRecord = null; private boolean finished = false; private int id = 0; private static Integer nextID = new Integer(0); @@ -108,7 +108,7 @@ public class JDBCResultSet implements Serializable, ResultSet, } } - public int isObjectFitCriteria(Map objValues, String tableName) { + public int isObjectFitCriteria(Map objValues, String tableName) { Map> tblCriteria = criteria .get(tableName); if (tblCriteria == null) { @@ -197,10 +197,10 @@ public class JDBCResultSet implements Serializable, ResultSet, return this.records.size(); } - public void addRecord(Map r) { + public void addRecord(Map r) { synchronized (this) { if (records == null) { - records = new LinkedList(); + records = new LinkedList<>(); } records.add(r); this.notifyAll(); @@ -208,7 +208,7 @@ public class JDBCResultSet implements Serializable, ResultSet, } public void addRecord(ArrayList hierarchy) { - Map rec = new HashMap(); + Map rec = new HashMap<>(); for (int i = hierarchy.size() - 1; i >= 0; i--) { Object element = hierarchy.get(i); for (XSQLColumn c : fieldsInQuery) { @@ -230,7 +230,7 @@ public class JDBCResultSet implements Serializable, ResultSet, public boolean next() { this.currentRecord = null; if (records == null) { - records = new LinkedList(); + records = new LinkedList<>(); } while (!finished || records.size() > 0) { synchronized (this) { @@ -260,12 +260,12 @@ public class JDBCResultSet implements Serializable, ResultSet, return false; } - public Map getCurrent() { + public Map getCurrent() { return this.currentRecord; } private void createRecord(Object data, XSQLBluePrintNode node) { - Map rec = new HashMap(); + Map rec = new HashMap<>(); for (XSQLColumn c : this.fieldsInQuery) { if (c.getTableName().equals(node.getBluePrintNodeName())) { try { @@ -285,20 +285,20 @@ public class JDBCResultSet implements Serializable, ResultSet, } public static class Record { - public Map data = new HashMap(); + public Map data = new HashMap<>(); public Object element = null; - public Map getRecord() { + public Map getRecord() { return this.data; } } - private Map collectColumnValues(Object node, XSQLBluePrintNode bpn) { - Map subChildren = XSQLODLUtils.getChildren(node); - Map result = new HashMap(); + private Map collectColumnValues(Object node, XSQLBluePrintNode bpn) { + Map subChildren = XSQLODLUtils.getChildren(node); + Map result = new HashMap<>(); for (Object stc : subChildren.values()) { if (stc.getClass().getName().endsWith("ImmutableAugmentationNode")) { - Map values = XSQLODLUtils.getChildren(stc); + Map values = XSQLODLUtils.getChildren(stc); for (Object key : values.keySet()) { Object val = values.get(key); if (val.getClass().getName().endsWith("ImmutableLeafNode")) { @@ -323,7 +323,7 @@ public class JDBCResultSet implements Serializable, ResultSet, } private void addToData(Record rec, XSQLBluePrintNode bpn, - XSQLBluePrint bluePrint, Map fullRecord) { + XSQLBluePrint bluePrint, Map fullRecord) { XSQLBluePrintNode eNodes[] = bluePrint .getBluePrintNodeByODLTableName(XSQLODLUtils .getNodeIdentiofier(rec.element)); @@ -432,7 +432,7 @@ public class JDBCResultSet implements Serializable, ResultSet, .getBluePrintNodeName()); if (this.criteria.containsKey(bluePrintNode.getBluePrintNodeName()) || bpn != null) { - Map allKeyValues = collectColumnValues(element, bpn); + Map allKeyValues = collectColumnValues(element, bpn); if (!(isObjectFitCriteria(allKeyValues, bpn.getBluePrintNodeName()) == 1)) { return EMPTY_RESULT; @@ -471,7 +471,7 @@ public class JDBCResultSet implements Serializable, ResultSet, } boolean isObjectInCriteria = true; if (bpn != null) { - Map allKeyValues = collectColumnValues(rec.element, bpn); + Map allKeyValues = collectColumnValues(rec.element, bpn); if ((isObjectFitCriteria(allKeyValues, bpn.getBluePrintNodeName()) == 1)) { addToData(rec, bpn, bluePrint, allKeyValues); 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 5979771d28..b348d8fda8 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 @@ -5,12 +5,10 @@ import java.net.Socket; import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; - import org.opendaylight.controller.md.sal.dom.xsql.XSQLAdapter; import org.opendaylight.controller.md.sal.dom.xsql.XSQLBluePrint; import org.opendaylight.controller.md.sal.dom.xsql.XSQLBluePrintNode; @@ -91,8 +89,8 @@ public class JDBCServer extends Thread { } rs.getFields().addAll(entry.getValue().getFields()); while (entry.getValue().next()) { - Map rec = entry.getValue().getCurrent(); - Map newRec = new HashMap(); + Map rec = entry.getValue().getCurrent(); + Map newRec = new HashMap<>(); newRec.putAll(rec); rs.addRecord(newRec); } @@ -119,13 +117,11 @@ public class JDBCServer extends Thread { rs.getFields().addAll(columnOrder); for (Map.Entry entry : rs.getSubQueries().entrySet()) { while (entry.getValue().next()) { - Map rec = entry.getValue().getCurrent(); - Map newRec = new HashMap(); - for (Iterator iter = rec.entrySet().iterator(); iter.hasNext();) { - Map.Entry e = (Map.Entry) iter.next(); - String key = (String) e.getKey(); + Map rec = entry.getValue().getCurrent(); + Map newRec = new HashMap<>(); + for (Map.Entry e : rec.entrySet()) { Object value = e.getValue(); - String logicalKey = origNameToName.get(key); + String logicalKey = origNameToName.get(e.getKey()); if (value != null && logicalKey != null) { newRec.put(logicalKey, value); } -- 2.36.6