summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2018-03-23 17:30:15 +0800
committerluxin <luxin7@huawei.com>2018-03-23 17:30:15 +0800
commitf546bdb92e8aeb7b5be842fe8d2560622877082f (patch)
treed5871a4650a016e81989dc032119899d74cd026b
parent24036f3ef63c5a4b8ec87d348ca0e14164455ec3 (diff)
Fix nexus-iq issues
Change-Id: I739a9048f6d8ab94a48f3c68c9c604cd3ae369f8 Issue-ID: VFC-725 Signed-off-by: luxin <luxin7@huawei.com>
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/pom.xml27
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java7
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java4
3 files changed, 10 insertions, 28 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
index a18c043c..0b521cb1 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
+++ b/huawei/vnfmadapter/VnfmadapterService/service/pom.xml
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
- <version>1.9.2</version>
+ <version>1.9.13</version>
</dependency>
<dependency>
<groupId>javax.ws.rs</groupId>
@@ -191,17 +191,17 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
+ <version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-cache</artifactId>
- <version>4.3.5</version>
+ <version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.3.5</version>
+ <version>4.5.3</version>
</dependency>
<!--dependency>
@@ -210,30 +210,11 @@
<version>3.1.0</version>
</dependency-->
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-cache</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <version>4.3.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>3.1.6</version>
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
index 53e51de7..a50548af 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/adapter/impl/AdapterResourceManager.java
@@ -308,7 +308,8 @@ public class AdapterResourceManager implements IResourceManager {
LOG.info("changeWorkingDirectory: " + ftpClient.changeWorkingDirectory(vnfpkg.getString(VNFD_FILE_PATH)));
String vnfdPath = csarfilepath + "Artifacts/Deployment/OTHER/";
LOG.info("vnfd_file_name: " + vnfdPath + vnfpkg.getString("vnfd_file_name"));
- try(InputStream inputStream = new FileInputStream(new File(vnfdPath + vnfpkg.getString("vnfd_file_name")))){
+ try (InputStream inputStream =
+ new FileInputStream(new File(vnfdPath + vnfpkg.getString("vnfd_file_name")))) {
flag = ftpClient.storeFile(vnfpkg.getString("vnfd_file_name"), inputStream);
if(flag) {
resJson.put("message", "upload Csar success!");
@@ -617,7 +618,7 @@ public class AdapterResourceManager implements IResourceManager {
+ "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + Constant.VNFPKGINFO;
try (InputStream ins = new FileInputStream(fileName)) {
- try(BufferedInputStream bins = new BufferedInputStream(ins)){
+ try (BufferedInputStream bins = new BufferedInputStream(ins)) {
byte[] contentByte = new byte[ins.available()];
int num = bins.read(contentByte);
@@ -642,7 +643,7 @@ public class AdapterResourceManager implements IResourceManager {
+ "vnfpkginfo" + System.getProperty(Constant.FILE_SEPARATOR) + "vnfd_ids.json";
try (InputStream ins = new FileInputStream(fileName)) {
- try (BufferedInputStream bins = new BufferedInputStream(ins)){
+ try (BufferedInputStream bins = new BufferedInputStream(ins)) {
byte[] contentByte = new byte[ins.available()];
int num = bins.read(contentByte);
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java
index 0c6b448e..30bd68bd 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/dao/impl/VnfmDaoImpl.java
@@ -18,18 +18,18 @@ package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.impl;
import java.util.List;
+import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceException;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.AbstractDao;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.dao.inf.VnfmDao;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.entity.Vnfm;
import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.mapper.VnfmMapper;
-import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.restclient.ServiceException;
/**
* VNFM DAO
* .</br>
*
* @author
- * @version VFC 1.0 Sep 14, 2016
+ * @version VFC 1.0 Sep 14, 2016
*/
public class VnfmDaoImpl extends AbstractDao implements VnfmDao {