Address review comments

Author: saxenakshitiz

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

@@ -9,20 +9,22 @@
 
 public class LabelRequestConverter {
   CreateLabelRequest convertCreationRequest(LabelCreateRequest creationRequest) {
-    LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(creationRequest.label().key());
-    Optional.ofNullable(creationRequest.label().color()).ifPresent(dataBuilder::setColor);
-    Optional.ofNullable(creationRequest.label().description())
-        .ifPresent(dataBuilder::setDescription);
-    return CreateLabelRequest.newBuilder().setData(dataBuilder.build()).build();
+    return CreateLabelRequest.newBuilder()
+        .setData(convertLabelData(creationRequest.label()))
+        .build();
   }
 
   UpdateLabelRequest convertUpdateRequest(LabelUpdateRequest updateRequest) {
-    LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(updateRequest.label().key());
-    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())
+        .setData(convertLabelData(updateRequest.label()))
         .build();
   }
+
+  private LabelData convertLabelData(org.hypertrace.graphql.label.schema.LabelData data) {
+    LabelData.Builder dataBuilder = LabelData.newBuilder().setKey(data.key());
+    Optional.ofNullable(data.color()).ifPresent(dataBuilder::setColor);
+    Optional.ofNullable(data.description()).ifPresent(dataBuilder::setDescription);
+    return dataBuilder.build();
+  }
 }

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

@@ -1,31 +1,10 @@
 package org.hypertrace.graphql.label.schema;
 
-import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
-import graphql.annotations.annotationTypes.GraphQLNonNull;
-import javax.annotation.Nullable;
 import org.hypertrace.core.graphql.common.schema.id.Identifiable;
 
 @GraphQLName(Label.TYPE_NAME)
-public interface Label extends Identifiable {
+public interface Label extends Identifiable, LabelData {
   String TYPE_NAME = "Label";
   String ARGUMENT_NAME = "label";
-  String KEY = "key";
-  String COLOR_KEY = "color";
-  String DESCRIPTION_KEY = "description";
-
-  @GraphQLField
-  @GraphQLNonNull
-  @GraphQLName(KEY)
-  String key();
-
-  @GraphQLField
-  @Nullable
-  @GraphQLName(COLOR_KEY)
-  String color();
-
-  @GraphQLField
-  @Nullable
-  @GraphQLName(DESCRIPTION_KEY)
-  String description();
 }

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

@@ -0,0 +1,27 @@
+package org.hypertrace.graphql.label.schema;
+
+import graphql.annotations.annotationTypes.GraphQLField;
+import graphql.annotations.annotationTypes.GraphQLName;
+import graphql.annotations.annotationTypes.GraphQLNonNull;
+import javax.annotation.Nullable;
+
+public interface LabelData {
+  String KEY = "key";
+  String COLOR_KEY = "color";
+  String DESCRIPTION_KEY = "description";
+
+  @GraphQLField
+  @GraphQLNonNull
+  @GraphQLName(KEY)
+  String key();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(COLOR_KEY)
+  String color();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(DESCRIPTION_KEY)
+  String description();
+}

hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/schema/mutation/CreateLabel.java

@@ -1,30 +1,10 @@
 package org.hypertrace.graphql.label.schema.mutation;
 
-import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
-import graphql.annotations.annotationTypes.GraphQLNonNull;
-import javax.annotation.Nullable;
+import org.hypertrace.graphql.label.schema.LabelData;
 
 @GraphQLName(CreateLabel.TYPE_NAME)
-public interface CreateLabel {
+public interface CreateLabel extends LabelData {
   String TYPE_NAME = "CreateLabel";
   String ARGUMENT_NAME = "label";
-  String KEY = "key";
-  String COLOR_KEY = "color";
-  String DESCRIPTION_KEY = "description";
-
-  @GraphQLField
-  @GraphQLNonNull
-  @GraphQLName(KEY)
-  String key();
-
-  @GraphQLField
-  @Nullable
-  @GraphQLName(COLOR_KEY)
-  String color();
-
-  @GraphQLField
-  @Nullable
-  @GraphQLName(DESCRIPTION_KEY)
-  String description();
 }