Mercurial > hg > monetdb-java

changeset 768:a80c21fe7bb2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed deprecated nl.cwi.monetdb.*.* classes and package. Those classes were marked deprecated on 12 Nov 2020 from release 3.0 (released on 17 Feb 2021) onwards. It includes: nl.cwi.monetdb.client.JdbcClient.class nl.cwi.monetdb.jdbc.MonetDriver.class nl.cwi.monetdb.jdbc.types.INET.class nl.cwi.monetdb.jdbc.types.URL.class nl.cwi.monetdb.mcl.net.MapiSocket.class These classes are now removed permanently. Use the org.monetdb.* equivalents instead.
author Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date Thu, 06 Jul 2023 15:35:04 +0200 (21 months ago)
parents 1547843b3a9b
children b6d113ee35ae
files ChangeLog build.xml build_jre17.xml release.txt src/main/java/nl/cwi/monetdb/client/JdbcClient.java src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java src/main/java/nl/cwi/monetdb/jdbc/types/INET.java src/main/java/nl/cwi/monetdb/jdbc/types/URL.java src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java src/main/java/org/monetdb/client/JdbcClient.java src/main/java/org/monetdb/jdbc/MonetDriver.java.in src/main/java/org/monetdb/jdbc/types/INET.java src/main/java/org/monetdb/jdbc/types/URL.java src/main/java/org/monetdb/mcl/net/MapiSocket.java
diffstat 14 files changed, 22 insertions(+), 155 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,18 @@
 # This file is updated with Maddlog
 
 * Thu Jul  6 2023 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
+- Removed deprecated nl.cwi.monetdb.*.* classes and package.
+  Those classes were marked deprecated on 12 Nov 2020 from
+  release 3.0 (released on 17 Feb 2021) onwards. It includes:
+   nl.cwi.monetdb.client.JdbcClient.class
+   nl.cwi.monetdb.jdbc.MonetDriver.class
+   nl.cwi.monetdb.jdbc.types.INET.class
+   nl.cwi.monetdb.jdbc.types.URL.class
+   nl.cwi.monetdb.mcl.net.MapiSocket.class
+  These classes are now removed permanently.
+  Use the  org.monetdb.*  equivalents instead.
+
+* Thu Jul  6 2023 Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
 - Removed code to support old MonetDB servers Oct2014 or older. Those
   old servers did not yet have the system tables: sys.keywords and
   sys.table_types which are introduced in Jul2015 release. Those system
--- a/build.xml
+++ b/build.xml
@@ -28,11 +28,6 @@ Copyright 1997 - July 2008 CWI, August 2
   <property name="util-package"          value="org/monetdb/util" />
   <property name="mero-control-package"  value="org/monetdb/merovingian" />
 
-  <!-- old nl/cwi/monetdb packages for some deprecated classes as of nov2020 -->
-  <property name="nl-cwi-jdbc-package"   value="nl/cwi/monetdb/jdbc" />
-  <property name="nl-cwi-mcl-package"    value="nl/cwi/monetdb/mcl" />
-  <property name="nl-cwi-client-package" value="nl/cwi/monetdb/client" />
-
   <property file="build.local.properties" />
   <property file="build.properties" />
 
@@ -93,10 +88,7 @@ Copyright 1997 - July 2008 CWI, August 2
       <fileset dir="${builddir}">
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
         <include name="${util-package}/FileTransferHandler.class" />
       </fileset>
     </jar>
@@ -106,7 +98,6 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jardir}/monetdb-clients.jar">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
       </fileset>
     </jar>
@@ -120,14 +111,10 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jdbcclient-jar}">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -181,9 +168,6 @@ Copyright 1997 - July 2008 CWI, August 2
       >
       <src path="${srcdir}" />
       <include name="${jdbc-package}/**/*.java" />
-      <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-      <include name="${nl-cwi-jdbc-package}/types/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <include name="${util-package}/FileTransferHandler.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
@@ -202,7 +186,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${mcl-package}/**/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -220,7 +203,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${client-package}/**/*.java" />
-      <include name="${nl-cwi-client-package}/JdbcClient.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -313,21 +295,14 @@ Copyright 1997 - July 2008 CWI, August 2
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar">
       <srcfiles dir="${srcdir}">
         <include name="${client-package}/**/*.java" />
-        <include name="${nl-cwi-client-package}/JdbcClient.java" />
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/build_jre17.xml
+++ b/build_jre17.xml
@@ -28,11 +28,6 @@ Copyright 1997 - July 2008 CWI, August 2
   <property name="util-package"          value="org/monetdb/util" />
   <property name="mero-control-package"  value="org/monetdb/merovingian" />
 
