aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java15
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java2
-rw-r--r--integration-tests/pom.xml20
-rw-r--r--pom.xml2
-rw-r--r--utils/DmaapPublisher/pom.xml2
5 files changed, 23 insertions, 18 deletions
diff --git a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java
index 19cfefaba3..36651493d8 100644
--- a/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java
+++ b/catalog-be-plugins/etsi-nfv-nsd-csar-plugin/src/test/java/org/openecomp/sdc/be/plugins/etsi/nfv/nsd/generator/NsDescriptorGeneratorImplTest.java
@@ -129,10 +129,12 @@ class NsDescriptorGeneratorImplTest {
final HashMap<String, ToscaNodeTemplate> nodeTemplateMap = new HashMap<>();
final ToscaNodeTemplate vnfAmfNodeTemplate = new ToscaNodeTemplate();
vnfAmfNodeTemplate.setType("com.ericsson.resource.abstract.Ericsson.AMF");
+ final Map<String, Object> propertyMap = new HashMap<>();
//a property to be excluded
- vnfAmfNodeTemplate.setProperties(ImmutableMap.of("nf_naming_code", new ToscaProperty()));
+ propertyMap.put("nf_naming_code", new ToscaProperty());
//a property that wont be excluded
- vnfAmfNodeTemplate.setProperties(ImmutableMap.of("will_not_be_excluded", new ToscaProperty()));
+ propertyMap.put("will_not_be_excluded", new ToscaProperty());
+ vnfAmfNodeTemplate.setProperties(propertyMap);
nodeTemplateMap.put(VNFD_AMF_NODE_NAME, vnfAmfNodeTemplate);
final Map<String, ToscaTemplateCapability> vnfAmfCapabilities = new HashMap<>();
vnfAmfCapabilities.put("myCapability", new ToscaTemplateCapability());
@@ -196,9 +198,12 @@ class NsDescriptorGeneratorImplTest {
private ToscaNodeType createDefaultInterfaceToscaNodeType(final String designerPropertyValue, final String versionPropertyValue,
final String namePropertyValue, final String invariantIdPropertyValue) {
final ToscaNodeType interfaceToscaNodeType = new ToscaNodeType();
- interfaceToscaNodeType.setProperties(ImmutableMap
- .of("designer", createToscaProperty(designerPropertyValue), "version", createToscaProperty(versionPropertyValue), "name",
- createToscaProperty(namePropertyValue), "invariant_id", createToscaProperty(invariantIdPropertyValue)));
+ final Map<String, ToscaProperty> propertyMap = new HashMap<>();
+ propertyMap.put("designer", createToscaProperty(designerPropertyValue));
+ propertyMap.put("version", createToscaProperty(versionPropertyValue));
+ propertyMap.put("name", createToscaProperty(namePropertyValue));
+ propertyMap.put("invariant_id", createToscaProperty(invariantIdPropertyValue));
+ interfaceToscaNodeType.setProperties(propertyMap);
return interfaceToscaNodeType;
}
diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java
index fbc5e9de95..375f041e81 100644
--- a/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java
+++ b/common-app-api/src/main/java/org/openecomp/sdc/common/util/ValidationUtils.java
@@ -331,7 +331,7 @@ public class ValidationUtils {
public static boolean validateIsAscii(String input) {
- return CharMatcher.ASCII.matchesAllOf(input);
+ return CharMatcher.ascii().matchesAllOf(input);
}
public static String convertHtmlTagsToEntities(String input) {
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 6d87dd937e..449a86bc51 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -70,16 +70,22 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>25.0-jre</version>
- <scope>compile</scope>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>${hamcrest.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.testng</groupId>
@@ -247,12 +253,6 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
<version>3.3</version>
diff --git a/pom.xml b/pom.xml
index b2f720ac1d..79bf444d4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@ Modifications copyright (c) 2018-2019 Nokia
<!-- 3rd parties versions -->
<bean-matcher.version>0.11</bean-matcher.version>
<lang3.version>3.10</lang3.version>
- <guava.version>18.0</guava.version>
+ <guava.version>30.1-jre</guava.version>
<janusgraph.version>0.3.1</janusgraph.version>
<spring.version>5.2.10.RELEASE</spring.version>
<jersey-bom.version>2.27</jersey-bom.version>
diff --git a/utils/DmaapPublisher/pom.xml b/utils/DmaapPublisher/pom.xml
index f0756c576c..6464af23b9 100644
--- a/utils/DmaapPublisher/pom.xml
+++ b/utils/DmaapPublisher/pom.xml
@@ -44,7 +44,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>22.0</version>
+ <version>${guava.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>