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=2b50a4d87e0e4cd9158a54d99b5637f287d0b4ff;hp=5be701f82e64497fea4ef863dfd7a147bd360499;hb=bd1cb1ea115b99847a2d305a6df8336cd3988cf3;hpb=b3c034675957f963c5878ce1e5e183ec2de8b5e2

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 5be701f82e..2b50a4d87e 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
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2014, 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.jdbc;
 
 import java.net.ServerSocket;
@@ -5,18 +13,20 @@ 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;
 import org.opendaylight.controller.md.sal.dom.xsql.XSQLColumn;
 import org.opendaylight.controller.md.sal.dom.xsql.XSQLCriteria;
 
+/**
+ * To be removed in Nitrogen
+ */
+@Deprecated
 public class JDBCServer extends Thread {
     private ServerSocket socket = null;
     private XSQLAdapter adapter = null;
@@ -48,8 +58,7 @@ public class JDBCServer extends Thread {
         }
     }
 
-    public static void execute(JDBCResultSet rs, XSQLAdapter adapter)
-            throws SQLException {
+    public static void execute(JDBCResultSet rs, XSQLAdapter adapter)throws SQLException {
         if(rs.getSQL().toLowerCase().trim().equals("select 1")){
             rs.setFinished(true);
             return;
@@ -91,8 +100,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);
                 }
@@ -101,8 +110,8 @@ public class JDBCServer extends Thread {
             return;
         }
 
-        Map<String, XSQLBluePrintNode> logicalNameToNode = new HashMap<String, XSQLBluePrintNode>();
-        Map<String, String> origNameToName = new HashMap<String, String>();
+        Map<String, XSQLBluePrintNode> logicalNameToNode = new HashMap<>();
+        Map<String, String> origNameToName = new HashMap<>();
         List<XSQLColumn> columnOrder = new ArrayList<>();
         int nextLogField = addNextLogicalField(sql, 0,
                 logicalNameToNode, origNameToName,columnOrder);
@@ -119,13 +128,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 +204,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);
@@ -264,12 +273,12 @@ public class JDBCServer extends Thread {
         Map<XSQLColumn, List<XSQLCriteria>> tblCriteria = rs.getCriteria().get(
                 col.getTableName());
         if (tblCriteria == null) {
-            tblCriteria = new ConcurrentHashMap<XSQLColumn, List<XSQLCriteria>>();
+            tblCriteria = new ConcurrentHashMap<>();
             rs.getCriteria().put(col.getTableName(), tblCriteria);
         }
         List<XSQLCriteria> lstCriteria = tblCriteria.get(col);
         if (lstCriteria == null) {
-            lstCriteria = new ArrayList<XSQLCriteria>();
+            lstCriteria = new ArrayList<>();
             tblCriteria.put(col, lstCriteria);
         }
         lstCriteria.add(c);
@@ -342,8 +351,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();