From 22a1785e92e429c8f66a13b75a51fdc6f822d5b4 Mon Sep 17 00:00:00 2001
From: kamaleshnneerasa <kamaleshnneerasa@github.com>
Date: Wed, 10 Nov 2021 10:53:18 +0530
Subject: [PATCH 1/2] Changing labels graphql apis to use new labels config
 schema

---
 .../graphql/label/dao/LabelRequestConverter.java     | 12 ++++--------
 .../graphql/label/dao/LabelResponseConverter.java    |  9 +++++----
 hypertrace-graphql-platform/build.gradle.kts         |  5 +++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java
index 57c7386d..b88dba8f 100644
--- a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java
+++ b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelRequestConverter.java
@@ -2,25 +2,21 @@
 
 import org.hypertrace.graphql.label.request.LabelCreateRequest;
 import org.hypertrace.graphql.label.request.LabelUpdateRequest;
-import org.hypertrace.label.config.service.v1.CreateLabel;
 import org.hypertrace.label.config.service.v1.CreateLabelRequest;
-import org.hypertrace.label.config.service.v1.Label;
+import org.hypertrace.label.config.service.v1.LabelData;
 import org.hypertrace.label.config.service.v1.UpdateLabelRequest;
 
 public class LabelRequestConverter {
   CreateLabelRequest convertCreationRequest(LabelCreateRequest creationRequest) {
     return CreateLabelRequest.newBuilder()
-        .setLabel(CreateLabel.newBuilder().setKey(creationRequest.label().key()).build())
+        .setData(LabelData.newBuilder().setKey(creationRequest.label().key()).build())
         .build();
   }
 
   UpdateLabelRequest convertUpdateRequest(LabelUpdateRequest updateRequest) {
     return UpdateLabelRequest.newBuilder()
-        .setLabel(
-            Label.newBuilder()
-                .setKey(updateRequest.label().key())
-                .setId(updateRequest.label().id())
-                .build())
+        .setId(updateRequest.label().id())
+        .setData(LabelData.newBuilder().setKey(updateRequest.label().key()).build())
         .build();
   }
 }
diff --git a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java
index 8641815d..f5b2c603 100644
--- a/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java
+++ b/hypertrace-graphql-labels-schema/src/main/java/org/hypertrace/graphql/label/dao/LabelResponseConverter.java
@@ -25,22 +25,23 @@ Single<LabelResultSet> convert(GetLabelsResponse response) {
   Single<List<Label>> convertToLabelList(GetLabelsResponse response) {
     return Single.just(
         response.getLabelsList().stream()
-            .map(label -> new DefaultLabel(label.getId(), label.getKey()))
+            .map(label -> new DefaultLabel(label.getId(), label.getData().getKey()))
             .collect(Collectors.toUnmodifiableList()));
   }
 
   Single<Label> convertLabel(CreateLabelResponse response) {
-    return Single.just(new DefaultLabel(response.getLabel().getId(), response.getLabel().getKey()));
+    return Single.just(
+        new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
   }
 
   Single<Label> convertUpdateLabel(UpdateLabelResponse response) {
-    return Single.just(new DefaultLabel(response.getLabel().getId(), response.getLabel().getKey()));
+    return Single.just(
+        new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
   }
 
   @Value
   @Accessors(fluent = true)
   private static class DefaultLabelResultSet implements LabelResultSet {
-    static final LabelResultSet EMPTY_LABEL_RESULT_SET = new DefaultLabelResultSet(List.of(), 0, 0);
     List<Label> results;
     long count;
     long total;
diff --git a/hypertrace-graphql-platform/build.gradle.kts b/hypertrace-graphql-platform/build.gradle.kts
index 0611e171..f806d7d0 100644
--- a/hypertrace-graphql-platform/build.gradle.kts
+++ b/hypertrace-graphql-platform/build.gradle.kts
@@ -11,7 +11,8 @@ dependencies {
   constraints {
     api("org.hypertrace.entity.service:entity-type-service-rx-client:0.5.6")
     api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
-    api("org.hypertrace.config.service:labels-config-service-api:0.1.8")
+    //api("org.hypertrace.config.service:labels-config-service-api:0.1.8")
+    api("org.hypertrace.config.service:labels-config-service-api:0.2.0-SNAPSHOT")
     api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.14")
   }
-}
\ No newline at end of file
+}

From ef69814c0cdb55b6a77d9358b40b44661fb190bd Mon Sep 17 00:00:00 2001
From: saxenakshitiz <kshitiz@traceable.ai>
Date: Thu, 11 Nov 2021 23:33:35 +0530
Subject: [PATCH 2/2] Upgrade core and labels config sevice

---
 hypertrace-core-graphql                      | 2 +-
 hypertrace-graphql-platform/build.gradle.kts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index f50dca87..e7d83ae0 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit f50dca87ddc6f4340436c2156ccbe08231274b47
+Subproject commit e7d83ae01f46a09da26160b895a4178bab259f58
diff --git a/hypertrace-graphql-platform/build.gradle.kts b/hypertrace-graphql-platform/build.gradle.kts
index f806d7d0..ecc55be6 100644
--- a/hypertrace-graphql-platform/build.gradle.kts
+++ b/hypertrace-graphql-platform/build.gradle.kts
@@ -11,8 +11,7 @@ dependencies {
   constraints {
     api("org.hypertrace.entity.service:entity-type-service-rx-client:0.5.6")
     api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
-    //api("org.hypertrace.config.service:labels-config-service-api:0.1.8")
-    api("org.hypertrace.config.service:labels-config-service-api:0.2.0-SNAPSHOT")
-    api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.14")
+    api("org.hypertrace.config.service:labels-config-service-api:0.1.15")
+    api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.15")
   }
 }