Skip to content

Commit 1ec3bd0

Browse files
Changing labels graphql apis to use new labels config schema (#114)
1 parent 597ad5f commit 1ec3bd0

File tree

4 files changed

+13
-16
lines changed

4 files changed

+13
-16
lines changed

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,21 @@
22

33
import org.hypertrace.graphql.label.request.LabelCreateRequest;
44
import org.hypertrace.graphql.label.request.LabelUpdateRequest;
5-
import org.hypertrace.label.config.service.v1.CreateLabel;
65
import org.hypertrace.label.config.service.v1.CreateLabelRequest;
7-
import org.hypertrace.label.config.service.v1.Label;
6+
import org.hypertrace.label.config.service.v1.LabelData;
87
import org.hypertrace.label.config.service.v1.UpdateLabelRequest;
98

109
public class LabelRequestConverter {
1110
CreateLabelRequest convertCreationRequest(LabelCreateRequest creationRequest) {
1211
return CreateLabelRequest.newBuilder()
13-
.setLabel(CreateLabel.newBuilder().setKey(creationRequest.label().key()).build())
12+
.setData(LabelData.newBuilder().setKey(creationRequest.label().key()).build())
1413
.build();
1514
}
1615

1716
UpdateLabelRequest convertUpdateRequest(LabelUpdateRequest updateRequest) {
1817
return UpdateLabelRequest.newBuilder()
19-
.setLabel(
20-
Label.newBuilder()
21-
.setKey(updateRequest.label().key())
22-
.setId(updateRequest.label().id())
23-
.build())
18+
.setId(updateRequest.label().id())
19+
.setData(LabelData.newBuilder().setKey(updateRequest.label().key()).build())
2420
.build();
2521
}
2622
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,23 @@ Single<LabelResultSet> convert(GetLabelsResponse response) {
2525
Single<List<Label>> convertToLabelList(GetLabelsResponse response) {
2626
return Single.just(
2727
response.getLabelsList().stream()
28-
.map(label -> new DefaultLabel(label.getId(), label.getKey()))
28+
.map(label -> new DefaultLabel(label.getId(), label.getData().getKey()))
2929
.collect(Collectors.toUnmodifiableList()));
3030
}
3131

3232
Single<Label> convertLabel(CreateLabelResponse response) {
33-
return Single.just(new DefaultLabel(response.getLabel().getId(), response.getLabel().getKey()));
33+
return Single.just(
34+
new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
3435
}
3536

3637
Single<Label> convertUpdateLabel(UpdateLabelResponse response) {
37-
return Single.just(new DefaultLabel(response.getLabel().getId(), response.getLabel().getKey()));
38+
return Single.just(
39+
new DefaultLabel(response.getLabel().getId(), response.getLabel().getData().getKey()));
3840
}
3941

4042
@Value
4143
@Accessors(fluent = true)
4244
private static class DefaultLabelResultSet implements LabelResultSet {
43-
static final LabelResultSet EMPTY_LABEL_RESULT_SET = new DefaultLabelResultSet(List.of(), 0, 0);
4445
List<Label> results;
4546
long count;
4647
long total;

hypertrace-graphql-platform/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
constraints {
1212
api("org.hypertrace.entity.service:entity-type-service-rx-client:0.5.6")
1313
api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
14-
api("org.hypertrace.config.service:labels-config-service-api:0.1.8")
15-
api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.14")
14+
api("org.hypertrace.config.service:labels-config-service-api:0.1.15")
15+
api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.15")
1616
}
17-
}
17+
}

0 commit comments

Comments
 (0)