Skip to content
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

Fix $Gson$Types equals method for TypeVariable when its generic declaration is not a Class #2599

Merged
merged 6 commits into from
Jan 30, 2024
Merged

Fix $Gson$Types equals method for TypeVariable when its generic declaration is not a Class #2599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1096f78
Fix $Gson$Types equals method for TypeVariable when its generic decla…
d-william Jan 14, 2024
4b9b2eb
Test $Gson$Types equals method with TypeVariable when its generic dec…
d-william Jan 22, 2024
8aef788
Merge branch 'google:main' into main
d-william Jan 29, 2024
adcf98f
Add @SuppressWarnings in GsonTypesTest.java
d-william Jan 29, 2024
f77f1d0
Merge pull request #1 from d-william/test
d-william Jan 29, 2024
60afe2f
Merge branch 'main' into main
d-william Jan 29, 2024
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
2 changes: 1 addition & 1 deletion gson/src/main/java/com/google/gson/internal/$Gson$Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public static boolean equals(Type a, Type b) {
}
TypeVariable<?> va = (TypeVariable<?>) a;
TypeVariable<?> vb = (TypeVariable<?>) b;
return va.getGenericDeclaration() == vb.getGenericDeclaration()
return Objects.equals(va.getGenericDeclaration(), vb.getGenericDeclaration())
&& va.getName().equals(vb.getName());

} else {
Expand Down
35 changes: 35 additions & 0 deletions gson/src/test/java/com/google/gson/internal/GsonTypesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;

import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.List;
Expand Down Expand Up @@ -98,4 +100,37 @@ public static Type getFirstTypeArgument(Type type) throws Exception {
}
return $Gson$Types.canonicalize(actualTypeArguments[0]);
}

@Test
public void testEqualsOnMethodTypeVariables() throws Exception {
Method m1 = TypeVariableTest.class.getMethod("method");
Method m2 = TypeVariableTest.class.getMethod("method");

Type rt1 = m1.getGenericReturnType();
Type rt2 = m2.getGenericReturnType();

assertThat($Gson$Types.equals(rt1, rt2)).isTrue();
}

@Test
public void testEqualsOnConstructorParameterTypeVariables() throws Exception {
Constructor<TypeVariableTest> c1 = TypeVariableTest.class.getConstructor(Object.class);
Constructor<TypeVariableTest> c2 = TypeVariableTest.class.getConstructor(Object.class);

Type rt1 = c1.getGenericParameterTypes()[0];
Type rt2 = c2.getGenericParameterTypes()[0];

assertThat($Gson$Types.equals(rt1, rt2)).isTrue();
}

private static final class TypeVariableTest {

@SuppressWarnings({"UnusedMethod", "UnusedVariable", "TypeParameterUnusedInFormals"})
public <T> TypeVariableTest(T parameter) {}

@SuppressWarnings({"UnusedMethod", "UnusedVariable", "TypeParameterUnusedInFormals"})
public <T> T method() {
return null;
}
}
}
Loading