Skip to content

Commit c2f4868

Browse files
committed
Adjust retrieval of java.time package name
1 parent fc97473 commit c2f4868

2 files changed

Lines changed: 21 additions & 7 deletions

File tree

gson/src/main/java/com/google/gson/internal/bind/JavaTimeTypeAdapters.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -429,21 +429,17 @@ private static <T> T requireNonNullField(T field, String fieldName, JsonReader r
429429
* href="https://developer.android.com/studio/write/java8-support#library-desugaring">API
430430
* desugaring</a>.
431431
*/
432-
private static String javaTimePackage() {
432+
static String javaTimePackage() {
433433
try {
434434
// Use arbitrary java.time.* class here, one which is quite simple and does not refer to many
435435
// other classes
436436
String className = DateTimeException.class.getName();
437437
int packageEnd = className.lastIndexOf('.');
438-
// To be safe, account for no '.' in package name (quite unlikely though) in case of Android
439-
// API desugaring
440-
if (packageEnd != -1) {
441-
return className.substring(0, packageEnd + 1);
442-
}
438+
return className.substring(0, packageEnd + 1);
443439
} catch (LinkageError ignored) {
444440
// java.time.* classes are probably not available
441+
return null;
445442
}
446-
return null;
447443
}
448444

449445
private static class AdapterFactory implements TypeAdapterFactory {
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.google.gson.internal.bind;
2+
3+
import static com.google.common.truth.Truth.assertThat;
4+
5+
import org.junit.Test;
6+
7+
/** Functional tests are in {@link com.google.gson.functional.JavaTimeTest}. */
8+
public class JavaTimeTypeAdaptersTest {
9+
@Test
10+
public void testJavaTimePackage() {
11+
assertThat(JavaTimeTypeAdapters.javaTimePackage()).isEqualTo("java.time.");
12+
}
13+
14+
@Test
15+
public void testGetFactory() {
16+
assertThat(new JavaTimeTypeAdapters().get()).isNotNull();
17+
}
18+
}

0 commit comments

Comments
 (0)