Skip to content

Fix Data.nullOf method template signature regression #700

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
merged 1 commit into from
Jun 6, 2019
Merged

Fix Data.nullOf method template signature regression #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix method template signature broken in #639
  • Loading branch information
@chingor13
chingor13 committed Jun 6, 2019
commit 2d1d440fc5fef0422b87a7237c4fa65758c39e4d
2 changes: 1 addition & 1 deletion google-http-client/src/main/java/com/google/api/client/util/Data.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public class Data {
* @return magic object instance that represents the "null" value (not Java {@code null})
* @throws IllegalArgumentException if unable to create a new instance
*/
public static <T> T nullOf(Class<?> objClass) {
public static <T> T nullOf(Class<T> objClass) {
// ConcurrentMap.computeIfAbsent is explicitly NOT used in the following logic. The
// ConcurrentHashMap implementation of that method BLOCKS if the mappingFunction triggers
// modification of the map which createNullInstance can do depending on the state of class
Expand Down
7 changes: 7 additions & 0 deletions google-http-client/src/test/java/com/google/api/client/util/DataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

package com.google.api.client.util;

import com.google.common.collect.ImmutableMap;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
Expand Down Expand Up @@ -68,6 +69,12 @@ public void testNullOf() {
}
}

public void testNullOfTemplateTypes() {
String nullValue = Data.nullOf(String.class);
Map<String, String> nullField = ImmutableMap.of("v", nullValue);
assertEquals(nullValue, nullField.get("v"));
}

public void testIsNull() {
assertTrue(Data.isNull(Data.NULL_BOOLEAN));
assertTrue(Data.isNull(Data.NULL_STRING));
Expand Down