Merge "Clean up public interfaces"

5 files changed, 32 insertions, 32 deletions

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java
index 2e1a6e953..f30212dca 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceObserver.java
@@ -23,5 +23,5 @@ package org.onap.ccsdk.sli.core.dblib;
 import java.util.Observer;
 
 public interface DBResourceObserver extends Observer {
-	public boolean isMonitorDbResponse();
+    boolean isMonitorDbResponse();
 }
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java
index 7921fa5c5..fdfb47bca 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataAccessor.java
@@ -27,7 +27,7 @@ import javax.sql.rowset.CachedRowSet;
 
 public interface DataAccessor {
 
-	public abstract CachedRowSet getData(String statement, ArrayList<String> arguments, String preferredDS)
-			throws SQLException;
+    CachedRowSet getData(String statement, ArrayList<String> arguments, String preferredDS)
+            throws SQLException;
 
 }
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java
index bc14fb8b9..4cfcc7318 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DataSourceComparator.java
@@ -24,10 +24,10 @@ import java.util.Comparator;
 
 public interface DataSourceComparator extends Comparator <CachedDataSource>{
 
-	public abstract CachedDataSource getLastUsed();
+    CachedDataSource getLastUsed();
 
-	public abstract void setLastUsed(CachedDataSource lastUsed);
+    void setLastUsed(CachedDataSource lastUsed);
 
-	public abstract int compare(CachedDataSource ds1, CachedDataSource ds2);
+    int compare(CachedDataSource ds1, CachedDataSource ds2);
 
 }
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java
index 0dea664d5..b31de3547 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DbLibService.java
@@ -28,22 +28,22 @@ import javax.sql.rowset.CachedRowSet;
 
 public interface DbLibService {
 
-	/* (non-Javadoc)
-	 * @see DataAccessor#getData(java.lang.String, java.util.ArrayList)
-	 */
-	public abstract CachedRowSet getData(String statement,
-			ArrayList<String> arguments, String preferredDS)
-			throws SQLException;
-
-	/* (non-Javadoc)
-	 * @see DataAccessor#writeData(java.lang.String, java.util.ArrayList)
-	 */
-	public abstract boolean writeData(String statement,
-			ArrayList<String> arguments, String preferredDS)
-			throws SQLException;
-
-	public abstract boolean isActive();
-
-	public abstract Connection getConnection() throws SQLException;
+    /* (non-Javadoc)
+     * @see DataAccessor#getData(java.lang.String, java.util.ArrayList)
+     */
+    CachedRowSet getData(String statement,
+            ArrayList<String> arguments, String preferredDS)
+            throws SQLException;
+
+    /* (non-Javadoc)
+     * @see DataAccessor#writeData(java.lang.String, java.util.ArrayList)
+     */
+    boolean writeData(String statement,
+            ArrayList<String> arguments, String preferredDS)
+            throws SQLException;
+
+    boolean isActive();
+
+    Connection getConnection() throws SQLException;
 
 }
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java
index c17696a80..2fdde1ee4 100644
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/pm/SQLExecutionMonitorObserver.java
@@ -21,17 +21,17 @@
 package org.onap.ccsdk.sli.core.dblib.pm;
 
 public interface SQLExecutionMonitorObserver {
-	public String getDbConnectionName();
+    String getDbConnectionName();
 
-	public long getInterval();
-	public void setInterval(long value);
+    long getInterval();
+    void setInterval(long value);
 
-	public long getInitialDelay();
-	public void setInitialDelay(long value);
+    long getInitialDelay();
+    void setInitialDelay(long value);
 
-	public long getExpectedCompletionTime();
-	public void setExpectedCompletionTime(long value);
+    long getExpectedCompletionTime();
+    void setExpectedCompletionTime(long value);
 
-	public long getUnprocessedFailoverThreshold();
-	public void setUnprocessedFailoverThreshold(long value);
+    long getUnprocessedFailoverThreshold();
+    void setUnprocessedFailoverThreshold(long value);
 }