From: Alexis de Talhouët Date: Fri, 23 Sep 2016 15:50:45 +0000 (-0400) Subject: Bug 6795 - Deprecated sal-dom-xsql X-Git-Tag: release/carbon~463 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=53b6d3519de3efe352a4a589c971cc30a82453e1 Bug 6795 - Deprecated sal-dom-xsql This deprecation notice is to warn potential downstream consumer that those are now deprecated, and that those will be removed in next release, Nitrogen. Change-Id: I1a81f76f3b6bc5a976e0422548a117b7a25bead5 Signed-off-by: Alexis de Talhouët --- diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/odl/xsql/JDBCDriver.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/odl/xsql/JDBCDriver.java index 2cb2e7bfb5..933f953678 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/odl/xsql/JDBCDriver.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/odl/xsql/JDBCDriver.java @@ -20,6 +20,10 @@ import org.opendaylight.controller.md.sal.dom.xsql.jdbc.JDBCConnection; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class JDBCDriver implements Driver { public static JDBCDriver drv = new JDBCDriver(); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/TablesResultSet.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/TablesResultSet.java index 938d25ec50..ad97613ecb 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/TablesResultSet.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/TablesResultSet.java @@ -31,6 +31,10 @@ import java.util.Map; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class TablesResultSet implements ResultSet { private String tables[] = null; 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 1d71d23c9e..386d925b00 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 @@ -34,6 +34,10 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLAdapter extends Thread implements SchemaContextListener { private static final int SLEEP = 10000; 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 0c222321f7..db71d91db7 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 @@ -33,6 +33,10 @@ import java.util.Set; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLBluePrint implements DatabaseMetaData, Serializable { private static final long serialVersionUID = 1L; 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 b5db163dcd..f54a3c98d7 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 @@ -18,6 +18,10 @@ import java.util.Set; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLBluePrintNode implements Serializable { private static final long serialVersionUID = 1L; 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 68c8376050..ae1dffdf32 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 @@ -14,6 +14,10 @@ import java.util.List; import java.util.Map; import java.util.Set; +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLBluePrintRelation implements Serializable { private static final long serialVersionUID = 2L; private XSQLBluePrintNode parent = null; diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLColumn.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLColumn.java index 9deae60d65..7b084fd497 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLColumn.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/XSQLColumn.java @@ -10,6 +10,10 @@ package org.opendaylight.controller.md.sal.dom.xsql; import java.io.Serializable; +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLColumn implements Serializable, Comparable { private static final long serialVersionUID = 4854919735031714751L; 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 9da12b20e0..aa2d8b96b2 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 @@ -13,6 +13,10 @@ import java.lang.reflect.Method; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLCriteria implements Serializable { private static final long serialVersionUID = 1L; 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 c9db91a6da..f4d80ccc02 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 @@ -34,6 +34,10 @@ import org.opendaylight.yangtools.yang.model.util.type.DerivedTypes; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLODLUtils { private static Map, Class> types = 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 ab059d9e64..fc8d6a046d 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 @@ -10,6 +10,10 @@ package org.opendaylight.controller.md.sal.dom.xsql; import java.util.LinkedList; +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLThreadPool { private LinkedList tasks = new LinkedList<>(); private int threadCount = 0; 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 0d36d75a2b..20b8589bba 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 @@ -13,6 +13,10 @@ import java.util.Map; import org.opendaylight.controller.md.sal.dom.xsql.XSQLBluePrint; +/** + * To be removed in Nitrogen + */ +@Deprecated public class JDBCCommand implements Serializable { private static final long serialVersionUID = 1L; 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 b6499af98f..a66db1a2cf 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 @@ -41,6 +41,10 @@ import java.util.concurrent.Executor; import org.opendaylight.controller.md.sal.dom.xsql.XSQLAdapter; import org.opendaylight.controller.md.sal.dom.xsql.XSQLBluePrint; +/** + * To be removed in Nitrogen + */ +@Deprecated public class JDBCConnection implements Connection, Runnable { private Socket socket = null; private DataInputStream in = null; diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCProxy.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCProxy.java index be9cfd3f77..da9f71a5c3 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCProxy.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/controller/md/sal/dom/xsql/jdbc/JDBCProxy.java @@ -13,6 +13,10 @@ import java.lang.reflect.Method; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * To be removed in Nitrogen + */ +@Deprecated public class JDBCProxy implements InvocationHandler { private static final Logger LOG = LoggerFactory.getLogger(JDBCProxy.class); private Object myObject = 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 7c5d560558..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 @@ -51,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(); 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 9b65d6080c..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 @@ -23,6 +23,10 @@ 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; 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 4dbdcc9f42..c319e52ebb 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 @@ -34,6 +34,10 @@ import java.util.Calendar; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +/** + * To be removed in Nitrogen + */ +@Deprecated public class JDBCStatement implements PreparedStatement { private JDBCResultSet rs = null; private transient JDBCConnection connection = null; diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java index 29a1945a6e..fa85cf4530 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/xsql/XSQLProvider.java @@ -18,6 +18,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLProvider implements AutoCloseable { public static final InstanceIdentifier ID = InstanceIdentifier.builder(XSQL.class).build(); diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModule.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModule.java index a669345e14..40200f86d9 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModule.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModule.java @@ -12,6 +12,10 @@ import org.opendaylight.xsql.XSQLProvider; /** * @author Sharon Aicler(saichler@gmail.com) **/ +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLModule extends org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.xsql.rev140626.AbstractXSQLModule { private static final long SLEEP_TIME_BEFORE_CREATING_TRANSACTION = 10000; public XSQLModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModuleFactory.java b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModuleFactory.java index ac0d9c1837..e2c1d4d09c 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModuleFactory.java +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/java/org/opendaylight/yang/gen/v1/http/netconfcentral/org/ns/xsql/rev140626/XSQLModuleFactory.java @@ -8,6 +8,10 @@ * Do not modify this file unless it is present under src/main directory */ package org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.xsql.rev140626; +/** + * To be removed in Nitrogen + */ +@Deprecated public class XSQLModuleFactory extends org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.xsql.rev140626.AbstractXSQLModuleFactory { } diff --git a/opendaylight/md-sal/sal-dom-xsql/src/main/yang/XSQL.yang b/opendaylight/md-sal/sal-dom-xsql/src/main/yang/XSQL.yang index f0f52694a6..1c7a4ff848 100644 --- a/opendaylight/md-sal/sal-dom-xsql/src/main/yang/XSQL.yang +++ b/opendaylight/md-sal/sal-dom-xsql/src/main/yang/XSQL.yang @@ -31,9 +31,11 @@ module XSQL{ identity XSQL { base config:module-type; config:java-name-prefix XSQL; + status deprecated; } augment "/config:modules/config:module/config:configuration" { + status deprecated; case XSQL { when "/config:modules/config:module/config:type = 'XSQL'"; diff --git a/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java b/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java index 4aaec54cb2..fc171e5c60 100644 --- a/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java +++ b/opendaylight/md-sal/sal-karaf-xsql/src/main/java/org/opendaylight/controller/xsql/xsql.java @@ -14,6 +14,10 @@ import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.md.sal.dom.xsql.XSQLAdapter; +/** + * To be removed in Nitrogen + */ +@Deprecated @Command(scope = "odl", name = "xsql", description = "XSQL Karaf Command") public class xsql extends OsgiCommandSupport {