You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2015/09/07 15:30:15 UTC
sqoop git commit: SQOOP-2550: Sqoop2: Findbugs: Add filter for the
warning SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE and
SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING
Repository: sqoop
Updated Branches:
refs/heads/sqoop2 57b97ee1b -> 7d05cc28f
SQOOP-2550: Sqoop2: Findbugs: Add filter for the warning SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE and SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING
(Colin Ma via Jarek Jarcec Cecho)
Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/7d05cc28
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/7d05cc28
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/7d05cc28
Branch: refs/heads/sqoop2
Commit: 7d05cc28f9bf0cc608fb05087733e4dc098fbcb4
Parents: 57b97ee
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Mon Sep 7 15:29:37 2015 +0200
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Mon Sep 7 15:29:37 2015 +0200
----------------------------------------------------------------------
common-test/pom.xml | 5 +++++
.../apache/sqoop/common/test/asserts/ProviderAsserts.java | 1 +
.../org/apache/sqoop/common/test/db/DatabaseProvider.java | 1 +
connector/connector-generic-jdbc/pom.xml | 5 +++++
.../apache/sqoop/connector/jdbc/GenericJdbcExecutor.java | 2 ++
.../apache/sqoop/connector/jdbc/GenericJdbcExtractor.java | 2 +-
.../sqoop/connector/jdbc/GenericJdbcFromInitializer.java | 2 ++
.../org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java | 1 +
.../sqoop/connector/jdbc/GenericJdbcToInitializer.java | 1 +
pom.xml | 9 ++++++++-
repository/repository-common/pom.xml | 5 +++++
.../sqoop/repository/common/CommonRepositoryHandler.java | 1 +
repository/repository-derby/pom.xml | 5 +++++
.../sqoop/repository/derby/DerbyRepositoryHandler.java | 2 ++
...DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java | 1 +
repository/repository-mysql/pom.xml | 4 ++++
.../sqoop/repository/mysql/MySqlRepositoryHandler.java | 1 +
repository/repository-postgresql/pom.xml | 5 +++++
.../repository/postgresql/PostgresqlRepositoryHandler.java | 1 +
19 files changed, 52 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/common-test/pom.xml
----------------------------------------------------------------------
diff --git a/common-test/pom.xml b/common-test/pom.xml
index d08951b..1306598 100644
--- a/common-test/pom.xml
+++ b/common-test/pom.xml
@@ -74,6 +74,11 @@ limitations under the License.
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
</dependencies>
<profiles>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
----------------------------------------------------------------------
diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java b/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
index c528e53..0da7ea8 100644
--- a/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
+++ b/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
@@ -31,6 +31,7 @@ import static org.testng.Assert.fail;
/**
* Database provider related asserts.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
public class ProviderAsserts {
private static final Logger LOG = Logger.getLogger(ProviderAsserts.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java
----------------------------------------------------------------------
diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java b/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java
index 4f4d347..f30d587 100644
--- a/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java
+++ b/common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java
@@ -40,6 +40,7 @@ import java.util.List;
* supported database server have it's own concrete implementation that fills
* the gaps in database differences.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
abstract public class DatabaseProvider {
private static final Logger LOG = Logger.getLogger(DatabaseProvider.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/pom.xml b/connector/connector-generic-jdbc/pom.xml
index 7bdeddb..8552770 100644
--- a/connector/connector-generic-jdbc/pom.xml
+++ b/connector/connector-generic-jdbc/pom.xml
@@ -58,6 +58,11 @@ limitations under the License.
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java
index a5315da..ee31b4a 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutor.java
@@ -48,6 +48,8 @@ import java.util.Set;
/**
* Database executor that is based on top of JDBC spec.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings({
+ "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", "SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE"})
public class GenericJdbcExecutor {
private static final Logger LOG = Logger.getLogger(GenericJdbcExecutor.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java
index 8bf43e4..edb2754 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcExtractor.java
@@ -35,7 +35,7 @@ import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.joda.time.LocalTime;
-
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
public class GenericJdbcExtractor extends Extractor<LinkConfiguration, FromJobConfiguration, GenericJdbcPartition> {
public static final Logger LOG = Logger.getLogger(GenericJdbcExtractor.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java
index 909ed74..cddbb04 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcFromInitializer.java
@@ -39,6 +39,8 @@ import org.apache.sqoop.schema.Schema;
import org.apache.sqoop.schema.type.Column;
import org.apache.sqoop.utils.ClassUtils;
+@edu.umd.cs.findbugs.annotations.SuppressWarnings({
+ "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", "SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE"})
public class GenericJdbcFromInitializer extends Initializer<LinkConfiguration, FromJobConfiguration> {
private static final Logger LOG =
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java
index 4e96644..0e09673 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcLoader.java
@@ -22,6 +22,7 @@ import org.apache.sqoop.connector.jdbc.configuration.ToJobConfiguration;
import org.apache.sqoop.job.etl.Loader;
import org.apache.sqoop.job.etl.LoaderContext;
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
public class GenericJdbcLoader extends Loader<LinkConfiguration, ToJobConfiguration> {
public static final int DEFAULT_ROWS_PER_BATCH = 100;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java
index 80fbece..ed215ea 100644
--- a/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java
+++ b/connector/connector-generic-jdbc/src/main/java/org/apache/sqoop/connector/jdbc/GenericJdbcToInitializer.java
@@ -37,6 +37,7 @@ import org.apache.sqoop.schema.Schema;
import org.apache.sqoop.schema.type.Column;
import org.apache.sqoop.utils.ClassUtils;
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE")
public class GenericJdbcToInitializer extends Initializer<LinkConfiguration, ToJobConfiguration> {
private GenericJdbcExecutor executor;
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 25ad00c..6a2d78e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,7 @@ limitations under the License.
<kafka.version>0.8.1.1</kafka.version>
<avro.version>1.7.7</avro.version>
<jcommander.version>1.27</jcommander.version>
+ <findbugs.version>1.3.2</findbugs.version>
</properties>
<dependencies>
@@ -639,7 +640,13 @@ limitations under the License.
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${findbugs.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-common/pom.xml
----------------------------------------------------------------------
diff --git a/repository/repository-common/pom.xml b/repository/repository-common/pom.xml
index c740117..97a2dc1 100644
--- a/repository/repository-common/pom.xml
+++ b/repository/repository-common/pom.xml
@@ -43,6 +43,11 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
index ae1e1b2..46235be 100644
--- a/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
+++ b/repository/repository-common/src/main/java/org/apache/sqoop/repository/common/CommonRepositoryHandler.java
@@ -75,6 +75,7 @@ import org.apache.sqoop.submission.counter.Counters;
/**
* Set of methods required from each JDBC based repository.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
public abstract class CommonRepositoryHandler extends JdbcRepositoryHandler {
private static final Logger LOG =
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-derby/pom.xml
----------------------------------------------------------------------
diff --git a/repository/repository-derby/pom.xml b/repository/repository-derby/pom.xml
index 2a3b8fc..ce82900 100644
--- a/repository/repository-derby/pom.xml
+++ b/repository/repository-derby/pom.xml
@@ -53,6 +53,11 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
index 0b68058..45c7447 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyRepositoryHandler.java
@@ -61,6 +61,8 @@ import org.apache.sqoop.repository.derby.upgrade.UniqueJobRename;
*
* Repository implementation for Derby database.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings({
+ "SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING", "SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE"})
public class DerbyRepositoryHandler extends CommonRepositoryHandler {
private static final Logger LOG =
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java
index 738e593..786370e 100644
--- a/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java
+++ b/repository/repository-derby/src/main/java/org/apache/sqoop/repository/derby/DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.java
@@ -41,6 +41,7 @@ import java.util.Map;
*
* This class is intended to handle the updates to the Generic JDBC Connector.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
public class DerbyUpgradeGenericJdbcConnectorConfigAndInputNames {
private static final Logger LOG =
Logger.getLogger(DerbyUpgradeGenericJdbcConnectorConfigAndInputNames.class);
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-mysql/pom.xml
----------------------------------------------------------------------
diff --git a/repository/repository-mysql/pom.xml b/repository/repository-mysql/pom.xml
index 15e909e..586e1bc 100644
--- a/repository/repository-mysql/pom.xml
+++ b/repository/repository-mysql/pom.xml
@@ -46,6 +46,10 @@ limitations under the License.
<artifactId>sqoop-repository-common</artifactId>
</dependency>
<dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java b/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java
index 4917ffe..fd3a3f2 100644
--- a/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java
+++ b/repository/repository-mysql/src/main/java/org/apache/sqoop/repository/mysql/MySqlRepositoryHandler.java
@@ -40,6 +40,7 @@ import org.apache.sqoop.repository.common.CommonRepositorySchemaConstants;
*
* Repository implementation for MySQL database.
*/
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
public class MySqlRepositoryHandler extends CommonRepositoryHandler {
private static final Logger LOG =
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-postgresql/pom.xml
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/pom.xml b/repository/repository-postgresql/pom.xml
index bb3859f..e609efe 100644
--- a/repository/repository-postgresql/pom.xml
+++ b/repository/repository-postgresql/pom.xml
@@ -59,6 +59,11 @@ limitations under the License.
</dependency>
<dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>${testng.version}</version>
http://git-wip-us.apache.org/repos/asf/sqoop/blob/7d05cc28/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java
index 0d0ea8c..5ada2d0 100644
--- a/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java
+++ b/repository/repository-postgresql/src/main/java/org/apache/sqoop/repository/postgresql/PostgresqlRepositoryHandler.java
@@ -35,6 +35,7 @@ import java.sql.Statement;
import java.util.Map;
import java.util.TreeMap;
+@edu.umd.cs.findbugs.annotations.SuppressWarnings("SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING")
public class PostgresqlRepositoryHandler extends CommonRepositoryHandler {
private static final Logger LOG =
Logger.getLogger(PostgresqlRepositoryHandler.class);