Remove warnings.
diff --git a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
index a8e395e..e8dcc4f 100644
--- a/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
+++ b/jena-geosparql/src/main/java/org/apache/jena/geosparql/configuration/GeoSPARQLOperations.java
@@ -61,7 +61,6 @@
import org.apache.jena.riot.Lang;
import org.apache.jena.riot.RDFDataMgr;
import org.apache.jena.util.iterator.ExtendedIterator;
-import org.apache.jena.util.iterator.NiceIterator;
import org.apache.jena.vocabulary.RDFS;
import org.opengis.geometry.MismatchedDimensionException;
import org.opengis.referencing.operation.TransformException;
@@ -1121,12 +1120,11 @@
*/
public static final int countGeometryLiterals(Model model, String graphName) {
Set<String> literalStrings = new TreeSet<>();
- Iterator<Statement> hasSerializationIterator = model.listStatements(null, Geo.HAS_SERIALIZATION_PROP, (RDFNode) null);
- Iterator<Statement> asWKTIterator = model.listStatements(null, Geo.AS_WKT_PROP, (RDFNode) null);
- Iterator<Statement> asGMLIterator = model.listStatements(null, Geo.AS_GML_PROP, (RDFNode) null);
+ ExtendedIterator<Statement> hasSerializationIterator = model.listStatements(null, Geo.HAS_SERIALIZATION_PROP, (RDFNode) null);
+ ExtendedIterator<Statement> asWKTIterator = model.listStatements(null, Geo.AS_WKT_PROP, (RDFNode) null);
+ ExtendedIterator<Statement> asGMLIterator = model.listStatements(null, Geo.AS_GML_PROP, (RDFNode) null);
- NiceIterator niceIterator = new NiceIterator();
- ExtendedIterator<Statement> allIterator = niceIterator.andThen(hasSerializationIterator).andThen(asWKTIterator).andThen(asGMLIterator);
+ ExtendedIterator<Statement> allIterator = hasSerializationIterator.andThen(asWKTIterator).andThen(asGMLIterator);
int count = 0;
while (allIterator.hasNext()) {
Statement st = allIterator.next();
diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
index 9d06c15..a09ee27 100644
--- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
+++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/metadata/JenaMetadata.java
@@ -1219,14 +1219,13 @@
@Override
public abstract boolean usesLocalFiles();
- @SuppressWarnings("javadoc")
+ @Override
public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
throws SQLException {
return new MetaResultSet(MetadataSchema.getPsuedoColumnColumns());
}
- // Java 6/7 compatibility
- @SuppressWarnings("javadoc")
+ @Override
public boolean generatedKeyAlwaysReturned() {
// We don't support returning keys
return false;
diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
index c4d6209..22ef206 100644
--- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
+++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/JenaResultSet.java
@@ -633,12 +633,12 @@
throw new SQLFeatureNotSupportedException("Only the single argument form of getObject() is supported");
}
- @SuppressWarnings("javadoc")
+ @Override
public <T> T getObject(int columnIndex, Class<T> type) throws SQLException {
throw new SQLFeatureNotSupportedException("Only the single argument form of getObject() is supported");
}
- @SuppressWarnings("javadoc")
+ @Override
public <T> T getObject(String columnLabel, Class<T> type) throws SQLException {
throw new SQLFeatureNotSupportedException("Only the single argument form of getObject() is supported");
}
diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
index 3d4e0ee..cb6f00f 100644
--- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
+++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java
@@ -881,17 +881,15 @@
}
}
- // Java 6/7 compatibility
- @SuppressWarnings("javadoc")
+ @Override
public boolean isCloseOnCompletion() {
// Statements do not automatically close
return false;
}
- @SuppressWarnings("javadoc")
+ @Override
public void closeOnCompletion() throws SQLException {
- // We don't support the JDBC 4.1 feature of closing statements
- // automatically
+ // We don't support the JDBC 4.1 feature of closing statements automatically
throw new SQLFeatureNotSupportedException();
}
}
