svn commit: r1533171 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity: connection/DBCPConnectionFactory.java datasource/GenericHelperInfo.java

[adrianc]

Author: adrianc
Date: Thu Oct 17 17:27:51 2013
New Revision: 1533171

URL: http://svn.apache.org/r1533171
Log:
Added some convenience methods to GenericHelperInfo.java that will help simplify client code.

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java?rev=1533171&r1=1533170&r2=1533171&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java Thu Oct 17 17:27:51 2013
@@ -37,7 +37,6 @@ import org.apache.commons.dbcp.managed.P
 import org.apache.commons.dbcp.managed.XAConnectionFactory;
 import org.apache.commons.pool.impl.GenericObjectPool;
 import org.ofbiz.base.util.Debug;
-import org.ofbiz.base.util.UtilValidate;
 import org.ofbiz.entity.GenericEntityConfException;
 import org.ofbiz.entity.GenericEntityException;
 import org.ofbiz.entity.config.EntityConfigUtil;
@@ -47,7 +46,9 @@ import org.ofbiz.entity.datasource.Gener
 import org.ofbiz.entity.transaction.TransactionFactory;
 
 /**
- * DBCPConnectionFactory
+ * Apache Commons DBCP connection factory.
+ *
+ * @see <a href="http://commons.apache.org/proper/commons-dbcp/">Apache Commons DBCP</a>
  */
 public class DBCPConnectionFactory implements ConnectionFactoryInterface {
 
@@ -68,9 +69,9 @@ public class DBCPConnectionFactory imple
         TransactionManager txMgr = TransactionFactory.getTransactionManager();
         String driverName = jdbcElement.getJdbcDriver();
 
-        String jdbcUri = UtilValidate.isNotEmpty(helperInfo.getOverrideJdbcUri()) ? helperInfo.getOverrideJdbcUri() : jdbcElement.getJdbcUri();
-        String jdbcUsername = UtilValidate.isNotEmpty(helperInfo.getOverrideUsername()) ? helperInfo.getOverrideUsername() : jdbcElement.getJdbcUsername();
-        String jdbcPassword = UtilValidate.isNotEmpty(helperInfo.getOverridePassword()) ? helperInfo.getOverridePassword() : EntityConfigUtil.getJdbcPassword(jdbcElement);
+        String jdbcUri = helperInfo.getOverrideJdbcUri(jdbcElement.getJdbcUri());
+        String jdbcUsername = helperInfo.getOverrideUsername(jdbcElement.getJdbcUsername());
+        String jdbcPassword = helperInfo.getOverridePassword(EntityConfigUtil.getJdbcPassword(jdbcElement));
 
         // pool settings
         int maxSize = jdbcElement.getPoolMaxsize();
@@ -117,7 +118,7 @@ public class DBCPConnectionFactory imple
         factory.setDefaultReadOnly(false);
 
         String transIso = jdbcElement.getIsolationLevel();
-        if (UtilValidate.isNotEmpty(transIso)) {
+        if (!transIso.isEmpty()) {
             if ("Serializable".equals(transIso)) {
                 factory.setDefaultTransactionIsolation(Connection.TRANSACTION_SERIALIZABLE);
             } else if ("RepeatableRead".equals(transIso)) {

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java?rev=1533171&r1=1533170&r2=1533171&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/datasource/GenericHelperInfo.java Thu Oct 17 17:27:51 2013
@@ -68,6 +68,10 @@ public final class GenericHelperInfo {
         return overrideJdbcUri;
     }
 
+    public String getOverrideJdbcUri(String defaultValue) {
+        return overrideJdbcUri.isEmpty() ? defaultValue : overrideJdbcUri;
+    }
+
     public void setOverrideJdbcUri(String overrideJdbcUri) {
         if (overrideJdbcUri != null) {
             this.overrideJdbcUri = overrideJdbcUri;
@@ -78,6 +82,10 @@ public final class GenericHelperInfo {
         return overrideUsername;
     }
 
+    public String getOverrideUsername(String defaultValue) {
+        return overrideUsername.isEmpty() ? defaultValue : overrideUsername;
+    }
+
     public void setOverrideUsername(String overrideUsername) {
         if (overrideUsername != null) {
             this.overrideUsername = overrideUsername;
@@ -88,6 +96,10 @@ public final class GenericHelperInfo {
         return overridePassword;
     }
 
+    public String getOverridePassword(String defaultValue) {
+        return overridePassword.isEmpty() ? defaultValue : overridePassword;
+    }
+
     public void setOverridePassword(String overridePassword) {
         if (overridePassword != null) {
             this.overridePassword = overridePassword;