// Cannot create instance of the class
}
- public static class functionTest {
+ public static class FunctionTest {
public static final String FUNCTEST_URL = "/onapapi/vnfsdk/v1/functest/";
public static final String FUNCTEST_EXEC = "functestexec";
- private functionTest() {
+ private FunctionTest() {
}
}
}
try {
- if (false == ifs.getFD().valid()) {
+ if (!ifs.getFD().valid()) {
logger.error("File descriptor is not valid");
return false;
}
import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
-import com.google.gson.JsonElement;
+
/**
* common utility class.
* @return boolean
*/
public static boolean isYamlFile(File file) {
- if(!file.isDirectory() && file.getName().indexOf(".yaml") != -1) {
- return true;
- }
- return false;
+ return !file.isDirectory() && file.getName().indexOf(".yaml") != -1;
}
/**
package org.onap.vnfsdk.marketplace.db.common;
public enum Parameters {
- oid, name, provider, version, deletionPending,
- type, status, csarId, vendor, serviceTemplateId,
- nodeTemplateId, mappingId, nodeType;
+ OID, NAME, PROVIDER, VERSION, DELETIONPENDING,
+ TYPE, STATUS, CSARID, VENDOR, SERVICETEMPLATEID,
+ NODETEMPLATEID, MAPPINGID, NODETYPE;
}
private SqlSessionFactory sqlSessionFactory = null;
+ private static final String EXCEPTION = "Exception caught {}";
+
/**
*
* Constructor<br/>
csars = mapper.getAllPackageData();
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);
+ LOGGER.error(EXCEPTION, e);
} finally {
session.close();
}
csars = mapper.getPackageDataSubset(paramsMap);
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);
+ LOGGER.error(EXCEPTION, e);
} finally {
session.close();
}
mapper.savePackageData(lPackageData);
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);
+ LOGGER.error(EXCEPTION, e);
} finally {
session.close();
}
csars = mapper.getPackageData(csarId);
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);
+ LOGGER.error(EXCEPTION, e);
} finally {
session.close();
}
mapper.deletePackageData(csarId);
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);;
+ LOGGER.error(EXCEPTION, e);;
} finally {
session.close();
}
mapper.updatePackageData(oPackageData);
session.commit();
} catch(PersistenceException e) {
- LOGGER.error("Exception caught {}", e);
+ LOGGER.error(EXCEPTION, e);
} finally {
session.close();
}
*/
package org.onap.vnfsdk.marketplace.db.resource;
-import java.util.ArrayList;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
return manager;
}
- private PackageManager() {}
-
/**
+ * private PackageManager() {}
+
* add package.
* @param packageData package data
* @return PackageData
+ version + " type:" + type);
Map<String, String> queryParam = new HashMap<>();
if (MarketplaceDbUtil.isNotEmpty(name)) {
- queryParam.put(Parameters.name.name(), name);
+ queryParam.put(Parameters.NAME.name(), name);
}
if (MarketplaceDbUtil.isNotEmpty(version)) {
- queryParam.put(Parameters.version.name(), version);
+ queryParam.put(Parameters.VERSION.name(), version);
}
if (MarketplaceDbUtil.isNotEmpty(deletionPending)) {
- queryParam.put(Parameters.deletionPending.name(), deletionPending);
+ queryParam.put(Parameters.DELETIONPENDING.name(), deletionPending);
}
if (MarketplaceDbUtil.isNotEmpty(type)) {
- queryParam.put(Parameters.type.name(), type);
+ queryParam.put(Parameters.TYPE.name(), type);
}
if (MarketplaceDbUtil.isNotEmpty(provider)) {
- queryParam.put(Parameters.provider.name(), provider);
+ queryParam.put(Parameters.PROVIDER.name(), provider);
}
List<PackageData> data = handler.query(queryParam);
LOGGER.info("query package info end.size:" + data.size() + "detail:"
package org.onap.vnfsdk.marketplace.entity;
public enum EnumOnboardState {
- onBoarded("onBoarded"), nonOnBoarded("non-onBoarded");
+ ONBOARDED("onBoarded"), NONONBOARDED("non-onBoarded");
String value;
package org.onap.vnfsdk.marketplace.entity;
public enum EnumOperationalState {
- Enabled, Disabled
+ ENABLED, DISABLED
}
package org.onap.vnfsdk.marketplace.entity;
public enum EnumProcessState {
- normal, onBoarding, onBoardFailed, deleting, deleteFailed
+ NORMAL, ONBOARDING, ONBOARDFAILED, DELETING, DELETEFAILED
}
package org.onap.vnfsdk.marketplace.entity;
public enum EnumUsageState {
- InUse, NotInUse
+ INUSE, NOTINUSE
}
private String version;
private String provider;
private String vnfd;
- private EnumOperationalState operationalState = EnumOperationalState.Disabled;
- private EnumUsageState usageState = EnumUsageState.InUse;
+ private EnumOperationalState operationalState = EnumOperationalState.DISABLED;
+ private EnumUsageState usageState = EnumUsageState.INUSE;
private String deletionPending;
private String vnfPackageUrl;
public class PackageBasicInfo {
+ private String provider;
+
+ private EnumType type;
+
+ private String version;
+
+ private String format;
+
public String getProvider() {
return provider;
}
this.format = format;
}
- private String provider;
-
- private EnumType type;
- private String version;
-
- private String format;
}
public class CsarFileUriResponse {
+ private String downloadUri;
+
+ private String localPath;
+
public String getDownloadUri() {
return downloadUri;
}
this.localPath = localPath;
}
- private String downloadUri;
-
- private String localPath;
}
public class FileManagerFactory {
+ private static final Logger logger = LoggerFactory.getLogger(FileManagerFactory.class);
+
private FileManagerFactory() {
}
- private static final Logger logger = LoggerFactory.getLogger(FileManagerFactory.class);
-
private static FileManager getHttpFileManager() {
return new HttpFileManagerImpl();
}
*/
public static FileManager createFileManager() {
switch (getType()) {
- case http:
+ case HTTP:
return getHttpFileManager();
- case ftp:
+ case FTP:
return null;
default:
return getHttpFileManager();
String type = System.getenv("useFtp");
logger.info("read environment varibale uesFtp:" + type);
if ((type != null) && "true".equals(type)) {
- return FileManagerType.ftp;
+ return FileManagerType.FTP;
} else {
- return FileManagerType.http;
+ return FileManagerType.HTTP;
}
}
}
package org.onap.vnfsdk.marketplace.filemanage;
public enum FileManagerType {
- ftp, http;
+ FTP, HTTP;
public static FileManagerType getType(String type) {
return valueOf(type);
}
public class MsbDetails
{
private MsbServer defaultServer;
- private String ConnectTimeout;
+ private String connectTimeout;
private String thread;
private String idletimeout;
private String timeout;
logger.info("Package file path Function test:" + packagePath);
// Validate package path
- if (false == FileUtil.validatePath(packagePath)) {
+ if (!FileUtil.validatePath(packagePath)) {
logger.error("Failed to validate path");
return funcTestId;
}
InputStream inStream = new BufferedInputStream(ifs);) {
// Validate input stream
- if (false == FileUtil.validateStream(ifs)) {
+ if (!FileUtil.validateStream(ifs)) {
logger.error("Failed to validate file stream");
return funcTestId;
}
// IP and Port needs to be configured !!!
RestResponse rsp = RestfulClient.post(oMsbDetails.getDefaultServer().getHost(),
Integer.parseInt(oMsbDetails.getDefaultServer().getPort()),
- CommonConstant.functionTest.FUNCTEST_URL, buildRequest(inStream));
+ CommonConstant.FunctionTest.FUNCTEST_URL, buildRequest(inStream));
if (!checkValidResponse(rsp)) {
logger.error("Failed to validate response");
return funcTestId;
logger.info("GetTestResultsByFuncTestKey for Function Test Results for :" + key);
RestResponse rspGet = RestfulClient.get(oMsbDetails.getDefaultServer().getHost(),
Integer.parseInt(oMsbDetails.getDefaultServer().getPort()),
- CommonConstant.functionTest.FUNCTEST_RESULT_URL + key);
- if (false == checkValidResponse(rspGet)) {
+ CommonConstant.FunctionTest.FUNCTEST_RESULT_URL + key);
+ if (!checkValidResponse(rspGet)) {
logger.error("Failed to convert String Json Response to TestResults list:" + rspGet.getResult());
return result;
}
logger.info("GetTestResultsByFuncTestKey for Function Test Results for :" + strJsonRequest);
RestResponse rspGet = RestfulClient.sendPostRequest(oMsbDetails.getDefaultServer().getHost(),
- oMsbDetails.getDefaultServer().getPort(), CommonConstant.functionTest.FUNCTEST_RESULT_URL,
+ oMsbDetails.getDefaultServer().getPort(), CommonConstant.FunctionTest.FUNCTEST_RESULT_URL,
strJsonRequest);
- if (false == checkValidResponse(rspGet)) {
+ if (!checkValidResponse(rspGet)) {
logger.error("Failed to convert String Json Response to TestResults list:" + rspGet.getResult());
return result;
}
return true;
}
- private static HttpEntity buildRequest(InputStream inputStream) throws FileNotFoundException {
+ private static HttpEntity buildRequest(InputStream inputStream) {
MultipartEntityBuilder builder = MultipartEntityBuilder.create();
builder.addBinaryBody("file", inputStream);
return builder.build();
+ onBoradingReq.getCsarId());
oFuncTestResult.setOperFinished(true);
oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex());
- buildFuncTestResponse(oFuncTestResult, CommonConstant.functionTest.FUNCTEST_PACKAGE_EXISTS,
+ buildFuncTestResponse(oFuncTestResult, CommonConstant.FunctionTest.FUNCTEST_PACKAGE_EXISTS,
EnumOperationStatus.FAILED.getIndex());
updateResult(oFuncTestResult);
return EnumResult.FAIL.getIndex();
}
- buildFuncTestResponse(oFuncTestResult, CommonConstant.functionTest.FUNCTEST_PACKAGE_EXISTS,
+ buildFuncTestResponse(oFuncTestResult, CommonConstant.FunctionTest.FUNCTEST_PACKAGE_EXISTS,
EnumOperationStatus.SUCCESS.getIndex());
updateResult(oFuncTestResult);
if (null == functestResultKey) {
oFuncTestResult.setOperFinished(true);
oFuncTestResult.setOperStatus(EnumResult.FAIL.getIndex());
- buildFuncTestResponse(oFuncTestResult, CommonConstant.functionTest.FUNCTEST_EXEC,
+ buildFuncTestResponse(oFuncTestResult, CommonConstant.FunctionTest.FUNCTEST_EXEC,
EnumOperationStatus.FAILED.getIndex());
updateResult(oFuncTestResult);
return EnumResult.FAIL.getIndex();
oFuncTestResult.setOperFinished(true);
oFuncTestResult.setOperStatus(EnumResult.SUCCESS.getIndex());
- buildFuncTestResponse(oFuncTestResult, CommonConstant.functionTest.FUNCTEST_EXEC,
+ buildFuncTestResponse(oFuncTestResult, CommonConstant.FunctionTest.FUNCTEST_EXEC,
EnumOperationStatus.SUCCESS.getIndex());
updateResult(oFuncTestResult);
ResultKey oResultKey = new ResultKey();
oResultKey.setCsarId(onBoradingReq.getCsarId());
- oResultKey.setOperTypeId(CommonConstant.functionTest.FUNCTEST_OPERTYPE_ID);
+ oResultKey.setOperTypeId(CommonConstant.FunctionTest.FUNCTEST_OPERTYPE_ID);
oResultKey.setKey(resultKey);
FileUtil.writeJsonDatatoFile(filePath.toString(), oResultKey);
private void buildFunctResponse(OnBoradingRequest onBoradingReq, OnBoardingResult oFuncTestResult) {
oFuncTestResult.setOperFinished(false);
oFuncTestResult.setCsarId(onBoradingReq.getCsarId());
- oFuncTestResult.setOperTypeId(CommonConstant.functionTest.FUNCTEST_OPERTYPE_ID);
+ oFuncTestResult.setOperTypeId(CommonConstant.FunctionTest.FUNCTEST_OPERTYPE_ID);
OnBoardingOperResult oPackageExists = new OnBoardingOperResult();
- oPackageExists.setOperId(CommonConstant.functionTest.FUNCTEST_PACKAGE_EXISTS);
+ oPackageExists.setOperId(CommonConstant.FunctionTest.FUNCTEST_PACKAGE_EXISTS);
oPackageExists.setStatus(EnumOperationStatus.NOTSTARTED.getIndex());
OnBoardingOperResult functTesExec = new OnBoardingOperResult();
- functTesExec.setOperId(CommonConstant.functionTest.FUNCTEST_EXEC);
+ functTesExec.setOperId(CommonConstant.FunctionTest.FUNCTEST_EXEC);
functTesExec.setStatus(EnumOperationStatus.NOTSTARTED.getIndex());
List<OnBoardingOperResult> operResult = new ArrayList<>();
String catalougeCsarId = null;
// Validate package path
- if (false == FileUtil.validatePath(packagePath)) {
+ if (!FileUtil.validatePath(packagePath)) {
logger.error("Failed to validate package path");
return catalougeCsarId;
}
File fileData = new File(packagePath);
// Validate file
- if (false == FileUtil.validateFile(fileData)) {
+ if (!FileUtil.validateFile(fileData)) {
logger.error("Failed to validate file information");
return catalougeCsarId;
}
RestResponse rsp = RestfulClient.post(oMsbDetails.getDefaultServer().getHost(),
Integer.parseInt(oMsbDetails.getDefaultServer().getPort()), CommonConstant.CATALOUGE_UPLOAD_URL,
builder.build());
- if (false == checkValidResponse(rsp)) {
+ if (!checkValidResponse(rsp)) {
logger.error("Failed to upload package to catalouge:" + rsp.getStatusCode());
return catalougeCsarId;
}
logger.info("Package file path Function test:" + packagePath);
// Validate package path
- if (false == FileUtil.validatePath(packagePath)) {
+ if (!FileUtil.validatePath(packagePath)) {
logger.error("Failed to validate path");
return result;
}
RestResponse oResponse = RestfulClient.sendPostRequest(oMsbDetails.getDefaultServer().getHost(),
oMsbDetails.getDefaultServer().getPort(), CommonConstant.LifeCycleTest.LIFECYCLE_TEST_URL, rawDataJson);
- if (false == checkValidResponse(oResponse)) {
+ if (!checkValidResponse(oResponse)) {
logger.error("execlifecycleTest response is faliure :" + oResponse.getStatusCode());
return result;
}
}
private void handleDelayExec(String operId) {
- if(0 == operId.compareToIgnoreCase(CommonConstant.functionTest.FUNCTEST_EXEC)) {
+ if(0 == operId.compareToIgnoreCase(CommonConstant.FunctionTest.FUNCTEST_EXEC)) {
try {
Thread.sleep(8000);
} catch(InterruptedException e) {
new MockUp<FileManagerFactory>() {
@Mock
private FileManagerType getType() {
- return FileManagerType.ftp;
+ return FileManagerType.FTP;
}
};
FileManager manager = FileManagerFactory.createFileManager();
new MockUp<FileManagerFactory>() {
@Mock
private FileManagerType getType() {
- return FileManagerType.http;
+ return FileManagerType.HTTP;
}
};
new MockUp<ToolUtil>() {
new MockUp<FileManagerFactory>() {
@Mock
private FileManagerType getType() {
- return FileManagerType.http;
+ return FileManagerType.HTTP;
}
};
new MockUp<ToolUtil>() {
vnfPackageObj.setVnfPackageUrl("vnfPackageUrl");
vnfPackageObj.setVnfd("vnfd");
vnfPackageObj.setVersion("1");
- vnfPackageObj.setUsageState(EnumUsageState.NotInUse);
+ vnfPackageObj.setUsageState(EnumUsageState.NOTINUSE);
vnfPackageObj.setProvider("huawei");
- vnfPackageObj.setOperationalState(EnumOperationalState.Enabled);
+ vnfPackageObj.setOperationalState(EnumOperationalState.ENABLED);
vnfPackageObj.setName("vnf");
vnfPackageObj.setDeletionPending("pending");
res = vnfPackageObj.getVersion();
assertEquals(res, "1");
EnumUsageState state = vnfPackageObj.getUsageState();
- assertEquals(state, EnumUsageState.NotInUse);
+ assertEquals(state, EnumUsageState.NOTINUSE);
res = vnfPackageObj.getProvider();
assertEquals(res, "huawei");
EnumOperationalState operState = vnfPackageObj.getOperationalState();
- assertEquals(operState, EnumOperationalState.Enabled);
+ assertEquals(operState, EnumOperationalState.ENABLED);
res = vnfPackageObj.getName();
assertEquals(res, "vnf");
res = vnfPackageObj.getDeletionPending();
Code Review / vnfsdk / refrepo.git / commitdiff