Merging in bug fixes

Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-100

3 files changed, 3 insertions, 28 deletions

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
index c3b098f46..dc255cd57 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/Constants.java
@@ -55,7 +55,7 @@ public class Constants {
     public static final String REQUEST_ID_FIELD_NAME = "REQUEST_ID";
     public static final String CREATION_DATE_FIELD_NAME = "CREATION_DATE";
     public static final String LOG_FIELD_NAME = "LOG";
-    public static final String ASDC_ARTIFACTS_TABLE_NAME = "ASDC_ARTIFACTS";
+    public static final String ASDC_ARTIFACTS = "ASDC_ARTIFACTS";
 
     // input fields names
     public static final String PAYLOAD = "payload";
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
index 1c3d55ccb..0f14b2ee6 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseDataAccessService.java
@@ -24,10 +24,9 @@
 
 package org.openecomp.appc.licmgr;
 
-import java.util.Map;
-
 import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+
+import java.util.Map;
 
 
 @SuppressWarnings("JavaDoc")
@@ -48,10 +47,4 @@ public interface LicenseDataAccessService {
      */
     Map<String,String> retrieveLicenseModelData(String vnfType, String vnfVersion, String... fields) throws DataAccessException;
 
-    /**
-     *
-     * @param parameters parameters to store in artifacts table
-     * @throws RuntimeException
-     */
-    void storeArtifactPayload(Map<String, String> parameters) throws RuntimeException;
 }
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
index ba874b21c..144cfb633 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-api/src/main/java/org/openecomp/appc/licmgr/LicenseManager.java
@@ -24,8 +24,6 @@
 
 package org.openecomp.appc.licmgr;
 
-import java.util.Map;
-
 import org.openecomp.appc.licmgr.exception.DataAccessException;
 import org.openecomp.appc.licmgr.objects.LicenseModel;
 
@@ -42,21 +40,5 @@ public interface LicenseManager {
      */
     LicenseModel retrieveLicenseModel(String vnfType, String vnfVersion) throws DataAccessException;
 
-    /**
-     *
-     * @param vnfType resource name
-     * @param vnfVersion resource version
-     * @return map contains requested fields as Strings
-     * @throws RuntimeException
-     */
-    Map<String,String> retrieveLicenseModelData(String vnfType, String vnfVersion, String... fields) throws
-                    DataAccessException;
-
-    /**
-     *
-     * @param parameters parameters to store in artifacts table
-     * @throws RuntimeException
-     */
-    void storeArtifactPayload(Map<String, String> parameters) throws RuntimeException;
 
 }