From 2a85e792f80fb85b08c194e00c4d6425dfcae5f2 Mon Sep 17 00:00:00 2001 From: eguven Date: Mon, 26 Mar 2018 07:26:27 -0700 Subject: [PATCH] Rename Cache getContentMetadataSnapshot to getContentMetadata And in ContentMetadata javadoc emphasize that it's a snapshot. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=190461436 --- .../com/google/android/exoplayer2/upstream/cache/Cache.java | 6 +++--- .../exoplayer2/upstream/cache/CachedContentIndex.java | 4 ++-- .../android/exoplayer2/upstream/cache/ContentMetadata.java | 2 +- .../android/exoplayer2/upstream/cache/SimpleCache.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java index 5071163969..584939fdc7 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java @@ -257,10 +257,10 @@ public interface Cache { throws CacheException; /** - * Returns a snapshot of the {@link ContentMetadata} for the given key. + * Returns a {@link ContentMetadata} for the given key. * * @param key The cache key for the data. - * @return A snapshot of the {@link ContentMetadata} for the given key. + * @return A {@link ContentMetadata} for the given key. */ - ContentMetadata getContentMetadataSnapshot(String key); + ContentMetadata getContentMetadata(String key); } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java index d59af5b69f..32de9fa9c9 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CachedContentIndex.java @@ -227,8 +227,8 @@ import javax.crypto.spec.SecretKeySpec; cachedContent.applyMetadataMutations(mutations); } - /** Returns a snapshot of the {@link ContentMetadata} for the given key. */ - public ContentMetadata getContentMetadataSnapshot(String key) { + /** Returns a {@link ContentMetadata} for the given key. */ + public ContentMetadata getContentMetadata(String key) { CachedContent cachedContent = get(key); return cachedContent != null ? cachedContent.getMetadata() : DefaultContentMetadata.EMPTY; } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java index ac3864e366..190b9f6f38 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/ContentMetadata.java @@ -15,7 +15,7 @@ */ package com.google.android.exoplayer2.upstream.cache; -/** Interface for accessing cached content metadata which is stored as name, value pairs. */ +/** Interface for an immutable snapshot of keyed metadata. */ public interface ContentMetadata { /** diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java index 7e92bd153b..147689e329 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java @@ -466,7 +466,7 @@ public final class SimpleCache implements Cache { } @Override - public ContentMetadata getContentMetadataSnapshot(String key) { - return index.getContentMetadataSnapshot(key); + public ContentMetadata getContentMetadata(String key) { + return index.getContentMetadata(key); } }