Add missing @Override annotations
Change-Id: I8d35d3950e214dbdbc0d198bba9d75c2b46253c6
diff --git a/src/main/java/com/google/gwtorm/client/CompoundKey.java b/src/main/java/com/google/gwtorm/client/CompoundKey.java
index 8224cac..0087ccb 100644
--- a/src/main/java/com/google/gwtorm/client/CompoundKey.java
+++ b/src/main/java/com/google/gwtorm/client/CompoundKey.java
@@ -33,6 +33,7 @@
/**
* @return the parent key instance; null if this is a root level key.
*/
+ @Override
public P getParentKey() {
return null;
}
@@ -92,6 +93,7 @@
return r.toString();
}
+ @Override
public void fromString(final String in) {
final String[] parts = in.split(",");
int p = 0;
diff --git a/src/main/java/com/google/gwtorm/client/IntKey.java b/src/main/java/com/google/gwtorm/client/IntKey.java
index e7995a3..f64493b 100644
--- a/src/main/java/com/google/gwtorm/client/IntKey.java
+++ b/src/main/java/com/google/gwtorm/client/IntKey.java
@@ -37,6 +37,7 @@
/**
* @return the parent key instance; null if this is a root level key.
*/
+ @Override
public P getParentKey() {
return null;
}
@@ -72,6 +73,7 @@
return r.toString();
}
+ @Override
public void fromString(final String in) {
set(Integer.parseInt(KeyUtil.parseFromString(getParentKey(), in)));
}
diff --git a/src/main/java/com/google/gwtorm/client/Key.java b/src/main/java/com/google/gwtorm/client/Key.java
index a08929a..b5b3d3a 100644
--- a/src/main/java/com/google/gwtorm/client/Key.java
+++ b/src/main/java/com/google/gwtorm/client/Key.java
@@ -31,11 +31,14 @@
*/
public P getParentKey();
+ @Override
public int hashCode();
+ @Override
public boolean equals(Object o);
/** @return the key, encoded in a string format . */
+ @Override
public String toString();
/** Reset this key instance to represent the data in the supplied string. */
diff --git a/src/main/java/com/google/gwtorm/client/LongKey.java b/src/main/java/com/google/gwtorm/client/LongKey.java
index 0fc4ae6..986285e 100644
--- a/src/main/java/com/google/gwtorm/client/LongKey.java
+++ b/src/main/java/com/google/gwtorm/client/LongKey.java
@@ -37,6 +37,7 @@
/**
* @return the parent key instance; null if this is a root level key.
*/
+ @Override
public P getParentKey() {
return null;
}
@@ -72,6 +73,7 @@
return r.toString();
}
+ @Override
public void fromString(final String in) {
set(Long.parseLong(KeyUtil.parseFromString(getParentKey(), in)));
}
diff --git a/src/main/java/com/google/gwtorm/client/ShortKey.java b/src/main/java/com/google/gwtorm/client/ShortKey.java
index 59783f4..abda6d1 100644
--- a/src/main/java/com/google/gwtorm/client/ShortKey.java
+++ b/src/main/java/com/google/gwtorm/client/ShortKey.java
@@ -38,6 +38,7 @@
/**
* @return the parent key instance; null if this is a root level key.
*/
+ @Override
public P getParentKey() {
return null;
}
@@ -73,6 +74,7 @@
return r.toString();
}
+ @Override
public void fromString(final String in) {
set(Short.parseShort(KeyUtil.parseFromString(getParentKey(), in)));
}
diff --git a/src/main/java/com/google/gwtorm/client/StringKey.java b/src/main/java/com/google/gwtorm/client/StringKey.java
index 4c85d2a..a4dcf4c 100644
--- a/src/main/java/com/google/gwtorm/client/StringKey.java
+++ b/src/main/java/com/google/gwtorm/client/StringKey.java
@@ -38,6 +38,7 @@
/**
* @return the parent key instance; null if this is a root level key.
*/
+ @Override
public P getParentKey() {
return null;
}
@@ -79,6 +80,7 @@
return r.toString();
}
+ @Override
public void fromString(final String in) {
set(KeyUtil.parseFromString(getParentKey(), in));
}
diff --git a/src/main/java/com/google/gwtorm/jdbc/Database.java b/src/main/java/com/google/gwtorm/jdbc/Database.java
index 2c8d256..802bcec 100644
--- a/src/main/java/com/google/gwtorm/jdbc/Database.java
+++ b/src/main/java/com/google/gwtorm/jdbc/Database.java
@@ -117,6 +117,7 @@
* The JDBC exception detail should be examined to determine the root
* cause of the connection failure.
*/
+ @Override
public T open() throws OrmException {
return implFactory.open();
}
diff --git a/src/main/java/com/google/gwtorm/jdbc/JdbcSchema.java b/src/main/java/com/google/gwtorm/jdbc/JdbcSchema.java
index d7d7be0..5c24e4e 100644
--- a/src/main/java/com/google/gwtorm/jdbc/JdbcSchema.java
+++ b/src/main/java/com/google/gwtorm/jdbc/JdbcSchema.java
@@ -48,6 +48,7 @@
return dbDef.getDialect();
}
+ @Override
public void updateSchema(final StatementExecutor e) throws OrmException {
try {
createSequences(e);
@@ -141,6 +142,7 @@
return null;
}
+ @Override
public void pruneSchema(final StatementExecutor e) throws OrmException {
try {
pruneSequences(e);
@@ -204,6 +206,7 @@
return getDialect().nextLong(getConnection(), poolName);
}
+ @Override
public void close() {
if (conn != null) {
try {
diff --git a/src/main/java/com/google/gwtorm/jdbc/SimpleDataSource.java b/src/main/java/com/google/gwtorm/jdbc/SimpleDataSource.java
index 9bb96d2..a80a3a1 100644
--- a/src/main/java/com/google/gwtorm/jdbc/SimpleDataSource.java
+++ b/src/main/java/com/google/gwtorm/jdbc/SimpleDataSource.java
@@ -98,6 +98,7 @@
return sqle;
}
+ @Override
public Connection getConnection() throws SQLException {
if (driver != null) {
return driver.connect(url, connectionInfo);
@@ -105,6 +106,7 @@
return DriverManager.getConnection(url, connectionInfo);
}
+ @Override
public Connection getConnection(String user, String password)
throws SQLException {
if (driver != null) {
@@ -120,29 +122,36 @@
return DriverManager.getConnection(url, user, password);
}
+ @Override
public PrintWriter getLogWriter() {
return logWriter;
}
+ @Override
public void setLogWriter(final PrintWriter out) {
logWriter = out;
}
+ @Override
public int getLoginTimeout() {
return 0;
}
+ @Override
public void setLoginTimeout(int seconds) {
}
+ @Override
public boolean isWrapperFor(Class<?> iface) {
return false;
}
+ @Override
public <T> T unwrap(Class<T> iface) throws SQLException {
throw new SQLException(getClass().getName() + " wraps nothing");
}
+ @Override
public Logger getParentLogger() throws SQLFeatureNotSupportedException {
throw new SQLFeatureNotSupportedException();
}
diff --git a/src/main/java/com/google/gwtorm/server/AbstractAccess.java b/src/main/java/com/google/gwtorm/server/AbstractAccess.java
index 8c6fd9f..f598630 100644
--- a/src/main/java/com/google/gwtorm/server/AbstractAccess.java
+++ b/src/main/java/com/google/gwtorm/server/AbstractAccess.java
@@ -32,6 +32,7 @@
// Do nothing by default.
}
+ @Override
public CheckedFuture<E, OrmException> getAsync(K key) {
try {
return Futures.immediateCheckedFuture(get(key));
@@ -40,6 +41,7 @@
}
}
+ @Override
public ResultSet<E> get(final Iterable<K> keys) throws OrmException {
final ArrayList<E> r = new ArrayList<E>();
for (final K key : keys) {
@@ -51,6 +53,7 @@
return new ListResultSet<E>(r);
}
+ @Override
public Map<K, E> toMap(final Iterable<E> c) {
try {
final HashMap<K, E> r = new HashMap<K, E>();
diff --git a/src/main/java/com/google/gwtorm/server/AbstractResultSet.java b/src/main/java/com/google/gwtorm/server/AbstractResultSet.java
index c17270b..5eb2803 100644
--- a/src/main/java/com/google/gwtorm/server/AbstractResultSet.java
+++ b/src/main/java/com/google/gwtorm/server/AbstractResultSet.java
@@ -45,6 +45,7 @@
};
}
+ @Override
public List<T> toList() {
List<T> r = new ArrayList<T>();
for (T obj : this) {
diff --git a/src/main/java/com/google/gwtorm/server/ListResultSet.java b/src/main/java/com/google/gwtorm/server/ListResultSet.java
index de6b224..642dd0c 100644
--- a/src/main/java/com/google/gwtorm/server/ListResultSet.java
+++ b/src/main/java/com/google/gwtorm/server/ListResultSet.java
@@ -26,10 +26,12 @@
items = r;
}
+ @Override
public Iterator<T> iterator() {
return toList().iterator();
}
+ @Override
public List<T> toList() {
if (items == null) {
throw new IllegalStateException("Results already obtained");
@@ -39,6 +41,7 @@
return r;
}
+ @Override
public void close() {
items = null;
}
diff --git a/src/main/java/com/google/gwtorm/server/ResultSet.java b/src/main/java/com/google/gwtorm/server/ResultSet.java
index cf589c5..18f8c75 100644
--- a/src/main/java/com/google/gwtorm/server/ResultSet.java
+++ b/src/main/java/com/google/gwtorm/server/ResultSet.java
@@ -30,6 +30,7 @@
* <code>hasNext()</code> returns false) {@link #close()} will be
* automatically called.
*/
+ @Override
Iterator<T> iterator();
/**
diff --git a/src/test/java/com/google/gwtorm/data/PersonAccess.java b/src/test/java/com/google/gwtorm/data/PersonAccess.java
index 091af8e..af36e7a 100644
--- a/src/test/java/com/google/gwtorm/data/PersonAccess.java
+++ b/src/test/java/com/google/gwtorm/data/PersonAccess.java
@@ -21,6 +21,7 @@
import com.google.gwtorm.server.ResultSet;
public interface PersonAccess extends Access<Person, Person.Key> {
+ @Override
@PrimaryKey("name")
Person get(Person.Key key) throws OrmException;
diff --git a/src/test/java/com/google/gwtorm/data/PersonAccess2.java b/src/test/java/com/google/gwtorm/data/PersonAccess2.java
index 46e12cd..a937ef9 100644
--- a/src/test/java/com/google/gwtorm/data/PersonAccess2.java
+++ b/src/test/java/com/google/gwtorm/data/PersonAccess2.java
@@ -19,6 +19,7 @@
import com.google.gwtorm.server.PrimaryKey;
public interface PersonAccess2 extends Access<Person2, Person.Key> {
+ @Override
@PrimaryKey("name")
Person2 get(Person.Key key) throws OrmException;
}
diff --git a/src/test/java/com/google/gwtorm/jdbc/AbstractTestJdbcAccess.java b/src/test/java/com/google/gwtorm/jdbc/AbstractTestJdbcAccess.java
index c3893cd..3fad032 100644
--- a/src/test/java/com/google/gwtorm/jdbc/AbstractTestJdbcAccess.java
+++ b/src/test/java/com/google/gwtorm/jdbc/AbstractTestJdbcAccess.java
@@ -459,6 +459,7 @@
super(s);
}
+ @Override
public String getRelationName() {
return "Data";
}
