Addressing PR comments

Author: kamaleshnneerasa

hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java

@@ -1,6 +1,6 @@
 package org.hypertrace.graphql.label.dao;
 
-import java.util.Objects;
+import java.util.Optional;
 import org.hypertrace.graphql.label.request.LabelCreateRequest;
 import org.hypertrace.graphql.label.request.LabelUpdateRequest;
 import org.hypertrace.label.config.service.v1.CreateLabelRequest;
@@ -10,23 +10,16 @@
 public class LabelRequestConverter {
   CreateLabelRequest convertCreationRequest(LabelCreateRequest creationRequest) {
     LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(creationRequest.label().key());
-    if (Objects.nonNull(creationRequest.label().color())) {
-      dataBuilder.setColor(Objects.requireNonNull(creationRequest.label().color()));
-    }
-    if (Objects.nonNull(creationRequest.label().description())) {
-      dataBuilder.setDescription(Objects.requireNonNull(creationRequest.label().description()));
-    }
+    Optional.ofNullable(creationRequest.label().color()).ifPresent(dataBuilder::setColor);
+    Optional.ofNullable(creationRequest.label().description())
+        .ifPresent(dataBuilder::setDescription);
     return CreateLabelRequest.newBuilder().setData(dataBuilder.build()).build();
   }
 
   UpdateLabelRequest convertUpdateRequest(LabelUpdateRequest updateRequest) {
     LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(updateRequest.label().key());
-    if (Objects.nonNull(updateRequest.label().color())) {
-      dataBuilder.setColor(Objects.requireNonNull(updateRequest.label().color()));
-    }
-    if (Objects.nonNull(updateRequest.label().description())) {
-      dataBuilder.setDescription(Objects.requireNonNull(updateRequest.label().description()));
-    }
+    Optional.ofNullable(updateRequest.label().color()).ifPresent(dataBuilder::setColor);
+    Optional.ofNullable(updateRequest.label().description()).ifPresent(dataBuilder::setDescription);
     return UpdateLabelRequest.newBuilder()
         .setId(updateRequest.label().id())
         .setData(dataBuilder.build())

hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java

@@ -25,40 +25,24 @@ Single<LabelResultSet> convert(GetLabelsResponse response) {
   Single<List<Label>> convertToLabelList(GetLabelsResponse response) {
     return Single.just(
         response.getLabelsList().stream()
-            .map(
-                label ->
-                    new DefaultLabel(
-                        label.getId(),
-                        label.getData().getKey(),
-                        label.getData().hasColor() ? label.getData().getColor() : null,
-                        label.getData().hasDescription() ? label.getData().getDescription() : null))
+            .map(this::convertLabel)
             .collect(Collectors.toUnmodifiableList()));
   }
 
   Single<Label> convertLabel(CreateLabelResponse response) {
-    return Single.just(
-        new DefaultLabel(
-            response.getLabel().getId(),
-            response.getLabel().getData().getKey(),
-            response.getLabel().getData().hasColor()
-                ? response.getLabel().getData().getColor()
-                : null,
-            response.getLabel().getData().hasDescription()
-                ? response.getLabel().getData().getDescription()
-                : null));
+    return Single.just(convertLabel(response.getLabel()));
   }
 
   Single<Label> convertUpdateLabel(UpdateLabelResponse response) {
-    return Single.just(
-        new DefaultLabel(
-            response.getLabel().getId(),
-            response.getLabel().getData().getKey(),
-            response.getLabel().getData().hasColor()
-                ? response.getLabel().getData().getColor()
-                : null,
-            response.getLabel().getData().hasDescription()
-                ? response.getLabel().getData().getDescription()
-                : null));
+    return Single.just(convertLabel(response.getLabel()));
+  }
+
+  private Label convertLabel(org.hypertrace.label.config.service.v1.Label label) {
+    return new DefaultLabel(
+        label.getId(),
+        label.getData().getKey(),
+        label.getData().hasColor() ? label.getData().getColor() : null,
+        label.getData().hasDescription() ? label.getData().getDescription() : null);
   }
 
   @Value