SONARQUBE ISSUES: 'equals' is deprecated

	- equals by StringUtils is deprecated (see https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/StringUtils.html#equals(java.lang.CharSequence,java.lang.CharSequence)
	- replaced deprecated based on recommended (See https://commons.apache.org/proper/commons-lang/apidocs/org/apache/commons/lang3/Strings.html#equals(java.lang.CharSequence,java.lang.CharSequence)
	- modified import org.apache.logging.log4j.util.Strings to
	  import org.apache.commons.lang3.StringUtils for use of
	  .isNotBlank to avoid conflict

Issue-ID: CPS-475
Change-Id: I581f839fa48221c3a75e5b23c76ca8d8108adbbc
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/http/RestServiceUrlTemplateBuilder.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/http/RestServiceUrlTemplateBuilder.java
index c850ca9..32d4257 100644 (file)
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/http/RestServiceUrlTemplateBuilder.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/utils/http/RestServiceUrlTemplateBuilder.java
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2022-2024 Nordix Foundation
+ *  Copyright (C) 2022-2025 OpenInfra Foundation Europe. All rights reserved.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
+import org.apache.commons.lang3.Strings;
 import org.springframework.web.util.UriComponentsBuilder;
 
 @NoArgsConstructor
@@ -82,7 +82,7 @@ public class RestServiceUrlTemplateBuilder {
      */
     public RestServiceUrlTemplateBuilder queryParameter(final String queryParameterName,
                                                         final String queryParameterValue) {
-        if (Strings.isNotBlank(queryParameterValue)) {
+        if (StringUtils.isNotBlank(queryParameterValue)) {
             queryParameters.put(queryParameterName, queryParameterValue);
         }
         return this;
@@ -100,7 +100,7 @@ public class RestServiceUrlTemplateBuilder {
         final Map<String, String> urlTemplateVariables = new HashMap<>();
 
         pathSegments.forEach((pathSegmentName, variablePathValue) ->  {
-            if (StringUtils.equals(variablePathValue, FIXED_PATH_SEGMENT)) {
+            if (Strings.CS.equals(variablePathValue, FIXED_PATH_SEGMENT)) {
                 this.uriComponentsBuilder.pathSegment(pathSegmentName);
             } else {
                 this.uriComponentsBuilder.pathSegment("{" + pathSegmentName + "}");

diff --git a/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
index 412c6f9..b4966e1 100755 (executable)
--- a/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/ri/CpsModulePersistenceServiceImpl.java
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2020-2025 Nordix Foundation
+ *  Copyright (C) 2020-2025 OpenInfra Foundation Europe. All rights reserved.
  *  Modifications Copyright (C) 2020-2022 Bell Canada.
  *  Modifications Copyright (C) 2021 Pantheon.tech
  *  Modifications Copyright (C) 2022 TechMahindra Ltd.
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Strings;
 import org.hibernate.exception.ConstraintViolationException;
 import org.onap.cps.api.exceptions.AlreadyDefinedException;
 import org.onap.cps.api.exceptions.DuplicatedYangResourceException;
@@ -374,7 +374,7 @@ public class CpsModulePersistenceServiceImpl implements CpsModulePersistenceServ
     private String getNameForChecksum(final String checksum,
                                       final Collection<YangResourceEntity> yangResourceEntities) {
         final Optional<String> optionalFileName = yangResourceEntities.stream()
-                        .filter(entity -> StringUtils.equals(checksum, (entity.getChecksum())))
+                        .filter(entity -> Strings.CS.equals(checksum, (entity.getChecksum())))
                         .findFirst()
                         .map(YangResourceEntity::getFileName);
         return optionalFileName.orElse("no filename");