cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1577131 - in /cayenne/main/trunk/cayenne-server/src: main/java/org/apache/cayenne/access/types/ main/java/org/apache/cayenne/dba/oracle/ main/java/org/apache/cayenne/dba/sqlite/ test/java/org/apache/cayenne/access/types/ test/java/org/apac...
Date Thu, 13 Mar 2014 12:26:40 GMT
Author: aadamchik
Date: Thu Mar 13 12:26:40 2014
New Revision: 1577131

URL: http://svn.apache.org/r1577131
Log:
java 6 annotations

Modified:
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigDecimalType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigIntegerType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BooleanType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CalendarType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DateType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DoubleType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/EnumType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/FloatType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/IntegerType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/LongType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ObjectType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ShortType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimeType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimestampType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UUIDType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UtilDateType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/VoidType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteCalendarType.java
    cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java
    cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigDecimalType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigDecimalType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigDecimalType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigDecimalType.java
Thu Mar 13 12:26:40 2014
@@ -28,19 +28,23 @@ import java.sql.ResultSet;
  */
 public class BigDecimalType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return BigDecimal.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return rs.getBigDecimal(index);
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return rs.getBigDecimal(index);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigIntegerType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigIntegerType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigIntegerType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BigIntegerType.java
Thu Mar 13 12:26:40 2014
@@ -30,10 +30,12 @@ import org.apache.cayenne.dba.TypesMappi
  */
 public class BigIntegerType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return BigInteger.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         Object object = rs.getObject(index);
         if (object == null) {
@@ -43,6 +45,7 @@ public class BigIntegerType implements E
         return new BigInteger(object.toString());
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         Object object = rs.getObject(index);
@@ -53,6 +56,7 @@ public class BigIntegerType implements E
         return new BigInteger(object.toString());
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BooleanType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BooleanType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BooleanType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/BooleanType.java
Thu Mar 13 12:26:40 2014
@@ -34,10 +34,12 @@ import java.sql.Types;
  */
 public class BooleanType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Boolean.class.getName();
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object val,
@@ -57,11 +59,13 @@ public class BooleanType implements Exte
         }
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         boolean b = rs.getBoolean(index);
         return (rs.wasNull()) ? null : b ? Boolean.TRUE : Boolean.FALSE;
     }
 
+    @Override
     public Object materializeObject(CallableStatement st, int index, int type)
             throws Exception {
         boolean b = st.getBoolean(index);

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ByteType.java
Thu Mar 13 12:26:40 2014
@@ -39,21 +39,25 @@ public class ByteType implements Extende
         this.widenBytes = widenBytes;
     }
 
+    @Override
     public String getClassName() {
         return Byte.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         byte b = rs.getByte(index);
         return (rs.wasNull()) ? null : b;
     }
 
+    @Override
     public Object materializeObject(CallableStatement st, int index, int type)
             throws Exception {
         byte b = st.getByte(index);
         return (st.wasNull()) ? null : b;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CalendarType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CalendarType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CalendarType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/CalendarType.java
Thu Mar 13 12:26:40 2014
@@ -51,10 +51,12 @@ public class CalendarType<T extends Cale
         this.calendarClass = calendarClass;
     }
 
+    @Override
     public String getClassName() {
         return calendarClass.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
 
         Date val = null;
@@ -95,6 +97,7 @@ public class CalendarType<T extends Cale
         return calendar;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         Date val = null;
@@ -135,6 +138,7 @@ public class CalendarType<T extends Cale
         return calendar;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DateType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DateType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DateType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DateType.java
Thu Mar 13 12:26:40 2014
@@ -28,19 +28,23 @@ import java.sql.ResultSet;
  */
 public class DateType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Date.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return rs.getDate(index);
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return rs.getDate(index);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DoubleType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DoubleType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DoubleType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/DoubleType.java
Thu Mar 13 12:26:40 2014
@@ -27,21 +27,25 @@ import java.sql.ResultSet;
  */
 public class DoubleType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Double.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         double d = rs.getDouble(index);
         return rs.wasNull() ? null : d;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         double d = rs.getDouble(index);
         return rs.wasNull() ? null : d;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/EnumType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/EnumType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/EnumType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/EnumType.java
Thu Mar 13 12:26:40 2014
@@ -59,10 +59,12 @@ public class EnumType<T extends Enum<T>>
         }
     }
 
