Skip to content
This repository has been archived by the owner on Sep 26, 2023. It is now read-only.

fix: Remove default value handling #1353

Merged
merged 2 commits into from Apr 30, 2021
Merged

fix: Remove default value handling #1353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a61c6f3
fix: Remove default value handling
vam-google Apr 28, 2021
a197843
Merge remote-tracking branch 'upstream/master'
vam-google Apr 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 0 additions & 19 deletions gax-httpjson/src/main/java/com/google/api/gax/httpjson/ProtoRestSerializer.java
View file
Open in desktop
Expand Up @@ -101,9 +101,6 @@ RequestT fromJson(InputStream message, Charset messageCharset, Message.Builder b
* @param fieldValue a field value
*/
public void putPathParam(Map<String, String> fields, String fieldName, Object fieldValue) {
if (isDefaultValue(fieldName, fieldValue)) {
return;
}
fields.put(fieldName, String.valueOf(fieldValue));
}

Expand All @@ -116,11 +113,6 @@ public void putPathParam(Map<String, String> fields, String fieldName, Object fi
* @param fieldValue a field value
*/
public void putQueryParam(Map<String, List<String>> fields, String fieldName, Object fieldValue) {
// Avoids empty query parameter
if (isDefaultValue(fieldName, fieldValue)) {
return;
}

ImmutableList.Builder<String> paramValueList = ImmutableList.builder();
if (fieldValue instanceof List<?>) {
for (Object fieldValueItem : (List<?>) fieldValue) {
Expand All @@ -142,15 +134,4 @@ public void putQueryParam(Map<String, List<String>> fields, String fieldName, Ob
public String toBody(String fieldName, RequestT fieldValue) {
return toJson(fieldValue);
}

private boolean isDefaultValue(String fieldName, Object fieldValue) {
// TODO: Revisit this approach to ensure proper default-value handling as per design.
if (fieldValue instanceof Number) {
return ((Number) fieldValue).longValue() == 0L;
} else if (fieldValue instanceof String) {
return ((String) fieldValue).isEmpty();
}

return false;
}
}
1 change: 1 addition & 0 deletions gax-httpjson/src/test/java/com/google/api/gax/httpjson/ProtoMessageRequestFormatterTest.java
View file
Open in desktop
Expand Up @@ -98,6 +98,7 @@ public void getQueryParamNames() {
Map<String, List<String>> queryParamNames = formatter.getQueryParamNames(field);
Map<String, List<String>> expected = new HashMap<>();
expected.put("number", Arrays.asList("2"));
expected.put("typeUrl", Arrays.asList(""));
Truth.assertThat(queryParamNames).isEqualTo(expected);
}

Expand Down
4 changes: 4 additions & 0 deletions gax-httpjson/src/test/java/com/google/api/gax/httpjson/ProtoRestSerializerTest.java
View file
Open in desktop
Expand Up @@ -115,7 +115,9 @@ public void putPathParam() {

Map<String, String> expectedFields = new HashMap<>();
expectedFields.put("optName1", "1");
expectedFields.put("optName2", "0");
expectedFields.put("optName3", "three");
expectedFields.put("optName4", "");

Truth.assertThat(fields).isEqualTo(expectedFields);
}
Expand All @@ -131,7 +133,9 @@ public void putQueryParam() {

Map<String, List<String>> expectedFields = new HashMap<>();
expectedFields.put("optName1", Arrays.asList("1"));
expectedFields.put("optName2", Arrays.asList("0"));
expectedFields.put("optName3", Arrays.asList("three"));
expectedFields.put("optName4", Arrays.asList(""));
expectedFields.put("optName5", Arrays.asList("four", "five"));

Truth.assertThat(fields).isEqualTo(expectedFields);
Expand Down