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());
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;
}
<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>
<version>1.0.2</version>
<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>
<!-- 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>