<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.5.33</version>
+ <version>8.5.32</version>
</dependency>
<dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.9.0</version>
+ <version>1.7.0</version>
</dependency>
<dependency>
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
import org.onap.nbi.apis.servicecatalog.jolt.FindServiceSpecJsonTransformer;
import org.onap.nbi.apis.servicecatalog.jolt.GetServiceSpecJsonTransformer;
import org.onap.nbi.apis.serviceorder.ServiceCatalogUrl;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
@Service
public List<LinkedHashMap> find(MultiValueMap<String, String> parametersMap) {
List<LinkedHashMap> sdcResponse = sdcClient.callFind(parametersMap);
List<LinkedHashMap> serviceCatalogResponse = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(sdcResponse)){
+ if(!CollectionUtils.isEmpty(sdcResponse)){
serviceCatalogResponse =
findServiceSpecJsonTransformer.transform(sdcResponse);
}
*/
package org.onap.nbi.apis.servicecatalog;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.io.FileUtils;
import org.onap.nbi.exceptions.TechnicalException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.springframework.util.CollectionUtils;
@Service
public class ToscaInfosProcessor {
Object aDefault = parameter.get("default");
if (parameter.get("entry_schema") != null) {
ArrayList entrySchema = (ArrayList) parameter.get("entry_schema");
- if (CollectionUtils.isNotEmpty(entrySchema)) {
+ if (!CollectionUtils.isEmpty(entrySchema)) {
buildCharacteristicValuesFormShema(parameterType, serviceSpecCharacteristicValues, aDefault,
entrySchema);
}
LinkedHashMap constraints = (LinkedHashMap) entrySchema.get(0);
if (constraints != null) {
ArrayList constraintsList = (ArrayList) constraints.get("constraints");
- if (CollectionUtils.isNotEmpty(constraintsList)) {
+ if (!CollectionUtils.isEmpty(constraintsList)) {
LinkedHashMap valuesMap = (LinkedHashMap) constraintsList.get(0);
if (valuesMap != null) {
List<Object> values = (List<Object>) valuesMap.get("valid_values");
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections.CollectionUtils;
import org.onap.nbi.apis.serviceinventory.jolt.FindServiceInventoryJsonTransformer;
import org.onap.nbi.apis.serviceinventory.jolt.GetServiceInventoryJsonTransformer;
import org.onap.nbi.exceptions.BackendFunctionalException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
buildServiceInstances(serviceInstances, customerId, serviceName);
}
List<LinkedHashMap> serviceInventoryResponse = new ArrayList<>();
- if(CollectionUtils.isNotEmpty(serviceInstances)){
+ if(!CollectionUtils.isEmpty(serviceInstances)){
serviceInventoryResponse =
findServiceInventoryJsonTransformer.transform(serviceInstances);
for (LinkedHashMap serviceInventory : serviceInventoryResponse) {