+    @Override
     public String getClassName() {
         return enumClass.getName();
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,
@@ -86,6 +88,7 @@ public class EnumType<T extends Enum<T>>
         }
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         if (TypesMapping.isNumeric(type)) {
             int i = rs.getInt(index);
@@ -97,6 +100,7 @@ public class EnumType<T extends Enum<T>>
         }
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
 

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ExtendedEnumType.java
Thu Mar 13 12:26:40 2014
@@ -71,10 +71,12 @@ public class ExtendedEnumType<T extends 
         }
     }
 
+    @Override
     public String getClassName() {
         return enumerationClass.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         if (TypesMapping.isNumeric(type)) {
             int i = rs.getInt(index);
@@ -86,6 +88,7 @@ public class ExtendedEnumType<T extends 
         }
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         if (TypesMapping.isNumeric(type)) {
@@ -98,6 +101,7 @@ public class ExtendedEnumType<T extends 
         }
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/FloatType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/FloatType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/FloatType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/FloatType.java
Thu Mar 13 12:26:40 2014
@@ -27,21 +27,25 @@ import java.sql.ResultSet;
  */
 public class FloatType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Float.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         float f = rs.getFloat(index);
         return rs.wasNull() ? null : f;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         float f = rs.getFloat(index);
         return rs.wasNull() ? null : f;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/IntegerType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/IntegerType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/IntegerType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/IntegerType.java
Thu Mar 13 12:26:40 2014
@@ -27,21 +27,25 @@ import java.sql.ResultSet;
  */
 public class IntegerType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Integer.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         int value = rs.getInt(index);
         return (rs.wasNull()) ? null : value;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         int value = rs.getInt(index);
         return (rs.wasNull()) ? null : value;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/LongType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/LongType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/LongType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/LongType.java
Thu Mar 13 12:26:40 2014
@@ -27,21 +27,25 @@ import java.sql.ResultSet;
  */
 public class LongType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Long.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         long value = rs.getLong(index);
         return (rs.wasNull()) ? null : value;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         long value = rs.getLong(index);
         return (rs.wasNull()) ? null : value;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ObjectType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ObjectType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ObjectType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ObjectType.java
Thu Mar 13 12:26:40 2014
@@ -29,19 +29,23 @@ import java.sql.ResultSet;
  */
 public class ObjectType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Object.class.getName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return rs.getObject(index);
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return rs.getObject(index);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ShortType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ShortType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ShortType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/ShortType.java
Thu Mar 13 12:26:40 2014
@@ -39,21 +39,25 @@ public class ShortType implements Extend
         this.widenShorts = widenShorts;
     }
 
+    @Override
     public String getClassName() {
         return Short.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         short s = rs.getShort(index);
         return (rs.wasNull()) ? null : s;
     }
 
+    @Override
     public Object materializeObject(CallableStatement st, int index, int type)
             throws Exception {
         short s = st.getShort(index);
         return (st.wasNull()) ? null : s;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimeType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimeType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimeType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimeType.java
Thu Mar 13 12:26:40 2014
@@ -28,19 +28,23 @@ import java.sql.Time;
  */
 public class TimeType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Time.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return rs.getTime(index);
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return rs.getTime(index);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimestampType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimestampType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimestampType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/TimestampType.java
Thu Mar 13 12:26:40 2014
@@ -28,19 +28,23 @@ import java.sql.Timestamp;
  */
 public class TimestampType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Timestamp.class.getName();
     }
 
+    @Override
     public Timestamp materializeObject(ResultSet rs, int index, int type) throws Exception
{
         return rs.getTimestamp(index);
     }
 
