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%2Fjdbc%2FJDBCServer.java;h=7b2733ccf784dbf0784cf316ac4d3343d3705f45;hp=5979771d28c88e1ad765bfa5d83053b5974a724c;hb=7b82cf08f566e5497764f92892ca5a97b6dd3c84;hpb=0424501920e4d1c7691116deaaa8d26b213ab579

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..7b2733ccf7 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<String, Object> rec = entry.getValue().getCurrent();
+                    Map<String, Object> 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<String, JDBCResultSet> 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<String, Object> rec = entry.getValue().getCurrent();
+                Map<String, Object> newRec = new HashMap<>();
+                for (Map.Entry<String, Object> 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);
                     }
@@ -197,10 +193,12 @@ public class JDBCServer extends Thread {
             int braketCount = 0;
             int endSubQuery = startSubQuery;
             do {
-                if (sql.charAt(endSubQuery) == '(')
+                if (sql.charAt(endSubQuery) == '(') {
                     braketCount++;
-                else if (sql.charAt(endSubQuery) == ')')
+                }
+                else if (sql.charAt(endSubQuery) == ')') {
                     braketCount--;
+                }
                 endSubQuery++;
             } while (braketCount > 0 || endSubQuery == sql.length());
             String subQuerySQL = sql.substring(startSubQuery + 1,endSubQuery - 1);
@@ -342,8 +340,9 @@ public class JDBCServer extends Thread {
             whereTo = order;
         }
 
-        if(whereTo==-1)
+        if(whereTo==-1) {
             whereTo=lowSQL.length();
+        }
 
         String whereStatement = rs.getSQL().substring(where + 5, whereTo)
                 .trim();