X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-dom-xsql%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fxsql%2Fjdbc%2FJDBCResultSet.java;h=d82c5ba6747fd1621efb57458bd752c454ec629a;hb=53b6d3519de3efe352a4a589c971cc30a82453e1;hp=ea16e72dc91e1a438229e3e2e94f3e78c3eee09a;hpb=43b03a8b90268b91fa50a9f05d9a43e4bc726042;p=controller.git

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 ea16e72dc9..d82c5ba674 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
@@ -1,10 +1,11 @@
 /*
- * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
+ * 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.io.InputStream;
@@ -50,6 +51,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 /**
  * @author Sharon Aicler(saichler@gmail.com)
  **/
+/**
+ * To be removed in Nitrogen
+ */
+@Deprecated
 public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData {
     private static final long serialVersionUID = -7450200738431047057L;
     private static final ClassLoader CLASS_LOADER = JDBCResultSet.class.getClassLoader();
@@ -57,18 +62,18 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
     private static int nextID = 0;
 
     private String sql = null;
-    private List<XSQLBluePrintNode> tablesInQuery = new ArrayList<XSQLBluePrintNode>();
-    private Map<String, XSQLBluePrintNode> tablesInQueryMap = new ConcurrentHashMap<String, XSQLBluePrintNode>();
-    private List<XSQLColumn> fieldsInQuery = new ArrayList<XSQLColumn>();
+    private List<XSQLBluePrintNode> tablesInQuery = new ArrayList<>();
+    private Map<String, XSQLBluePrintNode> tablesInQueryMap = new ConcurrentHashMap<>();
+    private List<XSQLColumn> fieldsInQuery = new ArrayList<>();
     private transient LinkedList<Map<String, Object>> records = new LinkedList<>();
     private transient Map<String, Object> currentRecord = null;
     private boolean finished = false;
     private int id = 0;
     public int numberOfTasks = 0;
-    private Map<String, Map<XSQLColumn, List<XSQLCriteria>>> criteria = new ConcurrentHashMap<String, Map<XSQLColumn, List<XSQLCriteria>>>();
+    private Map<String, Map<XSQLColumn, List<XSQLCriteria>>> criteria = new ConcurrentHashMap<>();
     private Exception err = null;
-    private List<Record> EMPTY_RESULT = new LinkedList<Record>();
-    private transient Map<String, JDBCResultSet> subQueries = new HashMap<String, JDBCResultSet>();
+    private List<Record> EMPTY_RESULT = new LinkedList<>();
+    private transient Map<String, JDBCResultSet> subQueries = new HashMap<>();
 
     public ResultSet getProxy() {
         return this;
@@ -81,7 +86,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
 
     public JDBCResultSet addSubQuery(String _sql, String logicalName) {
         if (subQueries == null) {
-            subQueries = new HashMap<String, JDBCResultSet>();
+            subQueries = new HashMap<>();
         }
         JDBCResultSet rs = new JDBCResultSet(_sql);
         this.subQueries.put(logicalName, rs);
@@ -318,8 +323,8 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
     }
 
     public static class RecordsContainer {
-        public List<Record> records = new LinkedList<Record>();
-        public List<Record> fitRecords = new LinkedList<Record>();
+        public List<Record> records = new LinkedList<>();
+        public List<Record> fitRecords = new LinkedList<>();
         public Object currentObject = null;
     }
 
@@ -393,7 +398,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
 
     private boolean beenHere(Set<String> beenHereElement, Object element) {
         if (beenHereElement == null) {
-            beenHereElement = new HashSet<String>();
+            beenHereElement = new HashSet<>();
         }
 
         String elementKey = null;
@@ -416,7 +421,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
             XSQLBluePrint bluePrint) {
 
         List<Object> children = XSQLODLUtils.getMChildren(node);
-        List<Object> result = new LinkedList<Object>();
+        List<Object> result = new LinkedList<>();
 
         for (Object child : children) {
 
@@ -474,7 +479,7 @@ public class JDBCResultSet implements Serializable, ResultSet, ResultSetMetaData
 
     public List<Record> addRecords(Object element, XSQLBluePrintNode node,
             boolean root, String tableName, XSQLBluePrint bluePrint) {
-        List<Record> result = new LinkedList<Record>();
+        List<Record> result = new LinkedList<>();
         String nodeID = XSQLODLUtils.getNodeIdentiofier(element);
         if (node.getODLTableName().equals(nodeID)) {
             XSQLBluePrintNode bluePrintNode = bluePrint