No change - trim whitespace

Author: rbygrave

ebean-datasource-api/src/main/java/io/ebean/datasource/ConfigPropertiesHelper.java

@@ -5,12 +5,10 @@
 /**
  * Helper used to read Properties.
  */
-class ConfigPropertiesHelper {
+final class ConfigPropertiesHelper {
 
   private final Properties properties;
-
   private final String prefix;
-
   private final String poolName;
 
   /**
@@ -48,7 +46,6 @@ private String read(String key) {
    * </p>
    */
   String get(String key, String defaultValue) {
-
     String value = null;
     if (poolName != null && prefix != null) {
       value = read(prefix + "." + poolName + "." + key);

ebean-datasource-api/src/main/java/io/ebean/datasource/DSManager.java

@@ -6,12 +6,11 @@
 /**
  * Internal helper to obtain and hold the DataSourceFactory implementation.
  */
-class DSManager {
+final class DSManager {
 
-  private static DataSourceFactory factory = init();
+  private static final DataSourceFactory factory = init();
 
   private static DataSourceFactory init() {
-
     Iterator<DataSourceFactory> loader = ServiceLoader.load(DataSourceFactory.class).iterator();
     if (loader.hasNext()) {
       return loader.next();

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceConfig.java

@@ -15,88 +15,53 @@ public class DataSourceConfig {
   private static final String POSTGRES = "postgres";
 
   private InitDatabase initDatabase;
-
   private String readOnlyUrl;
-
   private String url;
-
   private String username;
-
   private String password;
-
   private String schema;
-
   /**
    * The name of the database platform (for use with ownerUsername and InitDatabase).
    */
   private String platform;
-
   /**
    * The optional database owner username (for running InitDatabase).
    */
   private String ownerUsername;
-
   /**
    * The optional database owner password (for running InitDatabase).
    */
   private String ownerPassword;
-
   private String driver;
-
   private int minConnections = 2;
-
   private int maxConnections = 200;
-
   private int isolationLevel = Connection.TRANSACTION_READ_COMMITTED;
-
   private boolean autoCommit;
-
   private boolean readOnly;
-
   private String heartbeatSql;
-
   private int heartbeatFreqSecs = 30;
-
   private int heartbeatTimeoutSeconds = 3;
-
   private boolean captureStackTrace;
-
   private int maxStackTraceSize = 5;
-
   private int leakTimeMinutes = 30;
-
   private int maxInactiveTimeSecs = 300;
-
   private int maxAgeMinutes = 0;
-
   private int trimPoolFreqSecs = 59;
-
   private int pstmtCacheSize = 50;
-
   private int cstmtCacheSize = 20;
-
   private int waitTimeoutMillis = 1000;
-
   private String poolListener;
-
   private boolean offline;
-
   private boolean failOnStart = true;
-
   private Map<String, String> customProperties;
-
   private List<String> initSql;
-
-
   private DataSourceAlert alert;
-
   private DataSourcePoolListener listener;
 
   /**
    * Return a copy of the DataSourceConfig.
    */
   public DataSourceConfig copy() {
-
     DataSourceConfig copy = new DataSourceConfig();
     copy.initDatabase = initDatabase;
     copy.url = url;
@@ -134,7 +99,6 @@ public DataSourceConfig copy() {
     copy.initSql = initSql;
     copy.alert = alert;
     copy.listener = listener;
-
     return copy;
   }
 
@@ -831,7 +795,6 @@ public DataSourceConfig loadSettings(Properties properties, String serverName) {
    * Load the settings from the PropertiesWrapper.
    */
   private void loadSettings(ConfigPropertiesHelper properties) {
-
     username = properties.get("username", username);
     password = properties.get("password", password);
     schema = properties.get("schema", schema);
@@ -841,7 +804,6 @@ private void loadSettings(ConfigPropertiesHelper properties) {
     if (initDatabase == null && platform != null) {
       setInitDatabaseForPlatform(platform);
     }
-
     driver = properties.get("driver", properties.get("databaseDriver", driver));
     readOnlyUrl = properties.get("readOnlyUrl", readOnlyUrl);
     url = properties.get("url", properties.get("databaseUrl", url));
@@ -853,22 +815,18 @@ private void loadSettings(ConfigPropertiesHelper properties) {
     maxInactiveTimeSecs = properties.getInt("maxInactiveTimeSecs", maxInactiveTimeSecs);
     trimPoolFreqSecs = properties.getInt("trimPoolFreqSecs", trimPoolFreqSecs);
     maxAgeMinutes = properties.getInt("maxAgeMinutes", maxAgeMinutes);
-
     minConnections = properties.getInt("minConnections", minConnections);
     maxConnections = properties.getInt("maxConnections", maxConnections);
     pstmtCacheSize = properties.getInt("pstmtCacheSize", pstmtCacheSize);
     cstmtCacheSize = properties.getInt("cstmtCacheSize", cstmtCacheSize);
-
     waitTimeoutMillis = properties.getInt("waitTimeout", waitTimeoutMillis);
-
     heartbeatSql = properties.get("heartbeatSql", heartbeatSql);
     heartbeatTimeoutSeconds = properties.getInt("heartbeatTimeoutSeconds", heartbeatTimeoutSeconds);
     poolListener = properties.get("poolListener", poolListener);
     offline = properties.getBoolean("offline", offline);
 
     String isoLevel = properties.get("isolationLevel", getTransactionIsolationLevel(isolationLevel));
     this.isolationLevel = getTransactionIsolationLevel(isoLevel);
-
     this.initSql = parseSql(properties.get("initSql", null));
     this.failOnStart = properties.getBoolean("failOnStart", failOnStart);
 
@@ -893,7 +851,6 @@ private List<String> parseSql(String sql) {
   }
 
   Map<String, String> parseCustom(String customProperties) {
-
     Map<String, String> propertyMap = new LinkedHashMap<String, String>();
     String[] pairs = customProperties.split(";");
     for (String pair : pairs) {

ebean-datasource-api/src/main/java/io/ebean/datasource/PostgresInitDatabase.java

@@ -16,10 +16,8 @@ public class PostgresInitDatabase implements InitDatabase {
 
   @Override
   public void run(Connection connection, DataSourceConfig config) throws SQLException {
-
     String username = config.getUsername();
     String password = config.getPassword();
-
     log.info("Creating schema and role for {}", username);
     execute(connection, String.format("create schema if not exists %s", username));
     execute(connection, String.format("create role %s with login password '%s'", username, password));

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionPool.java

@@ -301,7 +301,7 @@ public SQLException getDataSourceDownReason() {
   /**
    * Called when the pool hits the warning level.
    */
-  protected void notifyWarning(String msg) {
+  void notifyWarning(String msg) {
     if (inWarningMode.compareAndSet(false, true)) {
       // send an Error to the event log...
       logger.warn(msg);