Skip to content

Commit 860e6a4

Browse files
cpovirkGoogle Java Core Libraries
cpovirk
authored and
Google Java Core Libraries
committed
Remove some redundant @GwtIncompatible annotations.
RELNOTES=n/a PiperOrigin-RevId: 778018466
1 parent 08c8be5 commit 860e6a4

File tree

4 files changed

+2
-40
lines changed

4 files changed

+2
-40
lines changed

‎android/guava-tests/test/com/google/common/base/EnumsTest.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public void testGetIfPresent_whenNoMatchingConstant() {
8383

8484

8585
@J2ktIncompatible
86-
@GwtIncompatible // weak references
8786
@AndroidIncompatible // depends on details of GC and classloading
8887
public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
8988
WeakReference<?> shadowLoaderReference = doTestClassUnloading();
@@ -96,7 +95,6 @@ public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
9695
// (and therefore its ClassLoader) from being unloaded, then this WeakReference will never be
9796
// cleared.
9897
@J2ktIncompatible
99-
@GwtIncompatible // weak references
10098
private WeakReference<?> doTestClassUnloading() throws Exception {
10199
URLClassLoader shadowLoader = new URLClassLoader(getClassPathUrls(), null);
102100
@SuppressWarnings("unchecked")
@@ -117,7 +115,6 @@ private WeakReference<?> doTestClassUnloading() throws Exception {
117115
return new WeakReference<>(shadowLoader);
118116
}
119117

120-
@GwtIncompatible // stringConverter
121118
public void testStringConverter_convert() {
122119
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
123120
assertEquals(TestEnum.CHEETO, converter.convert("CHEETO"));
@@ -127,13 +124,11 @@ public void testStringConverter_convert() {
127124
assertNull(converter.reverse().convert(null));
128125
}
129126

130-
@GwtIncompatible // stringConverter
131127
public void testStringConverter_convertError() {
132128
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
133129
assertThrows(IllegalArgumentException.class, () -> converter.convert("xxx"));
134130
}
135131

136-
@GwtIncompatible // stringConverter
137132
public void testStringConverter_reverse() {
138133
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
139134
assertEquals("CHEETO", converter.reverse().convert(TestEnum.CHEETO));
@@ -142,35 +137,30 @@ public void testStringConverter_reverse() {
142137
}
143138

144139
@J2ktIncompatible
145-
@GwtIncompatible // stringConverter
146140
public void testStringConverter_nullPointerTester() throws Exception {
147141
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
148142
NullPointerTester tester = new NullPointerTester();
149143
tester.testAllPublicInstanceMethods(converter);
150144
}
151145

152-
@GwtIncompatible // stringConverter
153146
public void testStringConverter_nullConversions() {
154147
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
155148
assertNull(converter.convert(null));
156149
assertNull(converter.reverse().convert(null));
157150
}
158151

159152
@J2ktIncompatible
160-
@GwtIncompatible // Class.getName()
161153
public void testStringConverter_toString() {
162154
assertEquals(
163155
"Enums.stringConverter(com.google.common.base.EnumsTest$TestEnum.class)",
164156
Enums.stringConverter(TestEnum.class).toString());
165157
}
166158

167-
@GwtIncompatible // stringConverter
168159
public void testStringConverter_serialization() {
169160
SerializableTester.reserializeAndAssert(Enums.stringConverter(TestEnum.class));
170161
}
171162

172163
@J2ktIncompatible
173-
@GwtIncompatible // NullPointerTester
174164
public void testNullPointerExceptions() {
175165
NullPointerTester tester = new NullPointerTester();
176166
tester.testAllPublicStaticMethods(Enums.class);
@@ -186,7 +176,6 @@ private enum AnEnum {
186176
}
187177

188178
@J2ktIncompatible
189-
@GwtIncompatible // reflection
190179
public void testGetField() {
191180
Field foo = Enums.getField(AnEnum.FOO);
192181
assertEquals("FOO", foo.getName());
@@ -198,7 +187,6 @@ public void testGetField() {
198187
}
199188

200189
@J2ktIncompatible
201-
@GwtIncompatible // Class.getClassLoader()
202190
private URL[] getClassPathUrls() {
203191
ClassLoader classLoader = getClass().getClassLoader();
204192
return classLoader instanceof URLClassLoader
@@ -212,7 +200,6 @@ private URL[] getClassPathUrls() {
212200
*/
213201
// TODO(b/65488446): Make this a public API.
214202
@J2ktIncompatible
215-
@GwtIncompatible
216203
private static ImmutableList<URL> parseJavaClassPath() {
217204
ImmutableList.Builder<URL> urls = ImmutableList.builder();
218205
for (String entry : Splitter.on(PATH_SEPARATOR.value()).split(JAVA_CLASS_PATH.value())) {

‎android/guava/src/com/google/common/base/Enums.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ private Enums() {}
4646
*
4747
* @since 12.0
4848
*/
49-
@GwtIncompatible // reflection
5049
public static Field getField(Enum<?> enumValue) {
5150
Class<?>
5251
clazz = enumValue.getDeclaringClass();
@@ -71,11 +70,9 @@ public static <T extends Enum<T>> Optional<T> getIfPresent(Class<T> enumClass, S
7170
return Platform.getEnumIfPresent(enumClass, value);
7271
}
7372

74-
@GwtIncompatible // java.lang.ref.WeakReference
7573
private static final Map<Class<? extends Enum<?>>, Map<String, WeakReference<? extends Enum<?>>>>
7674
enumConstantCache = new WeakHashMap<>();
7775

78-
@GwtIncompatible // java.lang.ref.WeakReference
7976
private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> populateCache(
8077
Class<T> enumClass) {
8178
Map<String, WeakReference<? extends Enum<?>>> result = new HashMap<>();
@@ -86,7 +83,6 @@ private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>>
8683
return result;
8784
}
8885

89-
@GwtIncompatible // java.lang.ref.WeakReference
9086
static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnumConstants(
9187
Class<T> enumClass) {
9288
synchronized (enumConstantCache) {
@@ -106,12 +102,10 @@ static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnum
106102
*
107103
* @since 16.0
108104
*/
109-
@GwtIncompatible
110105
public static <T extends Enum<T>> Converter<String, T> stringConverter(Class<T> enumClass) {
111106
return new StringConverter<>(enumClass);
112107
}
113108

114-
@GwtIncompatible
115109
private static final class StringConverter<T extends Enum<T>> extends Converter<String, T>
116110
implements Serializable {
117111

@@ -150,6 +144,6 @@ public String toString() {
150144
return "Enums.stringConverter(" + enumClass.getName() + ".class)";
151145
}
152146

153-
@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L;
147+
@J2ktIncompatible private static final long serialVersionUID = 0L;
154148
}
155149
}

‎guava-tests/test/com/google/common/base/EnumsTest.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public void testGetIfPresent_whenNoMatchingConstant() {
8383

8484

8585
@J2ktIncompatible
86-
@GwtIncompatible // weak references
8786
@AndroidIncompatible // depends on details of GC and classloading
8887
public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
8988
WeakReference<?> shadowLoaderReference = doTestClassUnloading();
@@ -96,7 +95,6 @@ public void testGetIfPresent_doesNotPreventClassUnloading() throws Exception {
9695
// (and therefore its ClassLoader) from being unloaded, then this WeakReference will never be
9796
// cleared.
9897
@J2ktIncompatible
99-
@GwtIncompatible // weak references
10098
private WeakReference<?> doTestClassUnloading() throws Exception {
10199
URLClassLoader shadowLoader = new URLClassLoader(getClassPathUrls(), null);
102100
@SuppressWarnings("unchecked")
@@ -117,7 +115,6 @@ private WeakReference<?> doTestClassUnloading() throws Exception {
117115
return new WeakReference<>(shadowLoader);
118116
}
119117

120-
@GwtIncompatible // stringConverter
121118
public void testStringConverter_convert() {
122119
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
123120
assertEquals(TestEnum.CHEETO, converter.convert("CHEETO"));
@@ -127,13 +124,11 @@ public void testStringConverter_convert() {
127124
assertNull(converter.reverse().convert(null));
128125
}
129126

130-
@GwtIncompatible // stringConverter
131127
public void testStringConverter_convertError() {
132128
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
133129
assertThrows(IllegalArgumentException.class, () -> converter.convert("xxx"));
134130
}
135131

136-
@GwtIncompatible // stringConverter
137132
public void testStringConverter_reverse() {
138133
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
139134
assertEquals("CHEETO", converter.reverse().convert(TestEnum.CHEETO));
@@ -142,35 +137,30 @@ public void testStringConverter_reverse() {
142137
}
143138

144139
@J2ktIncompatible
145-
@GwtIncompatible // stringConverter
146140
public void testStringConverter_nullPointerTester() throws Exception {
147141
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
148142
NullPointerTester tester = new NullPointerTester();
149143
tester.testAllPublicInstanceMethods(converter);
150144
}
151145

152-
@GwtIncompatible // stringConverter
153146
public void testStringConverter_nullConversions() {
154147
Converter<String, TestEnum> converter = Enums.stringConverter(TestEnum.class);
155148
assertNull(converter.convert(null));
156149
assertNull(converter.reverse().convert(null));
157150
}
158151

159152
@J2ktIncompatible
160-
@GwtIncompatible // Class.getName()
161153
public void testStringConverter_toString() {
162154
assertEquals(
163155
"Enums.stringConverter(com.google.common.base.EnumsTest$TestEnum.class)",
164156
Enums.stringConverter(TestEnum.class).toString());
165157
}
166158

167-
@GwtIncompatible // stringConverter
168159
public void testStringConverter_serialization() {
169160
SerializableTester.reserializeAndAssert(Enums.stringConverter(TestEnum.class));
170161
}
171162

172163
@J2ktIncompatible
173-
@GwtIncompatible // NullPointerTester
174164
public void testNullPointerExceptions() {
175165
NullPointerTester tester = new NullPointerTester();
176166
tester.testAllPublicStaticMethods(Enums.class);
@@ -186,7 +176,6 @@ private enum AnEnum {
186176
}
187177

188178
@J2ktIncompatible
189-
@GwtIncompatible // reflection
190179
public void testGetField() {
191180
Field foo = Enums.getField(AnEnum.FOO);
192181
assertEquals("FOO", foo.getName());
@@ -198,7 +187,6 @@ public void testGetField() {
198187
}
199188

200189
@J2ktIncompatible
201-
@GwtIncompatible // Class.getClassLoader()
202190
private URL[] getClassPathUrls() {
203191
ClassLoader classLoader = getClass().getClassLoader();
204192
return classLoader instanceof URLClassLoader
@@ -212,7 +200,6 @@ private URL[] getClassPathUrls() {
212200
*/
213201
// TODO(b/65488446): Make this a public API.
214202
@J2ktIncompatible
215-
@GwtIncompatible
216203
private static ImmutableList<URL> parseJavaClassPath() {
217204
ImmutableList.Builder<URL> urls = ImmutableList.builder();
218205
for (String entry : Splitter.on(PATH_SEPARATOR.value()).split(JAVA_CLASS_PATH.value())) {

‎guava/src/com/google/common/base/Enums.java‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ private Enums() {}
4646
*
4747
* @since 12.0
4848
*/
49-
@GwtIncompatible // reflection
5049
public static Field getField(Enum<?> enumValue) {
5150
Class<?>
5251
clazz = enumValue.getDeclaringClass();
@@ -71,11 +70,9 @@ public static <T extends Enum<T>> Optional<T> getIfPresent(Class<T> enumClass, S
7170
return Platform.getEnumIfPresent(enumClass, value);
7271
}
7372

74-
@GwtIncompatible // java.lang.ref.WeakReference
7573
private static final Map<Class<? extends Enum<?>>, Map<String, WeakReference<? extends Enum<?>>>>
7674
enumConstantCache = new WeakHashMap<>();
7775

78-
@GwtIncompatible // java.lang.ref.WeakReference
7976
private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> populateCache(
8077
Class<T> enumClass) {
8178
Map<String, WeakReference<? extends Enum<?>>> result = new HashMap<>();
@@ -86,7 +83,6 @@ private static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>>
8683
return result;
8784
}
8885

89-
@GwtIncompatible // java.lang.ref.WeakReference
9086
static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnumConstants(
9187
Class<T> enumClass) {
9288
synchronized (enumConstantCache) {
@@ -106,12 +102,10 @@ static <T extends Enum<T>> Map<String, WeakReference<? extends Enum<?>>> getEnum
106102
*
107103
* @since 16.0
108104
*/
109-
@GwtIncompatible
110105
public static <T extends Enum<T>> Converter<String, T> stringConverter(Class<T> enumClass) {
111106
return new StringConverter<>(enumClass);
112107
}
113108

114-
@GwtIncompatible
115109
private static final class StringConverter<T extends Enum<T>> extends Converter<String, T>
116110
implements Serializable {
117111

@@ -150,6 +144,6 @@ public String toString() {
150144
return "Enums.stringConverter(" + enumClass.getName() + ".class)";
151145
}
152146

153-
@GwtIncompatible @J2ktIncompatible private static final long serialVersionUID = 0L;
147+
@J2ktIncompatible private static final long serialVersionUID = 0L;
154148
}
155149
}

0 commit comments

Comments
 (0)