-  <!-- old nl/cwi/monetdb packages for some deprecated classes as of nov2020 -->
-  <property name="nl-cwi-jdbc-package"   value="nl/cwi/monetdb/jdbc" />
-  <property name="nl-cwi-mcl-package"    value="nl/cwi/monetdb/mcl" />
-  <property name="nl-cwi-client-package" value="nl/cwi/monetdb/client" />
-
   <property file="build.local.properties" />
   <property file="build.properties" />
 
@@ -96,10 +91,7 @@ Copyright 1997 - July 2008 CWI, August 2
       <fileset dir="${builddir}">
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
         <include name="${util-package}/FileTransferHandler.class" />
       </fileset>
     </jar>
@@ -109,7 +101,6 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jardir}/monetdb-clients.jar">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
       </fileset>
     </jar>
@@ -123,14 +114,10 @@ Copyright 1997 - July 2008 CWI, August 2
     <jar jarfile="${jdbcclient-jar}">
       <fileset dir="${builddir}">
         <include name="${client-package}/**/*.class" />
-        <include name="${nl-cwi-client-package}/JdbcClient.class" />
         <include name="${util-package}/**/*.class" />
         <include name="META-INF/services/java.sql.Driver" />
         <include name="${jdbc-package}/**/*.class" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.class" />
-        <include name="${nl-cwi-jdbc-package}/types/*.class" />
         <include name="${mcl-package}/**/*.class" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.class" />
       </fileset>
       <manifest>
         <attribute name="Built-By" value="${user.name}" />
@@ -184,9 +171,6 @@ Copyright 1997 - July 2008 CWI, August 2
       >
       <src path="${srcdir}" />
       <include name="${jdbc-package}/**/*.java" />
-      <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-      <include name="${nl-cwi-jdbc-package}/types/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <include name="${util-package}/FileTransferHandler.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
@@ -205,7 +189,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${mcl-package}/**/*.java" />
-      <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -223,7 +206,6 @@ Copyright 1997 - July 2008 CWI, August 2
       target="${jvm.version}"
       >
       <include name="${client-package}/**/*.java" />
-      <include name="${nl-cwi-client-package}/JdbcClient.java" />
       <compilerarg line="${javac.flags}" />
     </javac>
   </target>
@@ -316,21 +298,14 @@ Copyright 1997 - July 2008 CWI, August 2
     <uptodate targetfile="${jdbc-jar}" property="uptodate.jdbc-jar">
       <srcfiles dir="${srcdir}">
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jdbcclient-jar}" property="uptodate.jdbcclient-jar">
       <srcfiles dir="${srcdir}">
         <include name="${client-package}/**/*.java" />
-        <include name="${nl-cwi-client-package}/JdbcClient.java" />
         <include name="${jdbc-package}/**/*.java" />
-        <include name="${nl-cwi-jdbc-package}/MonetDriver.java" />
-        <include name="${nl-cwi-jdbc-package}/types/*.java" />
         <include name="${mcl-package}/**/*.java" />
-        <include name="${nl-cwi-mcl-package}/net/MapiSocket.java" />
       </srcfiles>
     </uptodate>
     <uptodate targetfile="${jmonetdb-jar}" property="uptodate.jmonetdb-jar">
--- a/release.txt
+++ b/release.txt
@@ -65,11 +65,9 @@ See also: https://www.monetdb.org/Docume
 
 The MonetDB JDBC driver class name is: org.monetdb.jdbc.MonetDriver
 This has been changed as of release 3.0 (monetdb-jdbc-3.0.jre8.jar).
-The old driver class (nl.cwi.monetdb.jdbc.MonetDriver) has been deprecated.
-It is still included in the jar file to ease the transition for existing deployments.
-However it will be removed in a future release (planned for monetdb-jdbc-3.4.jre8.jar)
- of the MonetDB JDBC driver.
-Please use the new driver class name asap in your configuration files or Java code.
+The old driver class (nl.cwi.monetdb.jdbc.MonetDriver) has been deprecated
+since 12 Nov 2020 and removed from release 3.4 (monetdb-jdbc-3.4.jre8.jar).
+Please use the new driver class name asap in your configuration files and Java code.
 
 
 JDBC COMPLIANCE
