Skip to content

fix: check field value is non-null in GenericData.containsKey #2191

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
blakeli0 merged 2 commits into from
Oct 9, 2026
Merged

fix: check field value is non-null in GenericData.containsKey #2191

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
3a767f6
fix: check field value is non-null in GenericData.containsKey
blakeli0 Oct 9, 2026
d521483
build: remove duplicate maven-source-plugin declaration in pom.xml
blakeli0 Oct 9, 2026
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
6 changes: 3 additions & 3 deletions google-http-client/src/main/java/com/google/api/client/util/GenericData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ public final boolean containsKey(Object name) {
return false;
}
String fieldName = (String) name;
boolean hasFieldInfo = classInfo.hasFieldInfo(fieldName);
if (hasFieldInfo) {
return true;
FieldInfo fieldInfo = classInfo.getFieldInfo(fieldName);
if (fieldInfo != null) {
return fieldInfo.getValue(this) != null;
}
if (classInfo.getIgnoreCase()) {
fieldName = fieldName.toLowerCase(Locale.US);
Expand Down
8 changes: 8 additions & 0 deletions google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,17 @@ public void testPutIgnoreCase_class() {
@Test
public void testGetIgnoreCase_class() {
MyData data = new MyData();
assertFalse(data.containsKey("FIELDA"));
assertFalse(data.containsKey("FieldA"));
assertFalse(data.keySet().contains("FieldA"));
data.fieldA = "someValue";
assertTrue(data.containsKey("FIELDA"));
assertTrue(data.containsKey("FieldA"));
assertTrue(data.keySet().contains("FieldA"));
assertEquals("someValue", data.get("FIELDA"));
data.fieldA = null;
assertFalse(data.containsKey("FIELDA"));
assertFalse(data.keySet().contains("FieldA"));
}

@Test
Expand Down
13 changes: 0 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,19 +405,6 @@
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.5.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down
Loading