+    @Override
     public Timestamp materializeObject(CallableStatement cs, int index, int type)
             throws Exception {
         return cs.getTimestamp(index);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UUIDType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UUIDType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UUIDType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UUIDType.java
Thu Mar 13 12:26:40 2014
@@ -32,10 +32,12 @@ import org.apache.cayenne.CayenneRuntime
  */
 public class UUIDType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return UUID.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         String uuid = rs.getString(index);
         if (uuid == null) {
@@ -50,6 +52,7 @@ public class UUIDType implements Extende
         }
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
 
@@ -66,6 +69,7 @@ public class UUIDType implements Extende
         }
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UtilDateType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UtilDateType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UtilDateType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/UtilDateType.java
Thu Mar 13 12:26:40 2014
@@ -36,6 +36,7 @@ public class UtilDateType implements Ext
     /**
      * Returns "java.util.Date".
      */
+    @Override
     public String getClassName() {
         return Date.class.getName();
     }
@@ -55,6 +56,7 @@ public class UtilDateType implements Ext
                             + TypesMapping.getSqlNameByType(type));
     }
 
+    @Override
     public Date materializeObject(ResultSet rs, int index, int type) throws Exception {
         Date val = null;
 
@@ -77,6 +79,7 @@ public class UtilDateType implements Ext
         return val == null ? null : new Date(val.getTime());
     }
 
+    @Override
     public Date materializeObject(CallableStatement cs, int index, int type)
             throws Exception {
         Date val = null;
@@ -100,6 +103,7 @@ public class UtilDateType implements Ext
         return val == null ? null : new Date(val.getTime());
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/VoidType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/VoidType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/VoidType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/types/VoidType.java
Thu Mar 13 12:26:40 2014
@@ -31,10 +31,12 @@ import java.sql.ResultSet;
  */
 public class VoidType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Void.TYPE.getName();
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,
@@ -44,10 +46,12 @@ public class VoidType implements Extende
         statement.setNull(pos, type);
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return null;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return null;

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
Thu Mar 13 12:26:40 2014
@@ -321,10 +321,12 @@ public class OracleAdapter extends JdbcA
      */
     final class OracleBooleanType implements ExtendedType {
 
+        @Override
         public String getClassName() {
             return Boolean.class.getName();
         }
 
+        @Override
         public void setJdbcObject(
                 PreparedStatement st,
                 Object val,
@@ -343,6 +345,7 @@ public class OracleAdapter extends JdbcA
             }
         }
 
+        @Override
         public Object materializeObject(ResultSet rs, int index, int type)
                 throws Exception {
 
@@ -352,6 +355,7 @@ public class OracleAdapter extends JdbcA
             return (rs.wasNull()) ? null : i == 0 ? Boolean.FALSE : Boolean.TRUE;
         }
 
+        @Override
         public Object materializeObject(CallableStatement st, int index, int type)
                 throws Exception {
 

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteBigDecimalType.java
Thu Mar 13 12:26:40 2014
@@ -30,10 +30,12 @@ import org.apache.cayenne.access.types.E
  */
 class SQLiteBigDecimalType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return BigDecimal.class.getName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         // BigDecimals are not supported by the zentus driver... in addition the driver
@@ -43,6 +45,7 @@ class SQLiteBigDecimalType implements Ex
         return (string == null) ? null : new BigDecimal(string);
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         // BigDecimals are not supported by the zentus driver... in addition the driver
         // throws an NPE on 'getDouble' if the value is null, and also there are rounding
@@ -51,6 +54,7 @@ class SQLiteBigDecimalType implements Ex
         return (string == null) ? null : new BigDecimal(string);
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object val,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteByteArrayType.java
Thu Mar 13 12:26:40 2014
@@ -29,10 +29,12 @@ import org.apache.cayenne.access.types.E
  */
 class SQLiteByteArrayType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return "byte[]";
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object val,
@@ -53,10 +55,12 @@ class SQLiteByteArrayType implements Ext
         }
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return rs.getBytes(index);
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return rs.getBytes(index);

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteCalendarType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteCalendarType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteCalendarType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteCalendarType.java
Thu Mar 13 12:26:40 2014
@@ -41,10 +41,12 @@ class SQLiteCalendarType implements Exte
         this.delegateDateType = new SQLiteDateType();
     }
 
