You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/04/11 08:44:48 UTC

[cayenne] branch master updated (9e3b9fd -> a768e44)

This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git.


    from 9e3b9fd  Additional checks
     new 466f9aa  CAY-2525 Deprecate FrontBase and OpenBase adapters
     new 0f0ad86  Merge PR #374
     new a768e44  CAY-2525 Deprecate FrontBase and OpenBase adapters   additional java docs

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 RELEASE-NOTES.txt                                    |  1 +
 UPGRADE.txt                                          |  2 ++
 .../cayenne/dba/frontbase/FrontBaseAdapter.java      | 16 +++++++++-------
 .../cayenne/dba/frontbase/FrontBaseBooleanType.java  |  2 ++
 .../dba/frontbase/FrontBaseByteArrayType.java        |  2 ++
 .../cayenne/dba/frontbase/FrontBaseCharType.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBasePkGenerator.java  | 10 ++++++----
 .../dba/frontbase/FrontBaseSQLTreeProcessor.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBaseSniffer.java      |  8 +++++---
 .../org/apache/cayenne/dba/frontbase/package.html    |  3 +++
 .../apache/cayenne/dba/openbase/OpenBaseAdapter.java |  2 ++
 .../cayenne/dba/openbase/OpenBasePkGenerator.java    | 20 +++++++++++---------
 .../dba/openbase/OpenBaseSQLTreeProcessor.java       |  2 ++
 .../apache/cayenne/dba/openbase/OpenBaseSniffer.java |  8 +++++---
 .../org/apache/cayenne/dba/openbase/package.html     |  3 +++
 15 files changed, 57 insertions(+), 26 deletions(-)


[cayenne] 01/03: CAY-2525 Deprecate FrontBase and OpenBase adapters

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 466f9aa152ae9956100d0687fdbed42cb432a94b
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Wed Apr 10 15:04:05 2019 +0300

    CAY-2525 Deprecate FrontBase and OpenBase adapters
---
 RELEASE-NOTES.txt                                    |  1 +
 UPGRADE.txt                                          |  2 ++
 .../cayenne/dba/frontbase/FrontBaseAdapter.java      | 16 +++++++++-------
 .../cayenne/dba/frontbase/FrontBaseBooleanType.java  |  2 ++
 .../dba/frontbase/FrontBaseByteArrayType.java        |  2 ++
 .../cayenne/dba/frontbase/FrontBaseCharType.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBasePkGenerator.java  | 10 ++++++----
 .../dba/frontbase/FrontBaseSQLTreeProcessor.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBaseSniffer.java      |  8 +++++---
 .../apache/cayenne/dba/openbase/OpenBaseAdapter.java |  2 ++
 .../cayenne/dba/openbase/OpenBasePkGenerator.java    | 20 +++++++++++---------
 .../dba/openbase/OpenBaseSQLTreeProcessor.java       |  2 ++
 .../apache/cayenne/dba/openbase/OpenBaseSniffer.java |  8 +++++---
 13 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index df5df34..d138f14 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -22,6 +22,7 @@ CAY-2517 EventManager: optimization of adding listeners
 CAY-2518 Add method to append having qualifier expression to ObjectSelect
 CAY-2520 Split ObjectId into several specialized variants
 CAY-2522 Make ObjectSelect a direct query
+CAY-2525 Deprecate FrontBase and OpenBase adapters
 CAY-2540 Modeler: redesign dbRelationship editor dialog
 CAY-2542 Modeler: redesign ObjRelationship editor dialog
 CAY-2543 Move ResultSetMapping generation from metadata to translator
diff --git a/UPGRADE.txt b/UPGRADE.txt
index 84060f3..8e080ab 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -10,6 +10,8 @@ UPGRADING TO 4.2.M1
 * Per CAY-2520 ObjectId can't be instantiated directly, ObjectId.of(..) methods should be used.
     E.g. ObjectId.of("Artist", 1) instead of new ObjectId("Artist", 1).
 
+* Per CAY-2525 FrontBase and OpenBase adapters were deprecated.
+
 * Per CAY-2467 Property class is replaced with a type-aware Property API, it's mostly backwards compatible.
     To take advantage of this new API you should regenerate code via Modeler ("Tools" -> "Generate Classes") or cgen tools.
 
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
index 76d1db6..56d43ce 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
@@ -19,6 +19,13 @@
 
 package org.apache.cayenne.dba.frontbase;
 
+import java.sql.Types;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Function;
+
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.access.sqlbuilder.sqltree.Node;
 import org.apache.cayenne.access.types.ExtendedType;
@@ -36,13 +43,6 @@ import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.resource.ResourceLocator;
 
