Skip to content

Commit cf9c2dd

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Hide APIs abstract and forwarding caches from J2KT.
These classes are currently not being tested under J2KT. We could expose them again (even untested if necessary), but for now, it feels safest to withdraw these. They don't have J2KT usage (nor J2CL usage, since they're already not exposed to that platform). RELNOTES=n/a PiperOrigin-RevId: 908209358
1 parent 1e0561a commit cf9c2dd

6 files changed

Lines changed: 6 additions & 10 deletions

File tree

android/guava/src/com/google/common/cache/AbstractLoadingCache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
* @since 11.0
4141
*/
4242
@GwtIncompatible
43+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
4344
public abstract class AbstractLoadingCache<K, V> extends AbstractCache<K, V>
4445
implements LoadingCache<K, V> {
4546

@@ -73,8 +74,6 @@ public final V apply(K key) {
7374
}
7475

7576
@Override
76-
@GwtIncompatible
77-
@J2ktIncompatible
7877
public void refresh(K key) {
7978
throw new UnsupportedOperationException();
8079
}

android/guava/src/com/google/common/cache/ForwardingCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
* @since 10.0
3535
*/
3636
@GwtIncompatible
37+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
3738
public abstract class ForwardingCache<K, V> extends ForwardingObject implements Cache<K, V> {
3839

3940
/** Constructor for use by subclasses. */
@@ -116,7 +117,6 @@ public CacheStats stats() {
116117
}
117118

118119
@Override
119-
@J2ktIncompatible
120120
public ConcurrentMap<K, V> asMap() {
121121
return delegate().asMap();
122122
}

android/guava/src/com/google/common/cache/ForwardingLoadingCache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* @since 11.0
3434
*/
3535
@GwtIncompatible
36+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
3637
public abstract class ForwardingLoadingCache<K, V> extends ForwardingCache<K, V>
3738
implements LoadingCache<K, V> {
3839

@@ -65,8 +66,6 @@ public V apply(K key) {
6566
return delegate().apply(key);
6667
}
6768

68-
@GwtIncompatible
69-
@J2ktIncompatible
7069
@Override
7170
public void refresh(K key) {
7271
delegate().refresh(key);

guava/src/com/google/common/cache/AbstractLoadingCache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
* @since 11.0
4141
*/
4242
@GwtIncompatible
43+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
4344
public abstract class AbstractLoadingCache<K, V> extends AbstractCache<K, V>
4445
implements LoadingCache<K, V> {
4546

@@ -73,8 +74,6 @@ public final V apply(K key) {
7374
}
7475

7576
@Override
76-
@GwtIncompatible
77-
@J2ktIncompatible
7877
public void refresh(K key) {
7978
throw new UnsupportedOperationException();
8079
}

guava/src/com/google/common/cache/ForwardingCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
* @since 10.0
3535
*/
3636
@GwtIncompatible
37+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
3738
public abstract class ForwardingCache<K, V> extends ForwardingObject implements Cache<K, V> {
3839

3940
/** Constructor for use by subclasses. */
@@ -116,7 +117,6 @@ public CacheStats stats() {
116117
}
117118

118119
@Override
119-
@J2ktIncompatible
120120
public ConcurrentMap<K, V> asMap() {
121121
return delegate().asMap();
122122
}

guava/src/com/google/common/cache/ForwardingLoadingCache.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* @since 11.0
3434
*/
3535
@GwtIncompatible
36+
@J2ktIncompatible // Compiles fine, but hidden for safety because the tests have not been ported
3637
public abstract class ForwardingLoadingCache<K, V> extends ForwardingCache<K, V>
3738
implements LoadingCache<K, V> {
3839

@@ -65,8 +66,6 @@ public V apply(K key) {
6566
return delegate().apply(key);
6667
}
6768

68-
@GwtIncompatible
69-
@J2ktIncompatible
7069
@Override
7170
public void refresh(K key) {
7271
delegate().refresh(key);

0 commit comments

Comments
 (0)