aboutsummaryrefslogtreecommitdiff
path: root/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
diff options
context:
space:
mode:
authorcpovirk <cpovirk@google.com>2019-10-03 12:11:16 -0700
committerChris Povirk <beigetangerine@gmail.com>2019-10-04 12:12:19 -0400
commita76d68fdcb08c9f5bde0ad2d143d0e8682f807eb (patch)
treef048bbdee1f7d0b11cfefa505fb7276389504a22 /jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
parent3bac6e0866acfd92eb126bcd6c6c355bd37af855 (diff)
downloadjimfs-a76d68fdcb08c9f5bde0ad2d143d0e8682f807eb.tar.gz
Mostly migrate off jsr305.
- Mostly migrate to Checker Framework declaration annotations. - Migrate @GuardedBy to a custom annotation for now. (We would migrate to Error Prone's, but that's causing me problems as I experiment with JPMS.) Compare to b/69411537 for Guava. I've left @ParametersAreNonnullByDefault in place for now, but we'd need to remove it to fully eliminate the jsr305 dep. RELNOTES=Migrated from jsr305 `@Nullable` to Checker Framework `@NullableDecl`. In addition to the new dependency on the Checker Framework annotations, we keep the dependency on jsr305 for now so that we can keep using `@ParametersAreNonNullByDefault`. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=272713254
Diffstat (limited to 'jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java')
-rw-r--r--jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
index d102746..3408639 100644
--- a/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
+++ b/jimfs/src/main/java/com/google/common/jimfs/OwnerAttributeProvider.java
@@ -26,7 +26,7 @@ import java.nio.file.attribute.FileAttributeView;
import java.nio.file.attribute.FileOwnerAttributeView;
import java.nio.file.attribute.UserPrincipal;
import java.util.Map;
-import javax.annotation.Nullable;
+import org.checkerframework.checker.nullness.compatqual.NullableDecl;
/**
* Attribute provider that provides the {@link FileOwnerAttributeView} ("owner").
@@ -65,7 +65,7 @@ final class OwnerAttributeProvider extends AttributeProvider {
return ImmutableMap.of("owner:owner", owner);
}
- @Nullable
+ @NullableDecl
@Override
public Object get(File file, String attribute) {
if (attribute.equals("owner")) {