Skip to content

Commit 0569f1e

Browse files
authored
Remove GenericTypeIndicator in error messages (#4268)
1 parent a3b86c8 commit 0569f1e

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

firebase-firestore/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
(#5871).
44

55
- [fixed] Fixed Firestore failing to raise initial snapshot from empty local cache result.
6+
- [fixed] Removed invalid suggestions to use `GenericTypeIndicator` from error messages.
67

78
# 24.4.0
89
* [feature] Added

firebase-firestore/src/main/java/com/google/firebase/firestore/util/CustomClassMapper.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,7 @@ private static <T> T deserializeToClass(Object o, Class<T> clazz, DeserializeCon
246246
context.errorPath, "Converting to Arrays is not supported, please use Lists instead");
247247
} else if (clazz.getTypeParameters().length > 0) {
248248
throw deserializeError(
249-
context.errorPath,
250-
"Class "
251-
+ clazz.getName()
252-
+ " has generic type parameters, please use GenericTypeIndicator instead");
249+
context.errorPath, "Class " + clazz.getName() + " has generic type parameters");
253250
} else if (clazz.equals(Object.class)) {
254251
return (T) o;
255252
} else if (clazz.isEnum()) {

firebase-firestore/src/test/java/com/google/firebase/firestore/util/MapperTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,16 +1883,14 @@ public void primitiveClassesCanBePassedInTopLevel() {
18831883
@Test
18841884
public void passingInListTopLevelThrows() {
18851885
assertExceptionContains(
1886-
"Class java.util.List has generic type parameters, please use GenericTypeIndicator "
1887-
+ "instead",
1886+
"Class java.util.List has generic type parameters",
18881887
() -> convertToCustomClass(Collections.singletonList("foo"), List.class));
18891888
}
18901889

18911890
@Test
18921891
public void passingInMapTopLevelThrows() {
18931892
assertExceptionContains(
1894-
"Class java.util.Map has generic type parameters, please use GenericTypeIndicator "
1895-
+ "instead",
1893+
"Class java.util.Map has generic type parameters",
18961894
() -> convertToCustomClass(Collections.singletonMap("foo", "bar"), Map.class));
18971895
}
18981896

@@ -1920,7 +1918,7 @@ public void passingInByteTopLevelThrows() {
19201918
public void passingInGenericBeanTopLevelThrows() {
19211919
assertExceptionContains(
19221920
"Class com.google.firebase.firestore.util.MapperTest$GenericBean has generic type "
1923-
+ "parameters, please use GenericTypeIndicator instead",
1921+
+ "parameters",
19241922
() -> deserialize("{'value': 'foo'}", GenericBean.class));
19251923
}
19261924

0 commit comments

Comments
 (0)