cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abulat...@apache.org
Subject [cayenne] branch master updated: Remove deprecation from FrontBase adapter.
Date Fri, 26 Apr 2019 10:33:49 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 7557bc2  Remove deprecation from FrontBase adapter.
7557bc2 is described below

commit 7557bc25b5cce35a3b56efe4fcd8a332611cfd40
Author: Arseni Bulatski <ancarseni@gmail.com>
AuthorDate: Fri Apr 26 13:32:42 2019 +0300

    Remove deprecation from FrontBase adapter.
---
 RELEASE-NOTES.txt                                                       | 2 +-
 UPGRADE.txt                                                             | 2 +-
 .../main/java/org/apache/cayenne/dba/frontbase/FrontBaseAdapter.java    | 2 --
 .../java/org/apache/cayenne/dba/frontbase/FrontBaseBooleanType.java     | 2 --
 .../java/org/apache/cayenne/dba/frontbase/FrontBaseByteArrayType.java   | 2 --
 .../main/java/org/apache/cayenne/dba/frontbase/FrontBaseCharType.java   | 2 --
 .../java/org/apache/cayenne/dba/frontbase/FrontBasePkGenerator.java     | 2 --
 .../org/apache/cayenne/dba/frontbase/FrontBaseSQLTreeProcessor.java     | 2 --
 .../main/java/org/apache/cayenne/dba/frontbase/FrontBaseSniffer.java    | 2 --
 9 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index cf67ddd..3ab9145 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -22,7 +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-2525 Deprecate OpenBase adapter
 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 fb61f25..eb83462 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -10,7 +10,7 @@ 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-2525 OpenBase adapter was 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 337312c..a3cdf5d 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,6 @@ import org.apache.cayenne.resource.ResourceLocator;
  * </pre>
  * 
  * @since 1.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):
@@ -65,7 +64,6 @@ import org.apache.cayenne.resource.ResourceLocator;
 // 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 af34b36..a617453 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,9 +29,7 @@ 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 435d6f6..db3ce13 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,9 +26,7 @@ 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 e45c205..8a70ac8 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,11 +30,9 @@ 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 c85e61a..4dff809 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
@@ -36,9 +36,7 @@ import org.apache.cayenne.query.SQLTemplate;
 
 /**
  * @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 b26c158..4fce3d7 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,9 +29,7 @@ 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 a771669..79b809d 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
@@ -29,9 +29,7 @@ import org.apache.cayenne.di.Inject;
 
 /**
  * @since 1.2
- * @deprecated since 4.2
  */
-@Deprecated
 public class FrontBaseSniffer implements DbAdapterDetector {
 
     protected AdhocObjectFactory objectFactory;


Mime
View raw message