Skip to content

fix: Return value as null if values list is empty in MockGenericConfigService #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saxenakshitiz merged 2 commits into from
Jun 11, 2021
Merged

fix: Return value as null if values list is empty in MockGenericConfigService #43

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
216a905
Return value as null if values list is empty
Jun 11, 2021
287e8c4
Address review comments
Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions ...pi/src/testFixtures/java/org/hypertrace/config/service/test/MockGenericConfigService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public MockGenericConfigService mockGet() {
StreamObserver<GetConfigResponse> responseStreamObserver =
invocation.getArgument(1, StreamObserver.class);

Value mergedValue =
Optional<Value> mergedValue =
Stream.concat(
Stream.of(DEFAULT_CONFIG_CONTEXT), request.getContextsList().stream())
.map(
Expand All @@ -218,7 +218,7 @@ public MockGenericConfigService mockGet() {

if (isValidValue(mergedValue)) {
responseStreamObserver.onNext(
GetConfigResponse.newBuilder().setConfig(mergedValue).build());
GetConfigResponse.newBuilder().setConfig(mergedValue.get()).build());
responseStreamObserver.onCompleted();
} else {
responseStreamObserver.onError(Status.NOT_FOUND.asException());
Expand All @@ -231,16 +231,20 @@ public MockGenericConfigService mockGet() {
return this;
}

private Value mergeValues(List<Value> values) {
return values.stream().reduce(Value.getDefaultInstance(), ConfigServiceUtils::merge);
private Optional<Value> mergeValues(List<Value> values) {
if (values.isEmpty()) {
Comment thread
saxenakshitiz marked this conversation as resolved.
return Optional.empty();
}
return Optional.ofNullable(
values.stream().reduce(Value.getDefaultInstance(), ConfigServiceUtils::merge));
}

private String configContextOrDefault(String value) {
return Optional.ofNullable(value).filter(not(String::isEmpty)).orElse(DEFAULT_CONFIG_CONTEXT);
}

private boolean isValidValue(Value value) {
return value != null && value.getKindCase() != Value.KindCase.NULL_VALUE;
private boolean isValidValue(Optional<Value> value) {
return value.isPresent() && value.get().getKindCase() != Value.KindCase.NULL_VALUE;
}

private class TestInterceptor implements ServerInterceptor {
Expand Down