[CCSDK-245] RA: Refactor RA to make it generic

[ccsdk/sli/adaptors.git] / resource-assignment / provider / src / main / java / org / onap / ccsdk / sli / adaptors / rm / util / LabelUtil.java

diff --git a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java
index 7cc541d..a67a50b 100644 (file)
--- a/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java
+++ b/resource-assignment/provider/src/main/java/org/onap/ccsdk/sli/adaptors/rm/util/LabelUtil.java
@@ -8,9 +8,9 @@
  * 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.
@@ -23,7 +23,6 @@ package org.onap.ccsdk.sli.adaptors.rm.util;
 
 import java.util.ArrayList;
 import java.util.Date;
-
 import org.onap.ccsdk.sli.adaptors.rm.data.AllocationItem;
 import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationItem;
 import org.onap.ccsdk.sli.adaptors.rm.data.LabelAllocationRequest;
@@ -37,16 +36,18 @@ public class LabelUtil {
         if (req.check && req.label != null && l.allocationItems != null && !l.allocationItems.isEmpty()) {
             for (AllocationItem ai : l.allocationItems) {
                 LabelAllocationItem lai = (LabelAllocationItem) ai;
-                if (!eq(req.resourceUnionId, lai.resourceUnionId) && !eq(req.label, lai.label))
+                if (!eq(req.resourceUnionId, lai.resourceUnionId) && !eq(req.label, lai.label)) {
                     return false;
+                }
             }
         }
         return true;
     }
 
-    public static String allocateLabel(LabelResource l, LabelAllocationRequest req, String applicationId) {
-        if (!req.allocate)
+    public static String allocateLabel(LabelResource l, LabelAllocationRequest req) {
+        if (!req.allocate) {
             return null;
+        }
 
         LabelAllocationItem lai = (LabelAllocationItem) ResourceUtil.getAllocationItem(l, req.resourceSetId);
         if (lai == null) {
@@ -55,13 +56,14 @@ public class LabelUtil {
             lai.resourceKey = new ResourceKey();
             lai.resourceKey.assetId = req.assetId;
             lai.resourceKey.resourceName = req.resourceName;
-            lai.applicationId = applicationId;
+            lai.applicationId = req.applicationId;
             lai.resourceSetId = req.resourceSetId;
             lai.resourceUnionId = req.resourceUnionId;
             lai.resourceShareGroupList = req.resourceShareGroupList;
 
-            if (l.allocationItems == null)
-                l.allocationItems = new ArrayList<AllocationItem>();
+            if (l.allocationItems == null) {
+                l.allocationItems = new ArrayList<>();
+            }
             l.allocationItems.add(lai);
         }
 
@@ -76,17 +78,19 @@ public class LabelUtil {
     public static void recalculate(LabelResource l) {
         l.label = null;
         l.referenceCount = 0;
-        if (l.allocationItems != null)
+        if (l.allocationItems != null) {
             for (AllocationItem ai : l.allocationItems) {
                 LabelAllocationItem lai = (LabelAllocationItem) ai;
                 if (lai.label != null) {
                     l.referenceCount++;
-                    if (l.label == null)
+                    if (l.label == null) {
                         l.label = lai.label;
-                    else if (!l.label.equals(lai.label))
+                    } else if (!l.label.equals(lai.label)) {
                         l.label = "__BLOCKED__";
+                    }
                 }
             }
+        }
     }
 
     private static boolean eq(Object o1, Object o2) {