1 files changed, 137 insertions, 141 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OnboardingClient.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OnboardingClient.java
index 7d299c85d1..8e1ee19358 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OnboardingClient.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/operations/impl/OnboardingClient.java
@@ -20,13 +20,7 @@
 
 package org.openecomp.sdc.be.model.operations.impl;
 
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.util.Map;
-import java.util.Properties;
-
+import fj.data.Either;
 import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.apache.http.HttpStatus;
 import org.openecomp.sdc.be.config.Configuration.OnboardingConfig;
@@ -35,155 +29,157 @@ import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.common.api.Constants;
 import org.openecomp.sdc.common.http.client.api.HttpRequest;
 import org.openecomp.sdc.common.http.client.api.HttpResponse;
+import org.openecomp.sdc.common.log.wrappers.Logger;
 import org.openecomp.sdc.common.util.ZipUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-import fj.data.Either;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Map;
+import java.util.Properties;
 
 @org.springframework.stereotype.Component("onboarding-client")
 public class OnboardingClient {
 
-	private static Logger log = LoggerFactory.getLogger(OnboardingClient.class.getName());
-
-	private static Properties downloadCsarHeaders = new Properties();
-
-	static {
-		downloadCsarHeaders.put("Accept", "application/octet-stream");
-	}
-
-	public OnboardingClient() {
-		super();
-	}
-
-	public static void main(String[] args) {
-
-		OnboardingClient csarOperation = new OnboardingClient();
-
-		String csarUuid = "70025CF6081B489CA7B1CBA583D5278D";
-		Either<Map<String, byte[]>, StorageOperationStatus> csar = csarOperation.getCsar(csarUuid, null);
-		System.out.println(csar.left().value());
-
-	}
-
-	public Either<Map<String, byte[]>, StorageOperationStatus> getMockCsar(String csarUuid) {
-		File dir = new File("/var/tmp/mockCsar");
-		FileFilter fileFilter = new WildcardFileFilter("*.csar");
-		File[] files = dir.listFiles(fileFilter);
-		for (int i = 0; i < files.length; i++) {
-			File csar = files[i];
-			if (csar.getName().startsWith(csarUuid)) {
-				log.debug("Found CSAR file {} matching the passed csarUuid {}", csar.getAbsolutePath(), csarUuid);
-				byte[] data;
-				try {
-					data = Files.readAllBytes(csar.toPath());
-				} catch (IOException e) {
-					log.debug("Error reading mock file for CSAR, error: {}", e);
-					return Either.right(StorageOperationStatus.NOT_FOUND);
-				}
-				Map<String, byte[]> readZip = ZipUtil.readZip(data);
-				return Either.left(readZip);
-			}
-		}
-		log.debug("Couldn't find mock file for CSAR starting with {}", csarUuid);
-		return Either.right(StorageOperationStatus.NOT_FOUND);
-	}
-
-	public Either<Map<String, byte[]>, StorageOperationStatus> getCsar(String csarUuid, String userId) {
-		String url = buildDownloadCsarUrl() + "/" + csarUuid;
-
-		Properties headers = new Properties();
-		if (downloadCsarHeaders != null) {
-			downloadCsarHeaders.forEach((k, v) -> headers.put(k, v));
-		}
-
-		if (userId != null) {
-			headers.put(Constants.USER_ID_HEADER, userId);
-		}
-
-		log.debug("Url for downloading csar is {}. Headers are {}", url, headers);
-
-		try {
-    		HttpResponse<byte []> httpResponse = HttpRequest.getAsByteArray(url, headers);
-    		log.debug("After fetching csar {}. Http return code is {}", csarUuid, httpResponse.getStatusCode());
-    
-    		switch (httpResponse.getStatusCode()) {
-    		case HttpStatus.SC_OK:
-    			byte[] data = httpResponse.getResponse();
-    			if (data != null && data.length > 0) {
-    				Map<String, byte[]> readZip = ZipUtil.readZip(data);
-    				return Either.left(readZip);
-    			} else {
-    				log.debug("Data received from rest is null or empty");
-    				return Either.right(StorageOperationStatus.NOT_FOUND);
-    			}
-    
-    		case HttpStatus.SC_NOT_FOUND:
-    			return Either.right(StorageOperationStatus.CSAR_NOT_FOUND);
-    
-    		default:
-    			return Either.right(StorageOperationStatus.GENERAL_ERROR);
-    		}
-		}
-		catch(Exception e) {
-		    log.debug("Request failed with exception {}", e);
-		    return Either.right(StorageOperationStatus.GENERAL_ERROR);
-		}
-	}
-	
-	public Either<String, StorageOperationStatus> getPackages(String userId) {
-		String url = buildDownloadCsarUrl();
-
-		Properties headers = new Properties();
-		headers.put("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
-
-		if (userId != null) {
-			headers.put(Constants.USER_ID_HEADER, userId);
-		}
-
-		log.debug("Url for downloading packages is {}. Headers are {}", url, headers);
-
-		try {
-    		HttpResponse<String> httpResposne = HttpRequest.get(url, headers);
-    		log.debug("After fetching packages. Http return code is {}", httpResposne.getStatusCode());
+    private static final Logger log = Logger.getLogger(OnboardingClient.class.getName());
+
+    private static Properties downloadCsarHeaders = new Properties();
+
+    static {
+        downloadCsarHeaders.put("Accept", "application/octet-stream");
+    }
+
+    public OnboardingClient() {
+        super();
+    }
+
+    public static void main(String[] args) {
+
+        OnboardingClient csarOperation = new OnboardingClient();
+
+        String csarUuid = "70025CF6081B489CA7B1CBA583D5278D";
+        Either<Map<String, byte[]>, StorageOperationStatus> csar = csarOperation.getCsar(csarUuid, null);
+        System.out.println(csar.left().value());
+
+    }
+
+    public Either<Map<String, byte[]>, StorageOperationStatus> getMockCsar(String csarUuid) {
+        File dir = new File("/var/tmp/mockCsar");
+        FileFilter fileFilter = new WildcardFileFilter("*.csar");
+        File[] files = dir.listFiles(fileFilter);
+        for (int i = 0; i < files.length; i++) {
+            File csar = files[i];
+            if (csar.getName().startsWith(csarUuid)) {
+                log.debug("Found CSAR file {} matching the passed csarUuid {}", csar.getAbsolutePath(), csarUuid);
+                byte[] data;
+                try {
+                    data = Files.readAllBytes(csar.toPath());
+                } catch (IOException e) {
+                    log.debug("Error reading mock file for CSAR, error: {}", e);
+                    return Either.right(StorageOperationStatus.NOT_FOUND);
+                }
+                Map<String, byte[]> readZip = ZipUtil.readZip(data);
+                return Either.left(readZip);
+            }
+        }
+        log.debug("Couldn't find mock file for CSAR starting with {}", csarUuid);
+        return Either.right(StorageOperationStatus.NOT_FOUND);
+    }
+
+    public Either<Map<String, byte[]>, StorageOperationStatus> getCsar(String csarUuid, String userId) {
+        String url = buildDownloadCsarUrl() + "/" + csarUuid;
+
+        Properties headers = new Properties();
+        if (downloadCsarHeaders != null) {
+            downloadCsarHeaders.forEach(headers::put);
+        }
+
+        if (userId != null) {
+            headers.put(Constants.USER_ID_HEADER, userId);
+        }
+
+        log.debug("Url for downloading csar is {}. Headers are {}", url, headers);
+
+        try {
+            HttpResponse<byte []> httpResponse = HttpRequest.getAsByteArray(url, headers);
+            log.debug("After fetching csar {}. Http return code is {}", csarUuid, httpResponse.getStatusCode());
     
-    		switch (httpResposne.getStatusCode()) {
-    		case HttpStatus.SC_OK:
-    			String data = httpResposne.getResponse();
-    			return Either.left(data);
+            switch (httpResponse.getStatusCode()) {
+            case HttpStatus.SC_OK:
+                byte[] data = httpResponse.getResponse();
+                if (data != null && data.length > 0) {
+                    Map<String, byte[]> readZip = ZipUtil.readZip(data);
+                    return Either.left(readZip);
+                } else {
+                    log.debug("Data received from rest is null or empty");
+                    return Either.right(StorageOperationStatus.NOT_FOUND);
+                }
     
-    		case HttpStatus.SC_NOT_FOUND:
-    			return Either.right(StorageOperationStatus.CSAR_NOT_FOUND);
+            case HttpStatus.SC_NOT_FOUND:
+                return Either.right(StorageOperationStatus.CSAR_NOT_FOUND);
     
-    		default:
-    			return Either.right(StorageOperationStatus.GENERAL_ERROR);
-    		}
-		}
-		catch(Exception e) {
+            default:
+                return Either.right(StorageOperationStatus.GENERAL_ERROR);
+            }
+        }
+        catch(Exception e) {
             log.debug("Request failed with exception {}", e);
             return Either.right(StorageOperationStatus.GENERAL_ERROR);
-		}
-	}
+        }
+    }
 
-	/**
-	 * Build the url for download CSAR
-	 * 
-	 * E.g., http://0.0.0.0:8181/onboarding-api/v1.0/vendor-software-products/packages/
-	 * 
-	 * @return
-	 */
-	public String buildDownloadCsarUrl() {
+    public Either<String, StorageOperationStatus> getPackages(String userId) {
+        String url = buildDownloadCsarUrl();
 
-		OnboardingConfig onboardingConfig = ConfigurationManager.getConfigurationManager().getConfiguration().getOnboarding();
+        Properties headers = new Properties();
+        headers.put("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8");
 
-		String protocol = onboardingConfig.getProtocol();
-		String host = onboardingConfig.getHost();
-		Integer port = onboardingConfig.getPort();
-		String uri = onboardingConfig.getDownloadCsarUri();
+        if (userId != null) {
+            headers.put(Constants.USER_ID_HEADER, userId);
+        }
 
-		String getCsarUrl = protocol + "://" + host + ":" + port + uri;
+        log.debug("Url for downloading packages is {}. Headers are {}", url, headers);
 
-		return getCsarUrl;
-	}
+        try {
+            HttpResponse<String> httpResposne = HttpRequest.get(url, headers);
+            log.debug("After fetching packages. Http return code is {}", httpResposne.getStatusCode());
+    
+            switch (httpResposne.getStatusCode()) {
+            case HttpStatus.SC_OK:
+                String data = httpResposne.getResponse();
+                return Either.left(data);
+    
+            case HttpStatus.SC_NOT_FOUND:
+                return Either.right(StorageOperationStatus.CSAR_NOT_FOUND);
+    
+            default:
+                return Either.right(StorageOperationStatus.GENERAL_ERROR);
+            }
+        }
+        catch(Exception e) {
+            log.debug("Request failed with exception {}", e);
+            return Either.right(StorageOperationStatus.GENERAL_ERROR);
+        }
+    }
+
+    /**
+     * Build the url for download CSAR
+     *
+     * E.g., http://0.0.0.0:8181/onboarding-api/v1.0/vendor-software-products/packages/
+     *
+     * @return
+     */
+    public String buildDownloadCsarUrl() {
+
+        OnboardingConfig onboardingConfig = ConfigurationManager.getConfigurationManager().getConfiguration().getOnboarding();
+
+        String protocol = onboardingConfig.getProtocol();
+        String host = onboardingConfig.getHost();
+        Integer port = onboardingConfig.getPort();
+        String uri = onboardingConfig.getDownloadCsarUri();
+
+        return protocol + "://" + host + ":" + port + uri;
+    }
 
 }