Merge "Remove un-used set functions"

2 files changed, 5 insertions, 29 deletions

diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java
index e95cd16f..96dc3ba7 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/msb/MsbDetails.java
@@ -25,33 +25,6 @@ public class MsbDetails
     
     public MsbServer getDefaultServer() {
         return defaultServer;
-    }
-    public void setDefaultServer(MsbServer defaultServer) {
-        this.defaultServer = defaultServer;
-    }
-    public String getConnectTimeout() {
-        return ConnectTimeout;
-    }
-    public void setConnectTimeout(String connectTimeout) {
-        ConnectTimeout = connectTimeout;
-    }
-    public String getThread() {
-        return thread;
-    }
-    public void setThread(String thread) {
-        this.thread = thread;
-    }
-    public String getIdletimeout() {
-        return idletimeout;
-    }
-    public void setIdletimeout(String idletimeout) {
-        this.idletimeout = idletimeout;
-    }
-    public String getTimeout() {
-        return timeout;
-    }
-    public void setTimeout(String timeout) {
-        this.timeout = timeout;
-    }
+    }  
 
 }
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
index 1bf68a8a..12812006 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
@@ -59,6 +59,7 @@ import org.onap.vnfsdk.marketplace.entity.response.CsarFileUriResponse;
 import org.onap.vnfsdk.marketplace.entity.response.PackageMeta;
 import org.onap.vnfsdk.marketplace.entity.response.PackageResponse;
 import org.onap.vnfsdk.marketplace.filemanage.http.HttpFileManagerImpl;
+import org.onap.vnfsdk.marketplace.msb.MsbDetailsHolder;
 import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoardingResult;
 import org.onap.vnfsdk.marketplace.onboarding.entity.OnBoradingRequest;
 import org.onap.vnfsdk.marketplace.onboarding.entity.ResultKey;
@@ -740,6 +741,7 @@ public class PackageResourceTest {
         if(ins != null) {
             try {
                 result = PackageWrapper.getInstance().uploadPackage(ins, fileDetail, null, null);
+                PackageWrapper.getInstance().updateValidateStatus(ins);
             } catch(Exception e3) {
                 e3.printStackTrace();
             }
@@ -1076,8 +1078,9 @@ public class PackageResourceTest {
     public void testPkgFormat() {
         assertNotNull(PackageWrapperUtil.getPackageFormat("xml"));
         assertNotNull(PackageWrapperUtil.getPackageFormat("yml"));
-        assertNull(PackageWrapperUtil.getPackageFormat("pdf"));
+        assertNull(PackageWrapperUtil.getPackageFormat("pdf"));        
 
+        MsbDetailsHolder.getMsbDetails();
         try {
             IMarketplaceDao dao = new MarketplaceDaoImpl();