Merge "Clean up public interfaces"

7 files changed, 74 insertions, 74 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 2e1a6e95..f30212dc 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 7921fa5c..fdfb47bc 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 bc14fb8b..4cfcc731 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 0dea664d..b31de354 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 c17696a8..2fdde1ee 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);
 }
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
index 23911b68..19d985dd 100644
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicService.java
@@ -28,49 +28,49 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 
 public interface SvcLogicService {
 
-	public static final String NAME = "org.onap.ccsdk.sli.core.sli.provider.SvcLogicService";
+    String NAME = "org.onap.ccsdk.sli.core.sli.provider.SvcLogicService";
 
-	// public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx) throws SvcLogicException;
-	/**
-	 * Check for existence of a directed graph
-	 * @param module - module name
-	 * @param rpc - rpc name
-	 * @param version - version.  If null, looks for active version
-	 * @param mode - mode (sync/async)
-	 * @return true if directed graph found, false otherwise
-	 * @throws SvcLogicException
-	 */
-	public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
+    // public SvcLogicContext execute(SvcLogicGraph graph, SvcLogicContext ctx) throws SvcLogicException;
+    /**
+     * Check for existence of a directed graph
+     * @param module - module name
+     * @param rpc - rpc name
+     * @param version - version.  If null, looks for active version
+     * @param mode - mode (sync/async)
+     * @return true if directed graph found, false otherwise
+     * @throws SvcLogicException
+     */
+    boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException;
 
-	/**
-	 *  Execute a directed graph
-	 *
-	 * @param module - module name
-	 * @param rpc - rpc name
-	 * @param version - version.  If null, use active version
-	 * @param mode - mode (sync/async)
-	 * @param parms - parameters, used to set SvcLogicContext attributes
-	 * @return final values of attributes from SvcLogicContext, as Properties
-	 * @throws SvcLogicException
-	 *
-	 *
-	 *  @deprecated use execute(String module, String rpc, String version, String mode, DOMDataBroker dataBroker) instead
-	 */
-	@Deprecated
-	public Properties execute(String module, String rpc, String version, String mode, Properties parms) throws SvcLogicException;
+    /**
+     *  Execute a directed graph
+     *
+     * @param module - module name
+     * @param rpc - rpc name
+     * @param version - version.  If null, use active version
+     * @param mode - mode (sync/async)
+     * @param parms - parameters, used to set SvcLogicContext attributes
+     * @return final values of attributes from SvcLogicContext, as Properties
+     * @throws SvcLogicException
+     *
+     *
+     *  @deprecated use execute(String module, String rpc, String version, String mode, DOMDataBroker dataBroker) instead
+     */
+    @Deprecated
+    Properties execute(String module, String rpc, String version, String mode, Properties parms) throws SvcLogicException;
 
-	/**
-	 * Execute a directed graph
-	 *
-	 * @param module - module name
-	 * @param rpc - rpc name
-	 * @param version - version.  If null, use active version
-	 * @param mode - mode (sync/async)
-	 * @param parms - parameters, used to set SvcLogicContext attributes
-	 * @param domDataBroker - DOMDataBroker object
-	 * @return final values of attributes from SvcLogicContext, as Properties
-	 * @throws SvcLogicException
-	 */
-	public Properties execute(String module, String rpc, String version, String mode, Properties parms, DOMDataBroker domDataBroker) throws SvcLogicException;
+    /**
+     * Execute a directed graph
+     *
+     * @param module - module name
+     * @param rpc - rpc name
+     * @param version - version.  If null, use active version
+     * @param mode - mode (sync/async)
+     * @param parms - parameters, used to set SvcLogicContext attributes
+     * @param domDataBroker - DOMDataBroker object
+     * @return final values of attributes from SvcLogicContext, as Properties
+     * @throws SvcLogicException
+     */
+    Properties execute(String module, String rpc, String version, String mode, Properties parms, DOMDataBroker domDataBroker) throws SvcLogicException;
 
 }
diff --git a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java b/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java
index eaa92c3f..aa41a5c6 100644
--- a/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java
+++ b/sliPluginUtils/provider/src/main/java/org/onap/ccsdk/sli/core/slipluginutils/SvcLogicContextObject.java
@@ -24,5 +24,5 @@ package org.onap.ccsdk.sli.core.slipluginutils;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
 public interface SvcLogicContextObject {
-	public void writeToContext( SvcLogicContext ctx, String root );
+    void writeToContext(SvcLogicContext ctx, String root );
 }