refactor system label info util

Author: Vaibhav090420

labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/LabelsConfigServiceImpl.java

@@ -57,7 +57,7 @@ public LabelsConfigServiceImpl(
                     RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider()
                         .get()),
             configChangeEventGenerator);
-    systemLabelInfoUtils = new SystemLabelInfoUtils(config, labelStore);
+    systemLabelInfoUtils = new SystemLabelInfoUtils(config);
   }
 
   @Override
@@ -163,7 +163,7 @@ public void getLabel(GetLabelRequest request, StreamObserver<GetLabelResponse> r
                   () ->
                       Optional.ofNullable(
                               systemLabelInfoUtils
-                                  .getSystemLabelsIdLabelMap(requestContext)
+                                  .getSystemLabelsIdLabelMap(getExistingLabels(requestContext))
                                   .get(labelId))
                           .orElseThrow(Status.NOT_FOUND::asRuntimeException));
       responseObserver.onNext(GetLabelResponse.newBuilder().setLabel(label).build());
@@ -177,15 +177,12 @@ public void getLabel(GetLabelRequest request, StreamObserver<GetLabelResponse> r
   public void getLabels(
       GetLabelsRequest request, StreamObserver<GetLabelsResponse> responseObserver) {
     RequestContext requestContext = RequestContext.CURRENT.get();
-    List<Label> tenantLabels =
-        labelStore.getAllObjects(requestContext).stream()
-            .map(ContextualConfigObject::getData)
-            .collect(Collectors.toUnmodifiableList());
+    List<Label> tenantLabels = getExistingLabels(requestContext);
     Map<String, Label> tenantLabelsMap =
         tenantLabels.stream()
             .collect(Collectors.toUnmodifiableMap(Label::getId, Function.identity()));
     List<Label> allLabels = new ArrayList<>(tenantLabels);
-    systemLabelInfoUtils.getSystemLabels(requestContext).stream()
+    systemLabelInfoUtils.getSystemLabels(tenantLabels).stream()
         .filter(label -> !tenantLabelsMap.containsKey(label.getId()))
         .forEach(allLabels::add);
     responseObserver.onNext(GetLabelsResponse.newBuilder().addAllLabels(allLabels).build());
@@ -210,7 +207,7 @@ public void updateLabel(
                   () ->
                       Optional.ofNullable(
                               systemLabelInfoUtils
-                                  .getSystemLabelsIdLabelMap(requestContext)
+                                  .getSystemLabelsIdLabelMap(getExistingLabels(requestContext))
                                   .get(request.getId()))
                           .orElseThrow(Status.NOT_FOUND::asRuntimeException));
       Label updateLabel = oldLabel.toBuilder().setData(updateLabelData).build();
@@ -228,7 +225,9 @@ public void deleteLabel(
     try {
       RequestContext requestContext = RequestContext.CURRENT.get();
       String labelId = request.getId();
-      if (systemLabelInfoUtils.getSystemLabelsIdLabelMap(requestContext).containsKey(labelId)) {
+      if (systemLabelInfoUtils
+          .getSystemLabelsIdLabelMap(getExistingLabels(requestContext))
+          .containsKey(labelId)) {
         // Deleting a system label
         responseObserver.onError(new StatusRuntimeException(Status.INVALID_ARGUMENT));
         return;
@@ -255,10 +254,17 @@ private boolean isDuplicateKey(RequestContext requestContext, String key) {
 
   private Map<String, Label> getLabelsMap(RequestContext requestContext) {
     Map<String, Label> existingLabelsMap =
-        new HashMap<>(systemLabelInfoUtils.getSystemLabelsKeyLabelMap(requestContext));
+        new HashMap<>(
+            systemLabelInfoUtils.getSystemLabelsKeyLabelMap(getExistingLabels(requestContext)));
     labelStore.getAllObjects(requestContext).stream()
         .map(ContextualConfigObject::getData)
         .forEach(label -> existingLabelsMap.put(label.getData().getKey(), label));
     return Collections.unmodifiableMap(existingLabelsMap);
   }
+
+  private List<Label> getExistingLabels(RequestContext requestContext) {
+    return labelStore.getAllObjects(requestContext).stream()
+        .map(ContextualConfigObject::getData)
+        .collect(Collectors.toUnmodifiableList());
+  }
 }

labels-config-service-impl/src/main/java/org/hypertrace/label/config/service/SystemLabelInfoUtils.java

@@ -11,8 +11,6 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 import lombok.SneakyThrows;
-import org.hypertrace.config.objectstore.ContextualConfigObject;
-import org.hypertrace.core.grpcutils.context.RequestContext;
 import org.hypertrace.label.config.service.v1.Label;
 
 public class SystemLabelInfoUtils {
@@ -21,14 +19,12 @@ public class SystemLabelInfoUtils {
   private static final String SYSTEM_LABELS = "system.labels";
 
   private final Config config;
-  private final LabelStore labelStore;
 
-  public SystemLabelInfoUtils(Config config, LabelStore labelStore) {
+  public SystemLabelInfoUtils(Config config) {
     this.config = config;
-    this.labelStore = labelStore;
   }
 
-  public List<Label> getSystemLabels(RequestContext requestContext) {
+  public List<Label> getSystemLabels(List<Label> existingLabels) {
     List<? extends ConfigObject> systemLabelsObjectList = null;
     if (config.hasPath(LABELS_CONFIG_SERVICE_CONFIG)) {
       Config labelConfig = config.getConfig(LABELS_CONFIG_SERVICE_CONFIG);
@@ -38,27 +34,26 @@ public List<Label> getSystemLabels(RequestContext requestContext) {
     }
     return Objects.isNull(systemLabelsObjectList)
         ? Collections.emptyList()
-        : buildSystemLabelList(requestContext, systemLabelsObjectList);
+        : buildSystemLabelList(systemLabelsObjectList, existingLabels);
   }
 
-  public Map<String, Label> getSystemLabelsIdLabelMap(RequestContext requestContext) {
-    return getSystemLabels(requestContext).stream()
+  public Map<String, Label> getSystemLabelsIdLabelMap(List<Label> existingLabels) {
+    return getSystemLabels(existingLabels).stream()
         .collect(Collectors.toUnmodifiableMap(Label::getId, identity()));
   }
 
-  public Map<String, Label> getSystemLabelsKeyLabelMap(RequestContext requestContext) {
-    return getSystemLabels(requestContext).stream()
+  public Map<String, Label> getSystemLabelsKeyLabelMap(List<Label> existingLabels) {
+    return getSystemLabels(existingLabels).stream()
         .collect(Collectors.toUnmodifiableMap(label -> label.getData().getKey(), identity()));
   }
 
   private List<Label> buildSystemLabelList(
-      RequestContext requestContext, List<? extends ConfigObject> configObjectList) {
+      List<? extends ConfigObject> configObjectList, List<Label> existingLabels) {
     Map<String, Label> labelsIdMap =
         configObjectList.stream()
             .map(SystemLabelInfoUtils::buildLabelFromConfig)
             .collect(Collectors.toMap(Label::getId, identity()));
-    labelStore.getAllObjects(requestContext).stream()
-        .map(ContextualConfigObject::getData)
+    existingLabels.stream()
         .filter(label -> labelsIdMap.containsKey(label.getId()))
         .forEach(label -> labelsIdMap.put(label.getId(), label));
     return labelsIdMap.values().stream().collect(Collectors.toUnmodifiableList());