You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by re...@apache.org on 2012/05/04 13:00:13 UTC
svn commit: r1333875 - in
/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core:
init/ContentLoader.java persistence/dao/impl/UserDAOImpl.java
scheduling/SyncJob.java util/ImportExport.java
Author: rene
Date: Fri May 4 11:00:12 2012
New Revision: 1333875
URL: http://svn.apache.org/viewvc?rev=1333875&view=rev
Log:
sonar: use preparedstatements instead of statements & remove NPE degerences
Modified:
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java?rev=1333875&r1=1333874&r2=1333875&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/ContentLoader.java Fri May 4 11:00:12 2012
@@ -20,9 +20,9 @@ package org.apache.syncope.core.init;
import java.io.InputStream;
import java.sql.Connection;
+import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import java.util.Properties;
import javax.sql.DataSource;
import javax.xml.parsers.SAXParser;
@@ -60,13 +60,13 @@ public class ContentLoader {
Connection conn = DataSourceUtils.getConnection(dataSource);
// 1. Check wether we are allowed to load default content into the DB
- Statement statement = null;
+ PreparedStatement statement = null;
ResultSet resultSet = null;
boolean existingData = false;
try {
- statement = conn.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
final String queryContent = "SELECT * FROM " + SyncopeConf.class.getSimpleName();
- resultSet = statement.executeQuery(queryContent);
+ statement = conn.prepareStatement(queryContent, ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_READ_ONLY);
+ resultSet = statement.executeQuery();
resultSet.last();
existingData = resultSet.getRow() > 0;
@@ -110,9 +110,9 @@ public class ContentLoader {
LOG.debug("Creating view {}", views.get(idx).toString());
try {
- statement = conn.createStatement();
final String updateViews = views.get(idx).toString().replaceAll("\\n", " ");
- statement.executeUpdate(updateViews);
+ statement = conn.prepareStatement(updateViews);
+ statement.executeUpdate();
statement.close();
} catch (SQLException e) {
LOG.error("Could not create view ", e);
@@ -135,9 +135,9 @@ public class ContentLoader {
LOG.debug("Creating index {}", indexes.get(idx).toString());
try {
- statement = conn.createStatement();
final String updateIndexed = indexes.get(idx).toString();
- statement.executeUpdate(updateIndexed);
+ statement = conn.prepareStatement(updateIndexed);
+ statement.executeUpdate();
statement.close();
} catch (SQLException e) {
LOG.error("Could not create index ", e);
@@ -150,8 +150,8 @@ public class ContentLoader {
}
try {
- statement = conn.createStatement();
- statement.executeUpdate("DELETE FROM ACT_GE_PROPERTY");
+ statement = conn.prepareStatement("DELETE FROM ACT_GE_PROPERTY");
+ statement.executeUpdate();
statement.close();
} catch (SQLException e) {
LOG.error("Error during ACT_GE_PROPERTY delete rows", e);
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java?rev=1333875&r1=1333874&r2=1333875&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/persistence/dao/impl/UserDAOImpl.java Fri May 4 11:00:12 2012
@@ -407,21 +407,13 @@ public class UserDAOImpl extends Abstrac
public int compare(String t, String t1) {
if (t == null && t1 == null) {
return 0;
- }
-
- if (t != null && t1 == null) {
+ } else if (t != null && t1 == null) {
return -1;
- }
-
- if (t == null && t1 != null) {
+ } else if (t == null && t1 != null) {
return 1;
- }
-
- if (t.length() == t1.length()) {
+ } else if (t.length() == t1.length()) {
return 0;
- }
-
- if (t.length() > t1.length()) {
+ } else if (t.length() > t1.length()) {
return -1;
} else {
return 1;
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java?rev=1333875&r1=1333874&r2=1333875&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/scheduling/SyncJob.java Fri May 4 11:00:12 2012
@@ -313,7 +313,7 @@ public class SyncJob extends AbstractTas
.getAttributes());
if (status != null) {
- enabled = status != null && status.getValue() != null && !status.getValue().isEmpty()
+ enabled = status.getValue() != null && !status.getValue().isEmpty()
? (Boolean) status.getValue().get(0)
: null;
}
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java?rev=1333875&r1=1333874&r2=1333875&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/util/ImportExport.java Fri May 4 11:00:12 2012
@@ -28,7 +28,6 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.Statement;
import java.sql.Timestamp;
import java.sql.Types;
import java.text.ParseException;
@@ -127,12 +126,12 @@ public class ImportExport extends Defaul
Connection conn = DataSourceUtils.getConnection(dataSource);
ResultSet rs = null;
- Statement stmt = null;
+ PreparedStatement stmt = null;
try {
- stmt = conn.createStatement();
final String queryString = "SELECT * FROM " + tableName;
- rs = stmt.executeQuery(queryString);
+ stmt = conn.prepareStatement(queryString);
+ rs = stmt.executeQuery();
for (int i = 0; i < rs.getMetaData().getColumnCount(); i++) {
colTypes.put(rs.getMetaData().getColumnName(i + 1).toUpperCase(), rs.getMetaData().getColumnType(i + 1));
}