1 files changed, 12 insertions, 13 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
index 11a42694bf..1aad998e78 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/info/DistributionStatus.java
@@ -7,19 +7,23 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
+ * Modifications copyright (c) 2019 Nokia
+ * ================================================================================
  */
 
 package org.openecomp.sdc.be.info;
 
+import java.util.Arrays;
+import java.util.Optional;
 import org.openecomp.sdc.common.log.wrappers.Logger;
 
 public enum DistributionStatus {
@@ -44,18 +48,13 @@ public enum DistributionStatus {
     }
 
     public static DistributionStatus getStatusByAuditingStatusName(String auditingStatus) {
-        DistributionStatus res = null;
-        DistributionStatus[] values = values();
-        for (DistributionStatus value : values) {
-            if (value.getAuditingStatus().equals(auditingStatus)) {
-                res = value;
-                break;
-            }
-        }
-        if (res == null) {
-            log.debug("No DistributionStatus  is mapped to name {}", auditingStatus);
+        Optional<DistributionStatus> distributionStatus = Arrays.stream(values())
+            .filter(value -> value.getAuditingStatus().equals(auditingStatus)).findAny();
+        if (!distributionStatus.isPresent()){
+            log.debug("No DistributionStatus is mapped to name {}", auditingStatus);
         }
-        return res;
+        // it should be replaced by some exception handling. Keeping it only for the purpose of backward compatibility
+        return distributionStatus.orElse(null);
     }
 
 }