Merging in bug fixes

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

2 files changed, 2 insertions, 19 deletions

diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
index 2dad318c6..92adefe55 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java
@@ -24,9 +24,6 @@
 
 package org.openecomp.appc.licmgr;
 
-import java.util.Map;
-
-import org.openecomp.appc.licmgr.LicenseManager;
 import org.openecomp.appc.licmgr.exception.DataAccessException;
 import org.openecomp.appc.licmgr.objects.LicenseModel;
 
@@ -44,15 +41,6 @@ public class LicenseManagerMock implements LicenseManager {
         }
     }
 
-    @Override public Map<String, String> retrieveLicenseModelData(String vnfType, String vnfVersion, String... fields)
-                    throws DataAccessException {
-        return null;
-    }
-
-    @Override public void storeArtifactPayload(Map<String, String> parameters) throws RuntimeException {
-
-    }
-
     public void storeLicenseModel(LicenseModel licenseModel){
         this.licenseModel = licenseModel;
 
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
index c930807b2..ec44e7cdf 100644
--- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
+++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java
@@ -23,12 +23,10 @@
  */
 
 package org.openecomp.appc.licmgr;
-import java.util.HashMap;
-import java.util.Map;
 
-import org.openecomp.appc.licmgr.LicenseDataAccessService;
 import org.openecomp.appc.licmgr.exception.DataAccessException;
-import org.openecomp.sdnc.sli.resource.dblib.DbLibService;
+import java.util.HashMap;
+import java.util.Map;
 
 class LicenseServiceMock implements LicenseDataAccessService {
 
@@ -52,7 +50,4 @@ class LicenseServiceMock implements LicenseDataAccessService {
         return null;
     }
 
-    @Override
-    public void storeArtifactPayload(Map<String, String> parameters) throws DataAccessException {
-    }
 }