-import java.sql.Types;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Function;
-
 /**
  * DbAdapter implementation for <a href="http://www.frontbase.com/">FrontBase
  * RDBMS</a>. Sample connection settings to use with FrontBase are shown below:
@@ -55,6 +55,7 @@ import java.util.function.Function;
  * </pre>
  * 
  * @since 1.2
+ * @deprecated since 4.2
  */
 // TODO, Andrus 11/8/2005:
 // Limitations (also see FrontBaseStackAdapter in unit tests):
@@ -64,6 +65,7 @@ import java.util.function.Function;
 // FrontBase, however aliases don't work ( ORDER BY UPPER(t0.ARTIST_NAME)) ...
 // not sure
 // what to do about it.
+@Deprecated
 public class FrontBaseAdapter extends JdbcAdapter {
 
 	public FrontBaseAdapter(@Inject RuntimeProperties runtimeProperties,
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseBooleanType.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseBooleanType.java
index a617453..af34b36 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseBooleanType.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseBooleanType.java
@@ -29,7 +29,9 @@ import org.apache.cayenne.access.types.BooleanType;
  * "setObject", as binding via "setBoolean" only works for BIT.
  * 
  * @since 1.2
+ * @deprecated since 4.2
  */
+@Deprecated
 class FrontBaseBooleanType extends BooleanType {
 
     @Override
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseByteArrayType.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseByteArrayType.java
index db3ce13..435d6f6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseByteArrayType.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseByteArrayType.java
@@ -26,7 +26,9 @@ import org.apache.cayenne.access.types.ByteArrayType;
 
 /**
  * @since 1.2
+ * @deprecated since 4.2
  */
+@Deprecated
 class FrontBaseByteArrayType extends ByteArrayType {
 
     FrontBaseByteArrayType() {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseCharType.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseCharType.java
index 8a70ac8..e45c205 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseCharType.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseCharType.java
@@ -30,9 +30,11 @@ import org.apache.cayenne.util.MemoryClob;
  * A char type that uses a real clob for insertion.
  * 
  * @since 1.2
+ * @deprecated since 4.2
  */
 // actually this is the way CLOBs must be handled by default, but there are still some
 // issues with other adapters, so we can't move this to a superclass yet.
+@Deprecated
 class FrontBaseCharType extends CharType {
 
     FrontBaseCharType() {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
index e7bbdde..c85e61a 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java
@@ -19,6 +19,10 @@
 
 package org.apache.cayenne.dba.frontbase;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.DataRow;
 import org.apache.cayenne.access.DataNode;
@@ -30,13 +34,11 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.query.Query;
 import org.apache.cayenne.query.SQLTemplate;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * @since 1.2
+ * @deprecated since 4.2
  */
+@Deprecated
 public class FrontBasePkGenerator extends JdbcPkGenerator {
 
     /**
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSQLTreeProcessor.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSQLTreeProcessor.java
index 4fce3d7..b26c158 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSQLTreeProcessor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSQLTreeProcessor.java
@@ -29,7 +29,9 @@ import org.apache.cayenne.access.translator.select.BaseSQLTreeProcessor;
 
 /**
  * @since 4.2
+ * @deprecated since 4.2
  */
+@Deprecated
 public class FrontBaseSQLTreeProcessor extends BaseSQLTreeProcessor {
 
     @Override
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
index 9400b34..a771669 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java
@@ -19,17 +19,19 @@
 
 package org.apache.cayenne.dba.frontbase;
 
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
 import org.apache.cayenne.configuration.server.DbAdapterDetector;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.Inject;
 
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
 /**
  * @since 1.2
+ * @deprecated since 4.2
  */
+@Deprecated
 public class FrontBaseSniffer implements DbAdapterDetector {
 
     protected AdhocObjectFactory objectFactory;
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
index c245942..29009b8 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
@@ -59,7 +59,9 @@ import org.apache.cayenne.resource.ResourceLocator;
  * </pre>
  *
  * @since 1.1
+ * @deprecated since 4.2
  */
+@Deprecated
 public class OpenBaseAdapter extends JdbcAdapter {
 
     public OpenBaseAdapter(@Inject RuntimeProperties runtimeProperties,
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
index 53e3bc6..c110011 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBasePkGenerator.java
@@ -19,15 +19,6 @@
 
 package org.apache.cayenne.dba.openbase;
 
-import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.dba.JdbcAdapter;
-import org.apache.cayenne.dba.JdbcPkGenerator;
-import org.apache.cayenne.dba.QuotingStrategy;
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.util.IDUtil;
-
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.Statement;
@@ -38,9 +29,20 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.cayenne.CayenneRuntimeException;
+import org.apache.cayenne.access.DataNode;
+import org.apache.cayenne.dba.JdbcAdapter;
+import org.apache.cayenne.dba.JdbcPkGenerator;
+import org.apache.cayenne.dba.QuotingStrategy;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.util.IDUtil;
+
 /**
  * @since 1.1
+ * @deprecated since 4.2
  */
+@Deprecated
 public class OpenBasePkGenerator extends JdbcPkGenerator {
 
     /**
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSQLTreeProcessor.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSQLTreeProcessor.java
index 29eaaa1..d3eca24 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSQLTreeProcessor.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSQLTreeProcessor.java
@@ -30,7 +30,9 @@ import org.apache.cayenne.access.translator.select.BaseSQLTreeProcessor;
 
 /**
  * @since 4.2
+ * @deprecated since 4.2
  */
+@Deprecated
 public class OpenBaseSQLTreeProcessor extends BaseSQLTreeProcessor {
 
     @Override
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
index 4c86a81..6b1e72f 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseSniffer.java
@@ -19,19 +19,21 @@
 
 package org.apache.cayenne.dba.openbase;
 
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
 import org.apache.cayenne.configuration.server.DbAdapterDetector;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.di.AdhocObjectFactory;
 import org.apache.cayenne.di.Inject;
 
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
 /**
  * Detects OpenBase DB from JDBC metadata.
  * 
  * @since 1.2
+ * @deprecated since 4.2
  */
+@Deprecated
 public class OpenBaseSniffer implements DbAdapterDetector {
 
     protected AdhocObjectFactory objectFactory;


[cayenne] 02/03: Merge PR #374

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 0f0ad864cc66777534ebe993e8b2bdf88600d40a
Merge: 9e3b9fd 466f9aa
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Apr 11 11:40:26 2019 +0300

    Merge PR #374

 RELEASE-NOTES.txt                                    |  1 +
 UPGRADE.txt                                          |  2 ++
 .../cayenne/dba/frontbase/FrontBaseAdapter.java      | 16 +++++++++-------
 .../cayenne/dba/frontbase/FrontBaseBooleanType.java  |  2 ++
 .../dba/frontbase/FrontBaseByteArrayType.java        |  2 ++
 .../cayenne/dba/frontbase/FrontBaseCharType.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBasePkGenerator.java  | 10 ++++++----
 .../dba/frontbase/FrontBaseSQLTreeProcessor.java     |  2 ++
 .../cayenne/dba/frontbase/FrontBaseSniffer.java      |  8 +++++---
 .../apache/cayenne/dba/openbase/OpenBaseAdapter.java |  2 ++
 .../cayenne/dba/openbase/OpenBasePkGenerator.java    | 20 +++++++++++---------
 .../dba/openbase/OpenBaseSQLTreeProcessor.java       |  2 ++
 .../apache/cayenne/dba/openbase/OpenBaseSniffer.java |  8 +++++---
 13 files changed, 51 insertions(+), 26 deletions(-)



[cayenne] 03/03: CAY-2525 Deprecate FrontBase and OpenBase adapters additional java docs

Posted by nt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit a768e4415fa34192497bfe2ab6ccf4a9b1f95038
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Apr 11 11:44:22 2019 +0300

    CAY-2525 Deprecate FrontBase and OpenBase adapters
      additional java docs
---
 .../main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java   | 2 +-
 .../src/main/java/org/apache/cayenne/dba/frontbase/package.html        | 3 +++
 .../src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java | 2 +-
 .../src/main/java/org/apache/cayenne/dba/openbase/package.html         | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
index 56d43ce..337312c 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java
@@ -55,7 +55,7 @@ import org.apache.cayenne.resource.ResourceLocator;
  * </pre>
  * 
  * @since 1.2
- * @deprecated since 4.2
+ * @deprecated since 4.2, FrontBase is pretty much obsolete and not tested
  */
 // TODO, Andrus 11/8/2005:
 // Limitations (also see FrontBaseStackAdapter in unit tests):
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/package.html b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/package.html
index 2517134..824de43 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/package.html
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/frontbase/package.html
@@ -19,5 +19,8 @@
 <html>
 <body>
 FrontBase DbAdapter.
+<p>
+    Deprecated since Cayenne 4.2, as it can't be effectively tested and supported.
+</p>
 </body>
 </html>
\ No newline at end of file
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
index 29009b8..c5b46ce 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/OpenBaseAdapter.java
@@ -59,7 +59,7 @@ import org.apache.cayenne.resource.ResourceLocator;
  * </pre>
  *
  * @since 1.1
- * @deprecated since 4.2
+ * @deprecated since 4.2, OpenBase is pretty much obsolete and not tested
  */
 @Deprecated
 public class OpenBaseAdapter extends JdbcAdapter {
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/package.html b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/package.html
index e3dcc7a..58ef51d 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/package.html
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/openbase/package.html
@@ -19,5 +19,8 @@
 <html>
 <body>
 OpenBase DbAdapter.
+<p>
+    Deprecated since Cayenne 4.2, as it can't be effectively tested and supported.
+</p>
 </body>
 </html>