From be3b5a09e4912f7afa45dae63d2c48fffa4b8a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Sun, 31 Aug 2014 20:56:28 +0300
Subject: [PATCH] Findbugs fixes

---
 .../com/mysema/query/jdo/sql/AbstractSQLQuery.java |  5 -----
 .../java/com/mysema/query/jpa/impl/JPAUtil.java    |  2 +-
 .../com/mysema/query/sql/dml/SQLInsertClause.java  | 14 +++++++-------
 .../com/mysema/query/sql/dml/SQLMergeClause.java   | 13 +++++++------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
index f220ce32a..2e81deaed 100644
--- a/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
+++ b/querydsl-jdo/src/main/java/com/mysema/query/jdo/sql/AbstractSQLQuery.java
@@ -70,11 +70,6 @@ public abstract class AbstractSQLQuery<T extends AbstractSQLQuery<T>> extends Pr
 
     protected final QueryMixin<T> queryMixin;
 
-    @Nullable
-    protected Expression<?> union;
-
-    protected boolean unionAll;
-
     @SuppressWarnings("unchecked")
     public AbstractSQLQuery(QueryMetadata metadata, Configuration conf, PersistenceManager persistenceManager,
                             boolean detach) {
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
index fdf68a86b..a3e888674 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/impl/JPAUtil.java
@@ -44,7 +44,7 @@ public final class JPAUtil {
                 }
             }
             if (hasParameters) {
-                Parameter parameter = query.getParameter(Integer.valueOf(key));
+                Parameter parameter = query.getParameter(Integer.parseInt(key));
                 Class parameterType = parameter != null ? parameter.getParameterType() : null;
                 if (parameterType != null && !parameterType.isInstance(val)) {
                     if (val instanceof Number && Number.class.isAssignableFrom(parameterType)) {
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
index 9cc59f7ea..9eced87cb 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLInsertClause.java
@@ -312,7 +312,6 @@ public class SQLInsertClause extends AbstractSQLClause<SQLInsertClause> implemen
         context = startContext(connection, metadata, entity);
         try {
             PreparedStatement stmt = null;
-            Collection<PreparedStatement> stmts = null;
             if (batches.isEmpty()) {
                 stmt = createStatement(true);
                 listeners.notifyInsert(entity, metadata, columns, values, subQuery);
@@ -321,18 +320,19 @@ public class SQLInsertClause extends AbstractSQLClause<SQLInsertClause> implemen
                 stmt.executeUpdate();
                 listeners.preExecute(context);
             } else {
-                stmts = createStatements(true);
-
+                Collection<PreparedStatement> stmts = createStatements(true);
+                if (stmts != null && stmts.size() > 1) {
+                    throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
+                }
+                stmt = stmts.iterator().next();
                 listeners.notifyInserts(entity, metadata, batches);
 
                 listeners.preExecute(context);
                 stmt.executeBatch();
                 listeners.executed(context);
             }
-            if (stmts != null && stmts.size() > 1) {
-                throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
-            }
-            final Statement stmt2 = stmts != null ? stmts.iterator().next() : stmt;
+
+            final Statement stmt2 = stmt;
             ResultSet rs = stmt.getGeneratedKeys();
             return new ResultSetAdapter(rs) {
                 @Override
diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
index 33e0bde6f..1a733e9e5 100644
--- a/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
+++ b/querydsl-sql/src/main/java/com/mysema/query/sql/dml/SQLMergeClause.java
@@ -205,7 +205,6 @@ public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements
         try {
             if (configuration.getTemplates().isNativeMerge()) {
                 PreparedStatement stmt = null;
-                Collection<PreparedStatement> stmts = null;
                 if (batches.isEmpty()) {
                     stmt = createStatement(true);
                     listeners.notifyMerge(entity, metadata, keys, columns, values, subQuery);
@@ -214,17 +213,19 @@ public class SQLMergeClause extends AbstractSQLClause<SQLMergeClause> implements
                     stmt.executeUpdate();
                     listeners.executed(context);
                 } else {
-                    stmts = createStatements(true);
+                    Collection<PreparedStatement> stmts = createStatements(true);
+                    if (stmts != null && stmts.size() > 1) {
+                        throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
+                    }
+                    stmt = stmts.iterator().next();
                     listeners.notifyMerges(entity, metadata, batches);
 
                     listeners.preExecute(context);
                     stmt.executeBatch();
                     listeners.executed(context);
                 }
-                if (stmts != null && stmts.size() > 1) {
-                    throw new IllegalStateException("executeWithKeys called with batch statement and multiple SQL strings");
-                }
-                final Statement stmt2 = stmts != null ? stmts.iterator().next() : stmt;
+
+                final Statement stmt2 = stmt;
                 ResultSet rs = stmt.getGeneratedKeys();
                 return new ResultSetAdapter(rs) {
                     @Override