diff options
Diffstat (limited to 'guava/src/com/google/common/collect/ArrayTable.java')
| -rw-r--r-- | guava/src/com/google/common/collect/ArrayTable.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/guava/src/com/google/common/collect/ArrayTable.java b/guava/src/com/google/common/collect/ArrayTable.java index 1fce76244..411ee6335 100644 --- a/guava/src/com/google/common/collect/ArrayTable.java +++ b/guava/src/com/google/common/collect/ArrayTable.java @@ -21,13 +21,13 @@ import static com.google.common.base.Preconditions.checkElementIndex; import static com.google.common.base.Preconditions.checkNotNull; import static java.util.Collections.emptyMap; -import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Objects; import com.google.common.collect.Maps.IteratorBasedAbstractMap; import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.DoNotCall; +import com.google.errorprone.annotations.concurrent.LazyInit; import com.google.j2objc.annotations.WeakOuter; import java.io.Serializable; import java.lang.reflect.Array; @@ -89,7 +89,6 @@ import org.checkerframework.checker.nullness.qual.Nullable; * @author Jared Levy * @since 10.0 */ -@Beta @GwtCompatible(emulated = true) @ElementTypesAreNonnullByDefault public final class ArrayTable<R, C, V> extends AbstractTable<R, C, @Nullable V> @@ -662,7 +661,7 @@ public final class ArrayTable<R, C, V> extends AbstractTable<R, C, @Nullable V> return columnKeyToIndex.keySet(); } - @CheckForNull private transient ColumnMap columnMap; + @LazyInit @CheckForNull private transient ColumnMap columnMap; @Override public Map<C, Map<R, @Nullable V>> columnMap() { @@ -757,7 +756,7 @@ public final class ArrayTable<R, C, V> extends AbstractTable<R, C, @Nullable V> return rowKeyToIndex.keySet(); } - @CheckForNull private transient RowMap rowMap; + @LazyInit @CheckForNull private transient RowMap rowMap; @Override public Map<R, Map<C, @Nullable V>> rowMap() { |