summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Mohan Murthy Potham <murali.p@huawei.com>2017-09-27 14:21:39 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-27 14:21:39 +0000
commitb06bb1a55f63f2378b126b3ce6c3e5ccdf1e1583 (patch)
treebf3727196500eb7401720f5f9384332cb6885c23
parent4d56c7b5e60143e5a55b2f3adb2140349208f2ff (diff)
parent9d43ccde37e50209870c80c62d447868b7460ef8 (diff)
Merge "Fix the constructor issue"
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java11
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java6
2 files changed, 8 insertions, 9 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java
index 2c22bdca..967d0039 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/common/CommonErrorResponse.java
@@ -19,6 +19,11 @@ package org.onap.vnfsdk.marketplace.common;
public class CommonErrorResponse {
private String message;
+
+ public CommonErrorResponse(String message) {
+ super();
+ this.message = message;
+ }
public String getMessage() {
return message;
@@ -27,11 +32,5 @@ public class CommonErrorResponse {
public static Object failure(String message) {
return message;
}
-
- public CommonErrorResponse(String message) {
- super();
- this.message = message;
- }
-
}
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
index 1777c1ec..8eb68eb2 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapperUtil.java
@@ -184,8 +184,8 @@ public class PackageWrapperUtil {
*/
public static String getPackageName(String ftpUrl) {
int index = ftpUrl.lastIndexOf("/");
- String packageName = ftpUrl.substring(index);
- return packageName;
+
+ return ftpUrl.substring(index);
}
/**
@@ -308,7 +308,7 @@ public class PackageWrapperUtil {
File file = new File(unzipFile);
try (BufferedReader reader = new BufferedReader(new FileReader(file))) {
- for(String tempString = null; (tempString = reader.readLine()) != null;)
+ for(String tempString; (tempString = reader.readLine()) != null;)
{
// If line is empty, ignore
if ("".equals(tempString)) {