cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [1/3] cayenne git commit: CAY-2398 Cayenne-Joda was deprecated since 4.1
Date Tue, 27 Mar 2018 13:56:08 GMT
Repository: cayenne
Updated Branches:
  refs/heads/master 8c8a2f0be -> bddc400b9


CAY-2398 Cayenne-Joda was deprecated since 4.1


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5923ad08
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5923ad08
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5923ad08

Branch: refs/heads/master
Commit: 5923ad08fc43c87b7ea379153e34ab32c9c9e93c
Parents: b83cc3e
Author: Arseni Bulatski <ancarseni@gmail.com>
Authored: Fri Jan 26 16:59:43 2018 +0300
Committer: Arseni Bulatski <ancarseni@gmail.com>
Committed: Fri Jan 26 16:59:43 2018 +0300

----------------------------------------------------------------------
 cayenne-joda/pom.xml                                         | 5 ++++-
 .../src/main/java/org/apache/cayenne/joda/JodaModule.java    | 8 ++++++++
 .../org/apache/cayenne/joda/JodaServerModuleProvider.java    | 2 ++
 .../org/apache/cayenne/joda/access/types/DateTimeType.java   | 2 ++
 .../apache/cayenne/joda/access/types/LocalDateTimeType.java  | 2 ++
 .../org/apache/cayenne/joda/access/types/LocalDateType.java  | 2 ++
 .../org/apache/cayenne/joda/access/types/LocalTimeType.java  | 2 ++
 7 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-joda/pom.xml b/cayenne-joda/pom.xml
index af6c079..e9ecbdb 100644
--- a/cayenne-joda/pom.xml
+++ b/cayenne-joda/pom.xml
@@ -99,6 +99,10 @@
 			<artifactId>slf4j-simple</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
@@ -120,7 +124,6 @@
 				<configuration>
 					<map>${project.basedir}/src/test/resources/joda.map.xml</map>
 					<destDir>${project.basedir}/src/test/java</destDir>
-					<defaultPackage>org.apache.cayenne.joda.db</defaultPackage>
 					<superPkg>org.apache.cayenne.joda.db.auto</superPkg>
 				</configuration>
 			</plugin>

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaModule.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaModule.java b/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaModule.java
index 8532d63..2a5344d 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaModule.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaModule.java
@@ -25,16 +25,24 @@ import org.apache.cayenne.joda.access.types.DateTimeType;
 import org.apache.cayenne.joda.access.types.LocalDateTimeType;
 import org.apache.cayenne.joda.access.types.LocalDateType;
 import org.apache.cayenne.joda.access.types.LocalTimeType;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
+
 
 /**
  * Auto-loadable Cayenne module that adds support for Joda {@link org.apache.cayenne.access.types.ExtendedType}
types.
  *
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class JodaModule implements Module {
 
+    private static final Logger logger = LoggerFactory.getLogger(JodaModule.class);
+
     @Override
     public void configure(Binder binder) {
+        logger.warn("Since 4.1 Cayenne-Joda module was deprecated.");
         ServerModule.contributeDefaultTypes(binder)
                 .add(new DateTimeType())
                 .add(new LocalDateType())

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaServerModuleProvider.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaServerModuleProvider.java
b/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaServerModuleProvider.java
index 1f3845c..e42a733 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaServerModuleProvider.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/JodaServerModuleProvider.java
@@ -26,7 +26,9 @@ import java.util.Collections;
 
 /**
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class JodaServerModuleProvider implements CayenneServerModuleProvider {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/DateTimeType.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/DateTimeType.java
b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/DateTimeType.java
index 5b8bb63..13f654e 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/DateTimeType.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/DateTimeType.java
@@ -31,7 +31,9 @@ import java.sql.Timestamp;
  * Handles <code>org.joda.time.DateTime</code> type mapping.
  *
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class DateTimeType implements ExtendedType<DateTime> {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateTimeType.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateTimeType.java
b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateTimeType.java
index e12ab04..9280219 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateTimeType.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateTimeType.java
@@ -32,7 +32,9 @@ import java.sql.Types;
  * Handles <code>org.joda.time.LocalDateTime</code> type mapping.
  *
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class LocalDateTimeType implements ExtendedType<LocalDateTime> {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateType.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateType.java
b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateType.java
index c59a371..8f9c95e 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateType.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalDateType.java
@@ -33,7 +33,9 @@ import java.sql.Types;
  * Handles <code>org.joda.time.LocalDate</code> type mapping.
  *
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class LocalDateType implements ExtendedType<LocalDate> {
 
     @Override

http://git-wip-us.apache.org/repos/asf/cayenne/blob/5923ad08/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalTimeType.java
----------------------------------------------------------------------
diff --git a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalTimeType.java
b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalTimeType.java
index 87d4fca..51c8811 100644
--- a/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalTimeType.java
+++ b/cayenne-joda/src/main/java/org/apache/cayenne/joda/access/types/LocalTimeType.java
@@ -35,7 +35,9 @@ import java.sql.Types;
  * Handles <code>org.joda.time.LocalTime</code> type mapping.
  *
  * @since 4.0
+ * @deprecated since 4.1
  */
+@Deprecated
 public class LocalTimeType implements ExtendedType<LocalTime> {
 
     private static final LocalDate EPOCH = new LocalDate(0, DateTimeZone.UTC);


Mime
View raw message