From e69c6e3320f27d31d6dcd86a1ab40960758b59cb Mon Sep 17 00:00:00 2001
From: Rich Tabedzki <richard.tabedzki@att.com>
Date: Fri, 2 Mar 2018 04:42:45 +0000
Subject: Updated master database detection algorithm

Changes made:
* updated algorithm in DBResourceManager
* Updated CachedDataSource, JdbcDBCachedDataSource
* added new unit tests

Change-Id: I4f6bbeb3839f55d183d7e762743fbc9171b63b1a
Issue-ID: CCSDK-192
Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
---
 .../core/dblib/TerminatingCachedDataSource.java    | 120 ++++++++++-----------
 1 file changed, 60 insertions(+), 60 deletions(-)
 mode change 100644 => 100755 dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java

(limited to 'dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java')

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java
old mode 100644
new mode 100755
index b4d1ef67..92b31470
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/TerminatingCachedDataSource.java
@@ -22,71 +22,71 @@ package org.onap.ccsdk.sli.core.dblib;
 
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.logging.Logger;
-
+import javax.sql.DataSource;
 import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
 import org.onap.ccsdk.sli.core.dblib.pm.SQLExecutionMonitorObserver;
 
 
 public class TerminatingCachedDataSource extends CachedDataSource implements SQLExecutionMonitorObserver {
 
-	public TerminatingCachedDataSource(BaseDBConfiguration jdbcElem) throws DBConfigException {
-		super(jdbcElem);
-	}
-
-	@Override
-	protected void configure(BaseDBConfiguration jdbcElem) throws DBConfigException {
-		// no action
-	}
-
-	@Override
-	public long getInterval() {
-		return 1000;
-	}
-
-	@Override
-	public long getInitialDelay() {
-		return 1000;
-	}
-
-	@Override
-	public long getExpectedCompletionTime() {
-		return 50;
-	}
-
-	@Override
-	public void setExpectedCompletionTime(long value) {
-		
-	}
-
-	@Override
-	public void setInterval(long value) {
-		
-	}
-
-	@Override
-	public void setInitialDelay(long value) {
-		
-	}
-
-	@Override
-	public long getUnprocessedFailoverThreshold() {
-		return 3;
-	}
-
-	@Override
-	public void setUnprocessedFailoverThreshold(long value) {
-		
-	}
-	
-	public int compareTo(CachedDataSource ods)
-	{
-		return 0;
-	}
-
-	@Override
-	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
-		// TODO Auto-generated method stub
-		return null;
-	}
+    public TerminatingCachedDataSource(BaseDBConfiguration jdbcElem) throws DBConfigException {
+        super(jdbcElem);
+    }
+
+    @Override
+    protected DataSource configure(BaseDBConfiguration jdbcElem) throws DBConfigException {
+        return null;
+    }
+
+    @Override
+    public long getInterval() {
+        return 1000;
+    }
+
+    @Override
+    public long getInitialDelay() {
+        return 1000;
+    }
+
+    @Override
+    public long getExpectedCompletionTime() {
+        return 50;
+    }
+
+    @Override
+    public void setExpectedCompletionTime(long value) {
+
+    }
+
+    @Override
+    public void setInterval(long value) {
+
+    }
+
+    @Override
+    public void setInitialDelay(long value) {
+
+    }
+
+    @Override
+    public long getUnprocessedFailoverThreshold() {
+        return 3;
+    }
+
+    @Override
+    public void setUnprocessedFailoverThreshold(long value) {
+
+    }
+
+    public int compareTo(CachedDataSource ods)
+    {
+        return 0;
+    }
+
+    @Override
+    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+        // TODO Auto-generated method stub
+        return null;
+    }
 
 }
-- 
cgit 1.2.3-korg