+    @Override
     public String getClassName() {
         return delegateCalendarType.getClassName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
 
@@ -58,6 +60,7 @@ class SQLiteCalendarType implements Exte
         return calendar;
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         Date date = (Date) delegateDateType.materializeObject(rs, index, type);
         if (date == null) {
@@ -69,6 +72,7 @@ class SQLiteCalendarType implements Exte
         return calendar;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteFloatType.java
Thu Mar 13 12:26:40 2014
@@ -29,10 +29,12 @@ import org.apache.cayenne.access.types.E
  */
 class SQLiteFloatType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return Float.class.getName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         // the driver throws an NPE on 'getFloat' if the value is null, so must read it as
@@ -41,6 +43,7 @@ class SQLiteFloatType implements Extende
         return (n == null) ? null : new Float(n.floatValue());
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         // the driver throws an NPE on 'getFloat' if the value is null, so must read it as
         // an object.
@@ -48,6 +51,7 @@ class SQLiteFloatType implements Extende
         return (n == null) ? null : new Float(n.floatValue());
     }
     
+    @Override
     public void setJdbcObject(
             PreparedStatement st,
             Object val,

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/types/MockExtendedType.java
Thu Mar 13 12:26:40 2014
@@ -25,20 +25,22 @@ import java.sql.ResultSet;
 
 public class MockExtendedType implements ExtendedType {
 
-    protected Class objectClass;
+    protected Class<?> objectClass;
 
     public MockExtendedType() {
         this(Object.class);
     }
 
-    public MockExtendedType(Class objectClass) {
+    public MockExtendedType(Class<?> objectClass) {
         this.objectClass = objectClass;
     }
 
+    @Override
     public String getClassName() {
         return objectClass.getName();
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,
@@ -47,10 +49,12 @@ public class MockExtendedType implements
             int precision) throws Exception {
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return objectClass.newInstance();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return objectClass.newInstance();

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/testdo/testmap/StringET1ExtendedType.java
Thu Mar 13 12:26:40 2014
@@ -26,21 +26,25 @@ import org.apache.cayenne.access.types.E
 
 public class StringET1ExtendedType implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return StringET1.class.getName();
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         String string = rs.getString(index);
         return string != null ? new StringET1(string) : null;
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         String string = rs.getString(index);
         return string != null ? new StringET1(string) : null;
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType1.java
Thu Mar 13 12:26:40 2014
@@ -27,19 +27,23 @@ import org.apache.cayenne.access.types.E
 
 public class CAY_207StringType1 implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return CAY_207String1.class.getName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return new CAY_207String1(rs.getString(index));
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return new CAY_207String1(rs.getString(index));
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,

Modified: cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java?rev=1577131&r1=1577130&r2=1577131&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java
(original)
+++ cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/unit/jira/CAY_207StringType2.java
Thu Mar 13 12:26:40 2014
@@ -29,19 +29,23 @@ import org.apache.cayenne.access.types.E
  */
 public class CAY_207StringType2 implements ExtendedType {
 
+    @Override
     public String getClassName() {
         return CAY_207String2.class.getName();
     }
 
+    @Override
     public Object materializeObject(CallableStatement rs, int index, int type)
             throws Exception {
         return new CAY_207String2(rs.getString(index));
     }
 
+    @Override
     public Object materializeObject(ResultSet rs, int index, int type) throws Exception {
         return new CAY_207String2(rs.getString(index));
     }
 
+    @Override
     public void setJdbcObject(
             PreparedStatement statement,
             Object value,



Mime
View raw message