deleted file mode 100644
--- a/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
- */
-
-package nl.cwi.monetdb.client;
-
-import java.sql.DriverManager;	// import is required as it will load the org.monetdb.jdbc.MonetDriver class
-
-/**
- * a wrapper class for old programs who still depend on
- * class nl.cwi.monetdb.client.JdbcClient to work.
- * This class is deprecated since nov 2020 and will be removed in a future release.
- */
-public final class JdbcClient extends org.monetdb.client.JdbcClient {
-}
deleted file mode 100644
--- a/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
- */
-
-package nl.cwi.monetdb.jdbc;
-
-/**
- * a wrapper class for old programs who still depend on
- * class nl.cwi.monetdb.jdbc.MonetDriver to work.
- * This class is deprecated since nov 2020 and will be removed in a future release.
- */
-public final class MonetDriver extends org.monetdb.jdbc.MonetDriver {
-}
deleted file mode 100644
--- a/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
- */
-
-package nl.cwi.monetdb.jdbc.types;
-
-/**
- * a wrapper class for old programs who still depend on
- * class nl.cwi.monetdb.jdbc.types.INET to work.
- * This class is deprecated since nov 2020 and will be removed in a future release.
- */
-public final class INET extends org.monetdb.jdbc.types.INET {
-}
deleted file mode 100644
--- a/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
- */
-
-package nl.cwi.monetdb.jdbc.types;
-
-/**
- * a wrapper class for old programs who still depend on
- * class nl.cwi.monetdb.jdbc.types.URL to work.
- * This class is deprecated since nov 2020 and will be removed in a future release.
- */
-public final class URL extends org.monetdb.jdbc.types.URL {
-}
deleted file mode 100644
--- a/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0.  If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
- */
-
-package nl.cwi.monetdb.mcl.net;
-
-/**
- * a wrapper class for old programs who still depend on
- * class nl.cwi.monetdb.mcl.net.MapiSocket to work.
- * This class is deprecated since nov 2020 and will be removed in a future release.
- */
-public final class MapiSocket extends org.monetdb.mcl.net.MapiSocket {
-	/**
-	 * Constructs a new MapiSocket.
-	 */
-	public MapiSocket() {
-		super();
-	}
-}
--- a/src/main/java/org/monetdb/client/JdbcClient.java
+++ b/src/main/java/org/monetdb/client/JdbcClient.java
@@ -48,10 +48,10 @@ import java.util.List;
  *
  * @author Fabian Groffen
  * @author Martin van Dinther
- * @version 1.7
+ * @version 1.8
  */
 
-public class JdbcClient {	/* cannot (yet) be final as nl.cwi.monetdb.client.JdbcClient extends this class */
+public final class JdbcClient {
 
 	private static Connection con;
 	private static DatabaseMetaData dbmd;
--- a/src/main/java/org/monetdb/jdbc/MonetDriver.java.in
+++ b/src/main/java/org/monetdb/jdbc/MonetDriver.java.in
@@ -40,7 +40,7 @@ import java.util.Properties;
  * @author Fabian Groffen
  * @version @JDBC_MAJOR@.@JDBC_MINOR@ (@JDBC_VER_SUFFIX@)
  */
-public class MonetDriver implements Driver {	/* cannot (yet) be final as nl.cwi.monetdb.jdbc.MonetDriver extends this class */
+public final class MonetDriver implements Driver {
 	// the url kind will be jdbc:monetdb://<host>[:<port>]/<database>
 	// Chapter 9.2.1 from Sun JDBC 3.0 specification
 	/** The prefix of a MonetDB url */
--- a/src/main/java/org/monetdb/jdbc/types/INET.java
+++ b/src/main/java/org/monetdb/jdbc/types/INET.java
@@ -26,7 +26,7 @@ import java.sql.SQLException;
  * This is probably meaningful only and only if the netmask is 32.
  * The getNetmaskBits() method can be used to retrieve the subnet bits.
  */
-public class INET implements java.sql.SQLData {	/* cannot (yet) be final as nl.cwi.monetdb.jdbc.types.INET extends this class */
+public final class INET implements java.sql.SQLData {
 	private String inet;
 
 	@Override
--- a/src/main/java/org/monetdb/jdbc/types/URL.java
+++ b/src/main/java/org/monetdb/jdbc/types/URL.java
@@ -14,7 +14,7 @@ import java.sql.SQLException;
  * The URL class represents the URL datatype in MonetDB.
  * It represents an URL, that is, a well-formed string conforming to RFC2396.
  */
-public class URL implements java.sql.SQLData {	/* cannot (yet) be final as nl.cwi.monetdb.jdbc.types.URL extends this class */
+public final class URL implements java.sql.SQLData {
 	private String url;
 
 	@Override
--- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java
+++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java
@@ -80,11 +80,11 @@ import org.monetdb.mcl.parser.MCLParseEx
  * geared towards the format of the data.
  *
  * @author Fabian Groffen
- * @version 4.2
+ * @version 4.3
  * @see org.monetdb.mcl.io.BufferedMCLReader
  * @see org.monetdb.mcl.io.BufferedMCLWriter
  */
-public class MapiSocket {	/* cannot (yet) be final as nl.cwi.monetdb.mcl.net.MapiSocket extends this class */
+public final class MapiSocket {
 	/** The TCP Socket to mserver */
 	private Socket con;
 	/** The TCP Socket timeout in milliseconds. Default is 0 meaning the timeout is disabled (i.e., timeout of infinity) */