[exo-jcr-commits] exo-jcr SVN: r5362 - in core/trunk: exo.core.component.database/src/main/java/org/exoplatform/services/database/impl and 5 other directories.

Author: andrew.plotnikov Date: 2011-12-27 04:56:52 -0500 (Tue, 27 Dec 2011) New Revision: 5362 Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/TextClobType.java core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/ExceptionManagementHelper.java core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java Log: EXOJCR-1687: Fixed new sonar violations in project Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java =================================================================== --- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/creator/DBCreator.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -329,10 +329,14 @@ */ private DBConnectionInfo constructDBConnectionInfo(String dbName, String dbProductName) { - String dbUrl = serverUrl; + StringBuilder dbUrl = new StringBuilder(serverUrl); + if (dbProductName.startsWith("Microsoft SQL Server")) { - dbUrl = dbUrl + (dbUrl.endsWith(";") ? "" : ";") + "databaseName=" + dbName + ";"; + dbUrl.append(serverUrl.endsWith(";") ? "" : ";"); + dbUrl.append("databaseName="); + dbUrl.append(dbName); + dbUrl.append(";"); } else if (dbProductName.equals("Oracle")) { @@ -340,7 +344,8 @@ } else { - dbUrl = dbUrl + (dbUrl.endsWith("/") ? "" : "/") + dbName; + dbUrl.append(serverUrl.endsWith("/") ? "" : "/"); + dbUrl.append(dbName); } // clone connection properties @@ -352,7 +357,7 @@ } // add url to database - connProperties.put(SERVER_URL, dbUrl); + connProperties.put(SERVER_URL, dbUrl.toString()); return new DBConnectionInfo(dbName, connProperties); } Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/TextClobType.java =================================================================== --- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/TextClobType.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/impl/TextClobType.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -69,7 +69,7 @@ public boolean equals(Object x, Object y) throws HibernateException { - return (x == y) || (x != null && x.equals(y)); + return (x == y) || (x != null && x.equals(y)); //NOSONAR } /** Modified: core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/ExceptionManagementHelper.java =================================================================== --- core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/ExceptionManagementHelper.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.database/src/main/java/org/exoplatform/services/database/utils/ExceptionManagementHelper.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -39,10 +39,12 @@ public static String getFullSQLExceptionMessage(SQLException e) { SQLException next = e.getNextException(); - String errorTrace = ""; + StringBuilder errorTrace = new StringBuilder(); + while (next != null) { - errorTrace += next.getMessage() + "; "; + errorTrace.append(next.getMessage()); + errorTrace.append("; "); next = next.getNextException(); } Modified: core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java =================================================================== --- core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.ldap/src/main/java/org/exoplatform/services/ldap/impl/LDAPServiceImpl.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -74,9 +74,14 @@ boolean ssl = url.toLowerCase().startsWith("ldaps"); if (serverType == ACTIVE_DIRECTORY_SERVER && ssl) { - String keystore = System.getProperty("java.home"); - keystore += File.separator + "lib" + File.separator + "security" + File.separator + "cacerts"; - PrivilegedSystemHelper.setProperty("javax.net.ssl.trustStore", keystore); + StringBuilder keystore = new StringBuilder(System.getProperty("java.home")); + keystore.append(File.separator); + keystore.append("lib"); + keystore.append(File.separator); + keystore.append("security"); + keystore.append(File.separator); + keystore.append("cacerts"); + PrivilegedSystemHelper.setProperty("javax.net.ssl.trustStore", keystore.toString()); } env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); @@ -115,7 +120,7 @@ url = matcher.replaceAll("/ ldaps://"); else url = matcher.replaceAll("/ ldap://"); - url += "/"; + url += "/"; //NOSONAR env.put(Context.PROVIDER_URL, url); if (serverType == ACTIVE_DIRECTORY_SERVER && ssl) Modified: core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.organization.jdbc/src/main/java/org/exoplatform/services/organization/hibernate/UserProfileDAOImpl.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -167,8 +167,10 @@ UserProfile up = (UserProfile)cache_.get(userName); if (up != null) { - if (NOT_FOUND == up) + if (NOT_FOUND == up) //NOSONAR + { return null; + } return up; } Session session = service_.openSession(); Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/BaseDAO.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -706,9 +706,9 @@ if (mbfilter == null) return null; if (!mbfilter.startsWith("(")) - mbfilter = "(" + mbfilter; + mbfilter = "(" + mbfilter; //NOSONAR if (!mbfilter.endsWith(")")) - mbfilter += ")"; + mbfilter += ")"; //NOSONAR return mbfilter; } Modified: core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java =================================================================== --- core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.organization.ldap/src/main/java/org/exoplatform/services/organization/ldap/UserDAOImpl.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -84,8 +84,8 @@ * The Cache Handler * @throws Exception if any errors occurs */ - public UserDAOImpl(LDAPAttributeMapping ldapAttrMapping, LDAPService ldapService, CacheHandler cacheHandler, OrganizationService os) - throws Exception + public UserDAOImpl(LDAPAttributeMapping ldapAttrMapping, LDAPService ldapService, CacheHandler cacheHandler, + OrganizationService os) throws Exception { this(ldapAttrMapping, ldapService, cacheHandler); this.os = os; Modified: core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java =================================================================== --- core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2011-12-27 07:31:38 UTC (rev 5361) +++ core/trunk/exo.core.component.security.core/src/main/java/org/exoplatform/services/security/jaas/IdentitySetLoginModule.java 2011-12-27 09:56:52 UTC (rev 5362) @@ -24,10 +24,8 @@ import org.exoplatform.services.security.Identity; import org.exoplatform.services.security.IdentityRegistry; -import java.util.Map; - -import javax.security.auth.Subject; -import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.Subject; //NOSONAR +import javax.security.auth.callback.CallbackHandler; //NOSONAR import javax.security.auth.login.LoginException; /**