diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
index 686d1a3586..545c2112da 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
@@ -39,53 +39,78 @@ public class DruidDataSourceFactory implements ObjectFactory {
 
     static final int UNKNOWN_TRANSACTIONISOLATION = -1;
 
-    public final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
-    public final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
-    public final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";
-    public final static String PROP_DEFAULTCATALOG = "defaultCatalog";
-    public final static String PROP_DRIVERCLASSNAME = "driverClassName";
-    public final static String PROP_MAXACTIVE = "maxActive";
-    public final static String PROP_MAXIDLE = "maxIdle";
-    public final static String PROP_MINIDLE = "minIdle";
-    public final static String PROP_INITIALSIZE = "initialSize";
-    public final static String PROP_MAXWAIT = "maxWait";
-    public final static String PROP_TESTONBORROW = "testOnBorrow";
-    public final static String PROP_TESTONRETURN = "testOnReturn";
-    public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";
-    public final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";
-    public final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";
-    public final static String PROP_PHY_TIMEOUT_MILLIS = "phyTimeoutMillis";
-    public final static String PROP_TESTWHILEIDLE = "testWhileIdle";
-    public final static String PROP_PASSWORD = "password";
-    public final static String PROP_URL = "url";
-    public final static String PROP_USERNAME = "username";
-    public final static String PROP_VALIDATIONQUERY = "validationQuery";
-    public final static String PROP_VALIDATIONQUERY_TIMEOUT = "validationQueryTimeout";
-
-    public final static String PROP_INITCONNECTIONSQLS = "initConnectionSqls";
+    public final static String PROP_DEFAULTAUTOCOMMIT                   = "defaultAutoCommit";
+    public final static String PROP_DEFAULTREADONLY                     = "defaultReadOnly";
+    public final static String PROP_DEFAULTTRANSACTIONISOLATION         = "defaultTransactionIsolation";
+    public final static String PROP_DEFAULTCATALOG                      = "defaultCatalog";
+    public final static String PROP_DRIVERCLASSNAME                     = "driverClassName";
+    public final static String PROP_MAXACTIVE                           = "maxActive";
+    public final static String PROP_MAXIDLE                             = "maxIdle";
+    public final static String PROP_MINIDLE                             = "minIdle";
+    public final static String PROP_INITIALSIZE                         = "initialSize";
+    public final static String PROP_MAXWAIT                             = "maxWait";
+    public final static String PROP_TESTONBORROW                        = "testOnBorrow";
+    public final static String PROP_TESTONRETURN                        = "testOnReturn";
+    public final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS       = "timeBetweenEvictionRunsMillis";
+    public final static String PROP_NUMTESTSPEREVICTIONRUN              = "numTestsPerEvictionRun";
+    public final static String PROP_MINEVICTABLEIDLETIMEMILLIS          = "minEvictableIdleTimeMillis";
+    public final static String PROP_PHY_TIMEOUT_MILLIS                  = "phyTimeoutMillis";
+    public final static String PROP_TESTWHILEIDLE                       = "testWhileIdle";
+    public final static String PROP_PASSWORD                            = "password";
+    public final static String PROP_URL                                 = "url";
+    public final static String PROP_USERNAME                            = "username";
+    public final static String PROP_VALIDATIONQUERY                     = "validationQuery";
+    public final static String PROP_VALIDATIONQUERY_TIMEOUT             = "validationQueryTimeout";
+    public final static String PROP_INITCONNECTIONSQLS                  = "initConnectionSqls";
     public final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";
-    public final static String PROP_REMOVEABANDONED = "removeAbandoned";
-    public final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";
-    public final static String PROP_LOGABANDONED = "logAbandoned";
-    public final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";
-    public final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";
-    public final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";
-    public final static String PROP_FILTERS = "filters";
-    public final static String PROP_EXCEPTION_SORTER = "exceptionSorter";
-    public final static String PROP_EXCEPTION_SORTER_CLASS_NAME = "exception-sorter-class-name";
-    public final static String PROP_NAME = "name";
+    public final static String PROP_REMOVEABANDONED                     = "removeAbandoned";
+    public final static String PROP_REMOVEABANDONEDTIMEOUT              = "removeAbandonedTimeout";
+    public final static String PROP_LOGABANDONED                        = "logAbandoned";
+    public final static String PROP_POOLPREPAREDSTATEMENTS              = "poolPreparedStatements";
+    public final static String PROP_MAXOPENPREPAREDSTATEMENTS           = "maxOpenPreparedStatements";
+    public final static String PROP_CONNECTIONPROPERTIES                = "connectionProperties";
+    public final static String PROP_FILTERS                             = "filters";
+    public final static String PROP_EXCEPTION_SORTER                    = "exceptionSorter";
+    public final static String PROP_EXCEPTION_SORTER_CLASS_NAME         = "exception-sorter-class-name";
+    public final static String PROP_NAME                                = "name";
+    public final static String PROP_INIT                                = "init";
 
-    public final static String PROP_INIT = "init";
+    private final static String[] ALL_PROPERTIES = {
+            PROP_DEFAULTAUTOCOMMIT,
+            PROP_DEFAULTREADONLY,
+            PROP_DEFAULTTRANSACTIONISOLATION,
+            PROP_DEFAULTCATALOG,
+            PROP_DRIVERCLASSNAME,
+            PROP_MAXACTIVE,
+            PROP_MAXIDLE,
+            PROP_MINIDLE,
+            PROP_INITIALSIZE,
+            PROP_MAXWAIT,
+            PROP_TESTONBORROW,
+            PROP_TESTONRETURN,
+            PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+            PROP_NUMTESTSPEREVICTIONRUN,
+            PROP_MINEVICTABLEIDLETIMEMILLIS,
+            PROP_TESTWHILEIDLE,
+            PROP_PASSWORD,
+            PROP_FILTERS,
+            PROP_URL,
+            PROP_USERNAME,
+            PROP_VALIDATIONQUERY,
+            PROP_VALIDATIONQUERY_TIMEOUT,
+            PROP_INITCONNECTIONSQLS,
+            PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+            PROP_REMOVEABANDONED,
+            PROP_REMOVEABANDONEDTIMEOUT,
+            PROP_LOGABANDONED,
+            PROP_POOLPREPAREDSTATEMENTS,
+            PROP_MAXOPENPREPAREDSTATEMENTS,
+            PROP_CONNECTIONPROPERTIES,
+            PROP_EXCEPTION_SORTER,
+            PROP_EXCEPTION_SORTER_CLASS_NAME,
+            PROP_INIT,
+            PROP_NAME, //
 
-    private final static String[] ALL_PROPERTIES = {PROP_DEFAULTAUTOCOMMIT,
-            PROP_DEFAULTREADONLY, PROP_DEFAULTTRANSACTIONISOLATION, PROP_DEFAULTCATALOG, PROP_DRIVERCLASSNAME,
-            PROP_MAXACTIVE, PROP_MAXIDLE, PROP_MINIDLE, PROP_INITIALSIZE, PROP_MAXWAIT, PROP_TESTONBORROW,
-            PROP_TESTONRETURN, PROP_TIMEBETWEENEVICTIONRUNSMILLIS, PROP_NUMTESTSPEREVICTIONRUN,
-            PROP_MINEVICTABLEIDLETIMEMILLIS, PROP_TESTWHILEIDLE, PROP_PASSWORD, PROP_FILTERS, PROP_URL, PROP_USERNAME,
-            PROP_VALIDATIONQUERY, PROP_VALIDATIONQUERY_TIMEOUT, PROP_INITCONNECTIONSQLS,
-            PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, PROP_REMOVEABANDONED, PROP_REMOVEABANDONEDTIMEOUT,
-            PROP_LOGABANDONED, PROP_POOLPREPAREDSTATEMENTS, PROP_MAXOPENPREPAREDSTATEMENTS, PROP_CONNECTIONPROPERTIES,
-            PROP_EXCEPTION_SORTER, PROP_EXCEPTION_SORTER_CLASS_NAME, PROP_INIT, PROP_NAME, //
             "druid.timeBetweenLogStatsMillis", //
             "druid.stat.sql.MaxSize", //
             "druid.clearFiltersEnable", //
@@ -115,7 +140,7 @@ public class DruidDataSourceFactory implements ObjectFactory {
 
         if ((!"javax.sql.DataSource".equals(ref.getClassName())) //
                 && (!"com.alibaba.druid.pool.DruidDataSource".equals(ref.getClassName())) //
-                ) {
+        ) {
             return null;
         }