summaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common')
-rwxr-xr-xvid-app-common/pom.xml64
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java5
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java3
-rwxr-xr-xvid-app-common/src/main/webapp/WEB-INF/web.xml17
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js2
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js3
-rw-r--r--vid-app-common/src/test/resources/WEB-INF/web.xml11
-rwxr-xr-xvid-app-common/version.properties2
12 files changed, 53 insertions, 70 deletions
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index 5f69ff162..34699f98c 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
inherit from a parent maven module. -->
<groupId>org.onap.vid</groupId>
<artifactId>vid-app-common</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.1-SNAPSHOT</version>
<packaging>war</packaging>
<name>VID Common</name>
<description>VID Common code for opensource version</description>
@@ -25,16 +25,17 @@
<encoding>UTF-8</encoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <epsdk.version>2.4.0</epsdk.version>
- <springframework.version>5.1.6.RELEASE</springframework.version>
+ <epsdk.version>2.5.0</epsdk.version>
+ <springframework.version>5.1.9.RELEASE</springframework.version>
<springframework.orm.version>4.3.22.RELEASE</springframework.orm.version>
<!-- epsdk-core is importing this class, which is only on spring-orm 4 but not in orm 5:
org.springframework.orm.hibernate4.HibernateTransactionManager
so following orm.version lets epsdk-core find it -->
<hibernate.version>4.3.11.Final</hibernate.version>
- <jackson.version>2.9.8</jackson.version>
- <jersey.version>2.28</jersey.version>
+ <jackson.version>2.9.9</jackson.version>
+ <jersey.version>2.29</jersey.version>
<surefire.version>2.22.1</surefire.version>
+ <selenium.version>3.141.59</selenium.version>
<sonar.coverage.exclusions>**/webapp/**/*,**/*.js</sonar.coverage.exclusions>
<!-- Skip assembling the zip by default -->
@@ -495,7 +496,7 @@
<dependency>
<groupId>com.opencsv</groupId>
<artifactId>opencsv</artifactId>
- <version>4.1</version>
+ <version>4.6</version>
</dependency>
<!-- HTTP client -->
@@ -508,16 +509,17 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
+ <version>4.5.9</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpasyncclient</artifactId>
- <version>4.0.2</version>
+ <version>4.1.4</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
- <version>4.5.7</version>
+ <version>4.5.9</version>
</dependency>
<dependency>
<groupId>com.xebialabs.restito</groupId>
@@ -528,7 +530,7 @@
<dependency>
<groupId>org.jeasy</groupId>
<artifactId>easy-random-core</artifactId>
- <version>4.0.0.RC1</version>
+ <version>4.0.0</version>
<scope>test</scope>
</dependency>
@@ -536,7 +538,7 @@
<dependency>
<groupId>io.vavr</groupId>
<artifactId>vavr</artifactId>
- <version>0.9.2</version>
+ <version>0.10.2</version>
</dependency>
<!-- SDK overlay war -->
@@ -626,7 +628,7 @@
<dependency>
<groupId>io.searchbox</groupId>
<artifactId>jest</artifactId>
- <version>2.0.0</version>
+ <version>6.3.1</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -637,7 +639,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1.0</version>
+ <version>4.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -649,7 +651,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
<!--<scope>test</scope>-->
</dependency>
<dependency>
@@ -661,12 +663,12 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20160212</version>
+ <version>20190722</version>
</dependency>
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.2.1</version>
+ <version>2.3.1</version>
<exclusions>
<!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
<exclusion>
@@ -679,7 +681,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.12</version>
+ <version>1.7.27</version>
</dependency>
<!-- springframework to override epsdk-app-common's and epsdk-core's versions -->
@@ -763,13 +765,13 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>2.53.1</version>
+ <version>${selenium.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-api</artifactId>
- <version>2.53.1</version>
+ <version>${selenium.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -787,17 +789,17 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
- <version>2.53.1</version>
+ <version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.4.01</version>
+ <version>2.0.2</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.16</version>
+ <version>1.24</version>
</dependency>
<dependency>
<groupId>org.skyscreamer</groupId>
@@ -808,13 +810,13 @@
<dependency>
<groupId>org.onap.sdc.sdc-tosca</groupId>
<artifactId>sdc-tosca</artifactId>
- <version>1.5.1</version>
+ <version>1.6.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.javacrumbs.json-unit</groupId>
<artifactId>json-unit</artifactId>
- <version>2.2.0</version>
+ <version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -831,7 +833,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
- <version>1.1</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -839,6 +841,11 @@
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>java-hamcrest</artifactId>
<version>2.0.0.0</version>
@@ -847,29 +854,30 @@
<dependency>
<groupId>org.togglz</groupId>
<artifactId>togglz-spring-core</artifactId>
- <version>2.5.0.Final</version>
+ <version>2.6.1.Final</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.4.196</version>
+ <version>1.4.199</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.11</version>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.10.0</version>
+ <version>3.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
+ <version>28.0-jre</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
index b118901a4..2f69e397c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/PombaRestInterface.java
@@ -4,6 +4,7 @@
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2018 - 2019 Nokia. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,13 +36,13 @@ import java.util.UUID;
import static org.onap.vid.utils.Logging.REQUEST_ID_HEADER_KEY;
public class PombaRestInterface extends AAIRestInterface {
+
+ private Client client = null;
public PombaRestInterface (HttpsAuthClient httpsAuthClientFactory, ServletRequestHelper servletRequestHelper, SystemPropertyHelper systemPropertyHelper) {
super(httpsAuthClientFactory, servletRequestHelper, systemPropertyHelper);
}
- private Client client = null;
-
@Override
protected void initRestClient()
{
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java
index d03362ba8..af665f849 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/SubscriberListWithFilterData.java
@@ -3,6 +3,7 @@
* VID
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,6 +32,8 @@ import java.util.List;
* Created by Oren on 7/5/17.
*/
public class SubscriberListWithFilterData {
+
+ public List<SubscriberWithFilter> customer;
public SubscriberListWithFilterData(SubscriberList subscriberList, RoleValidator roleValidator){
List<Subscriber> subscribers = subscriberList != null ? subscriberList.customer : new ArrayList<>();
@@ -46,5 +49,4 @@ public class SubscriberListWithFilterData {
}
}
- public List<SubscriberWithFilter> customer;
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java
index 83a3cae1d..4d49b5806 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/ResourceType.java
@@ -37,7 +37,7 @@ public enum ResourceType {
INSTANCE_GROUP("instance-groups", "instance-group-name"),
VOLUME_GROUP("volume-groups", "volume-group-name");
- private static Map<String, ResourceType> AAI_FORMAT_MAP = Stream
+ private static final Map<String, ResourceType> AAI_FORMAT_MAP = Stream
.of(ResourceType.values())
.collect(Collectors.toMap(s -> s.aaiFormat, Function.identity()));
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
index 8a674609d..400e788d0 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/SSLContextProvider.java
@@ -34,7 +34,7 @@ public class SSLContextProvider {
private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(SSLContextProvider.class);
- public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode) throws HttpClientBuilderException {
+ public SSLContext getSslContext(String keystorePath, String keystorePassword, HttpClientMode httpClientMode){
try {
final SSLContext ctx = SSLContext.getInstance("TLSv1.2");
KeyManager[] keyManagers = getKeyManagerFactory(keystorePath, keystorePassword, httpClientMode);
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java
index e1d2544b7..132987a22 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Group.java
@@ -38,7 +38,7 @@ public class Group {
private ToscaMetadata metadata;
/** The vf module type. */
- private String vf_module_type;
+ private String vfModuleType;
/** The properties. */
private Map<String, Object> properties;
@@ -103,7 +103,7 @@ public class Group {
* @return the vf module type
*/
public String getvf_module_type() {
- return vf_module_type;
+ return vfModuleType;
}
/**
@@ -111,8 +111,8 @@ public class Group {
*
* @param vf_module_type the new vf module type
*/
- public void setvf_module_type(String vf_module_type) {
- this.vf_module_type = vf_module_type;
+ public void setvf_module_type(String vfModuleType) {
+ this.vfModuleType = vfModuleType;
}
/**
diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
index 5171b7ac8..626816f7f 100644
--- a/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/MsoUtil.java
@@ -49,7 +49,8 @@ public class MsoUtil {
if (httpResponse.getRawBody() != null) {
try {
T body = httpResponse.getBody();
- String entityStr = body instanceof String ? (String) body : JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody());
+ String entityStr = (body instanceof String || body==null) ? (String) body :
+ JACKSON_OBJECT_MAPPER.writeValueAsString(httpResponse.getBody());
msoResponseWrapper.setEntity(entityStr);
} catch(JsonProcessingException e) {
ExceptionUtils.rethrow(e);
diff --git a/vid-app-common/src/main/webapp/WEB-INF/web.xml b/vid-app-common/src/main/webapp/WEB-INF/web.xml
deleted file mode 100755
index 7f0a40ef2..000000000
--- a/vid-app-common/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
-
- <display-name>vid-common</display-name>
-
- <!-- The app can function on a HA cluster -->
- <distributable />
-
- <session-config>
- <session-timeout>7</session-timeout>
- <tracking-mode>COOKIE</tracking-mode>
- </session-config>
-
-</web-app>
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
index 072adf305..e66b8ff6c 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js
@@ -531,7 +531,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER",
$scope.isPermitted = first.isPermitted;
deferred.resolve(first.isPermitted);
} else {
- deferred.reject("some error while resolveIfIsPermitted")
+ deferred.reject("some error while resolveIfIsPermitted");
}
});
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
index e545aadb1..6b45a7479 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/change-management.service.js
@@ -119,8 +119,7 @@
});
return deferred.promise;
- };
-
+ };
this.postChangeManagementNow = function (requestData, vnfName) {
var url = COMPONENT.CHANGE_MANAGEMENT_OPERATION_NO_SCHEDULER.replace('@vnfName', vnfName);
return $http.post(url, requestData)
diff --git a/vid-app-common/src/test/resources/WEB-INF/web.xml b/vid-app-common/src/test/resources/WEB-INF/web.xml
deleted file mode 100644
index 273544d6f..000000000
--- a/vid-app-common/src/test/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd" version="2.5">
-
- <display-name>ecomp-sdk-app-att</display-name>
- <distributable/>
- <session-config>
- <session-timeout>7</session-timeout>
- <tracking-mode>COOKIE</tracking-mode>
- </session-config>
-</web-app> \ No newline at end of file
diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 295674ed8..60ac15449 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -4,7 +4,7 @@
major=5
minor=0
-patch=0
+patch=1
base_version=${major}.${minor}.${patch}