diff options
49 files changed, 129 insertions, 129 deletions
diff --git a/robolectric-annotations/build.gradle b/robolectric-annotations/build.gradle index 9d11c8052..3b5f4ec24 100644 --- a/robolectric-annotations/build.gradle +++ b/robolectric-annotations/build.gradle @@ -5,6 +5,6 @@ new RoboJavaModulePlugin( dependencies { // Compile dependencies compile project(":shadow-api") - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" compileOnly AndroidSdk.MAX_SDK.coordinates }
\ No newline at end of file diff --git a/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java b/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java index c275b38c0..6a98011f5 100644 --- a/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java +++ b/robolectric-annotations/src/main/java/org/robolectric/annotation/Config.java @@ -2,7 +2,7 @@ package org.robolectric.annotation; import android.app.Application; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.lang.annotation.Annotation; import java.lang.annotation.Documented; @@ -367,7 +367,7 @@ public @interface Config { return libraries; } - @NotNull @Override + @Nonnull @Override public Class<? extends Annotation> annotationType() { return Config.class; } diff --git a/robolectric-junit/build.gradle b/robolectric-junit/build.gradle index ea0b3986e..5d215f842 100644 --- a/robolectric-junit/build.gradle +++ b/robolectric-junit/build.gradle @@ -8,6 +8,6 @@ dependencies { compile project(":robolectric-sandbox") compile project(":shadow-api") - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" compileOnly "junit:junit:4.12" }
\ No newline at end of file diff --git a/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java b/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java index 09ee33806..8f7bb88ad 100644 --- a/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java +++ b/robolectric-junit/src/main/java/org/robolectric/internal/SandboxTestRunner.java @@ -1,6 +1,6 @@ package org.robolectric.internal; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; @@ -43,12 +43,12 @@ public class SandboxTestRunner extends BlockJUnit4ClassRunner { interceptors = new Interceptors(findInterceptors()); } - @NotNull + @Nonnull protected Collection<Interceptor> findInterceptors() { return Collections.emptyList(); } - @NotNull + @Nonnull protected Interceptors getInterceptors() { return interceptors; } @@ -117,7 +117,7 @@ public class SandboxTestRunner extends BlockJUnit4ClassRunner { } } - @NotNull + @Nonnull protected Sandbox getSandbox(FrameworkMethod method) { InstrumentationConfiguration instrumentationConfiguration = createClassLoaderConfig(method); URLClassLoader systemClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader(); @@ -135,7 +135,7 @@ public class SandboxTestRunner extends BlockJUnit4ClassRunner { * @param method the test method that's about to run * @return an {@link InstrumentationConfiguration} */ - @NotNull + @Nonnull protected InstrumentationConfiguration createClassLoaderConfig(FrameworkMethod method) { InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder() .doNotAcquirePackage("java.") @@ -249,7 +249,7 @@ public class SandboxTestRunner extends BlockJUnit4ClassRunner { } } - @NotNull + @Nonnull protected Class<?>[] getExtraShadows(FrameworkMethod method) { List<Class<?>> shadowClasses = new ArrayList<>(); addShadows(shadowClasses, getTestClass().getAnnotation(SandboxConfig.class)); @@ -267,7 +267,7 @@ public class SandboxTestRunner extends BlockJUnit4ClassRunner { return ShadowMap.EMPTY; } - @NotNull + @Nonnull protected ClassHandler createClassHandler(ShadowMap shadowMap, Sandbox sandbox) { return new ShadowWrangler(shadowMap, 0, interceptors); } diff --git a/robolectric-processor/build.gradle b/robolectric-processor/build.gradle index b413c9cee..d4fcf69d2 100644 --- a/robolectric-processor/build.gradle +++ b/robolectric-processor/build.gradle @@ -9,7 +9,7 @@ dependencies { // Compile dependencies compile "com.google.guava:guava:20.0" - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" compile files("${System.properties['java.home']}/../lib/tools.jar") // Testing dependencies diff --git a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java b/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java index 7e016ff42..3fdc3e8a5 100644 --- a/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java +++ b/robolectric-processor/src/test/java/org/robolectric/annotation/processing/generator/ShadowProviderGeneratorTest.java @@ -1,6 +1,6 @@ package org.robolectric.annotation.processing.generator; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.robolectric.annotation.Implements; @@ -57,7 +57,7 @@ public class ShadowProviderGeneratorTest { return shadowType; } - @NotNull + @Nonnull private ExecutableElement element(String reset) { ExecutableElement resetterExecutable = mock(ExecutableElement.class); Name mock = mock(Name.class); diff --git a/robolectric-resources/build.gradle b/robolectric-resources/build.gradle index 85e05f760..fd5490997 100644 --- a/robolectric-resources/build.gradle +++ b/robolectric-resources/build.gradle @@ -9,7 +9,7 @@ dependencies { // Compile dependencies compile "com.google.guava:guava:20.0" - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" // Testing dependencies testCompile "junit:junit:4.12" diff --git a/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java b/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java index cc2df1cdb..020e0391a 100644 --- a/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java +++ b/robolectric-resources/src/main/java/org/robolectric/manifest/AndroidManifest.java @@ -1,7 +1,7 @@ package org.robolectric.manifest; import com.google.common.base.Preconditions; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; import org.robolectric.res.FsFile; import org.robolectric.res.ResourcePath; import org.robolectric.res.ResourceTable; diff --git a/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java b/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java index 321217553..03fe20a2b 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/AttributeResource.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; public class AttributeResource { public static final String ANDROID_RES_NS_PREFIX = "http://schemas.android.com/apk/res/"; @@ -9,16 +9,16 @@ public class AttributeResource { public static final String NULL_VALUE = "@null"; public static final String EMPTY_VALUE = "@empty"; - public final @NotNull ResName resName; - public final @NotNull String value; - public final @NotNull String contextPackageName; + public final @Nonnull ResName resName; + public final @Nonnull String value; + public final @Nonnull String contextPackageName; private final Integer referenceResId; - public AttributeResource(@NotNull ResName resName, @NotNull String value, @NotNull String contextPackageName) { + public AttributeResource(@Nonnull ResName resName, @Nonnull String value, @Nonnull String contextPackageName) { this(resName, value, contextPackageName, null); } - public AttributeResource(@NotNull ResName resName, @NotNull String value, @NotNull String contextPackageName, Integer referenceResId) { + public AttributeResource(@Nonnull ResName resName, @Nonnull String value, @Nonnull String contextPackageName, Integer referenceResId) { this.referenceResId = referenceResId; if (!resName.type.equals("attr")) throw new IllegalStateException("\"" + resName.getFullyQualifiedName() + "\" unexpected"); @@ -31,7 +31,7 @@ public class AttributeResource { return isResourceReference(value); } - public @NotNull ResName getResourceReference() { + public @Nonnull ResName getResourceReference() { if (!isResourceReference()) throw new RuntimeException("not a resource reference: " + this); return ResName.qualifyResName(value.substring(1).replace("+", ""), contextPackageName, "style"); } @@ -66,7 +66,7 @@ public class AttributeResource { return value.startsWith("@") && !isNull(value); } - public static @NotNull ResName getResourceReference(String value, String defPackage, String defType) { + public static @Nonnull ResName getResourceReference(String value, String defPackage, String defType) { if (!isResourceReference(value)) throw new IllegalArgumentException("not a resource reference: " + value); return ResName.qualifyResName(value.substring(1).replace("+", ""), defPackage, defType); } diff --git a/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java b/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java index 5ee541e64..cd24e8be9 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/DocumentLoader.java @@ -1,10 +1,10 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; public abstract class DocumentLoader { private static final FsFile.Filter ENDS_WITH_XML = new FsFile.Filter() { - @Override public boolean accept(@NotNull FsFile fsFile) { + @Override public boolean accept(@Nonnull FsFile fsFile) { return fsFile.getName().endsWith(".xml"); } }; diff --git a/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java b/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java index 43c74c8f7..8fbacd6b5 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/FileFsFile.java @@ -1,7 +1,7 @@ package org.robolectric.res; import com.google.common.annotations.VisibleForTesting; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.util.Util; import java.io.BufferedInputStream; @@ -176,7 +176,7 @@ public class FileFsFile implements FsFile { * @param paths Array of path components. * @return New FileFsFile. */ - @NotNull + @Nonnull public static FileFsFile from(String... paths) { File file = null; for (String path : paths) { diff --git a/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java b/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java index 0f929b231..618571b63 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/FsFile.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.io.IOException; import java.io.InputStream; @@ -39,6 +39,6 @@ public interface FsFile { String getPath(); public interface Filter { - boolean accept(@NotNull FsFile fsFile); + boolean accept(@Nonnull FsFile fsFile); } } diff --git a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java b/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java index 627a176fe..f6c2386cc 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/PackageResourceTable.java @@ -2,7 +2,7 @@ package org.robolectric.res; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.res.builder.XmlBlock; import java.io.IOException; @@ -49,7 +49,7 @@ public class PackageResourceTable implements ResourceTable { } @Override - public TypedResource getValue(@NotNull ResName resName, String qualifiers) { + public TypedResource getValue(@Nonnull ResName resName, String qualifiers) { return resources.get(resName, qualifiers); } diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java b/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java index a583fcf20..5dd68fbd0 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/ResBunch.java @@ -2,7 +2,7 @@ package org.robolectric.res; import java.util.LinkedHashMap; import java.util.Map; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; public class ResBunch { private final Map<String, ResBundle> types = new LinkedHashMap<>(); @@ -21,7 +21,7 @@ public class ResBunch { return bundle; } - public TypedResource get(@NotNull ResName resName, String qualifiers) { + public TypedResource get(@Nonnull ResName resName, String qualifiers) { ResBundle bundle = getBundle(resName.type); return bundle.get(resName, qualifiers); } diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResName.java b/robolectric-resources/src/main/java/org/robolectric/res/ResName.java index 5b72a06bc..102043ef4 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/ResName.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/ResName.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import java.io.File; import java.util.regex.Matcher; @@ -14,13 +14,13 @@ public class ResName { private static final int TYPE = 2; private static final int NAME = 3; - public final @NotNull String packageName; - public final @NotNull String type; - public final @NotNull String name; + public final @Nonnull String packageName; + public final @Nonnull String type; + public final @Nonnull String name; public final int hashCode; - public ResName(@NotNull String packageName, @NotNull String type, @NotNull String name) { + public ResName(@Nonnull String packageName, @Nonnull String type, @Nonnull String name) { this.packageName = packageName; this.type = type.trim(); this.name = name.indexOf('.') != -1 ? name.replace('.', '_').trim() : name.trim(); @@ -28,7 +28,7 @@ public class ResName { hashCode = computeHashCode(); } - public ResName(@NotNull String fullyQualifiedName) { + public ResName(@Nonnull String fullyQualifiedName) { Matcher matcher = FQN_PATTERN.matcher(fullyQualifiedName.trim()); if (!matcher.find()) { throw new IllegalStateException("\"" + fullyQualifiedName + "\" is not fully qualified"); @@ -45,16 +45,16 @@ public class ResName { /** * @return null if the resource could not be qualified. */ - public static String qualifyResourceName(@NotNull String possiblyQualifiedResourceName, String defaultPackageName, String defaultType) { + public static String qualifyResourceName(@Nonnull String possiblyQualifiedResourceName, String defaultPackageName, String defaultType) { ResName resName = qualifyResName(possiblyQualifiedResourceName, defaultPackageName, defaultType); return resName != null ? resName.getFullyQualifiedName() : null; } - public static ResName qualifyResName(@NotNull String possiblyQualifiedResourceName, ResName defaults) { + public static ResName qualifyResName(@Nonnull String possiblyQualifiedResourceName, ResName defaults) { return qualifyResName(possiblyQualifiedResourceName, defaults.packageName, defaults.type); } - public static ResName qualifyResName(@NotNull String possiblyQualifiedResourceName, String defaultPackageName, String defaultType) { + public static ResName qualifyResName(@Nonnull String possiblyQualifiedResourceName, String defaultPackageName, String defaultType) { int indexOfColon = possiblyQualifiedResourceName.indexOf(':'); int indexOfSlash = possiblyQualifiedResourceName.indexOf('/'); String type = null; @@ -101,7 +101,7 @@ public class ResName { return fullyQualifiedResourceName.replaceAll("[@+]", ""); } - public static ResName qualifyFromFilePath(@NotNull final String packageName, @NotNull final String filePath) { + public static ResName qualifyFromFilePath(@Nonnull final String packageName, @Nonnull final String filePath) { final FileFsFile filePathFile = new FileFsFile(new File(filePath)); final String type = filePathFile.getParent().getName().split("-")[0]; final String name = filePathFile.getBaseName(); diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResType.java b/robolectric-resources/src/main/java/org/robolectric/res/ResType.java index 42f998d8f..97eb4cef2 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/ResType.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/ResType.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; import java.util.regex.Pattern; diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java b/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java index a2c77bb84..ab1467926 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/ResourceMerger.java @@ -1,13 +1,13 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.manifest.AndroidManifest; import java.util.ArrayList; import java.util.List; public class ResourceMerger { - @NotNull + @Nonnull public PackageResourceTable buildResourceTable(AndroidManifest appManifest) { ResourceRemapper resourceRemapper = new ResourceRemapper(appManifest.getRClass()); diff --git a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java b/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java index adf2e1454..62d7e3fd0 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/ResourceTable.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.res.builder.XmlBlock; import java.io.InputStream; @@ -13,7 +13,7 @@ public interface ResourceTable { TypedResource getValue(int resId, String qualifiers); - TypedResource getValue(@NotNull ResName resName, String qualifiers) ; + TypedResource getValue(@Nonnull ResName resName, String qualifiers) ; XmlBlock getXml(ResName resName, String qualifiers); diff --git a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java b/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java index a77a04ee8..9a731f9aa 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/RoutingResourceTable.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.res.builder.XmlBlock; import java.io.InputStream; @@ -23,7 +23,7 @@ public class RoutingResourceTable implements ResourceTable { return getRawValue(getResName(resId), qualifiers); } - @Override public TypedResource getValue(@NotNull ResName resName, String qualifiers) { + @Override public TypedResource getValue(@Nonnull ResName resName, String qualifiers) { return pickFor(resName).getValue(resName, qualifiers); } diff --git a/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java b/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java index c47b34040..4b755a223 100644 --- a/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java +++ b/robolectric-resources/src/main/java/org/robolectric/res/builder/XmlBlock.java @@ -1,6 +1,6 @@ package org.robolectric.res.builder; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; import org.robolectric.res.FsFile; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/robolectric-sandbox/build.gradle b/robolectric-sandbox/build.gradle index 1476a2fa1..44684f179 100644 --- a/robolectric-sandbox/build.gradle +++ b/robolectric-sandbox/build.gradle @@ -11,7 +11,7 @@ dependencies { compile "org.ow2.asm:asm:5.0.1" compile "org.ow2.asm:asm-commons:5.0.1" compile "com.google.guava:guava:20.0" - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" testCompile "junit:junit:4.12" testCompile "org.assertj:assertj-core:2.6.0" diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java index 2125c255c..8727f9415 100644 --- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java +++ b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/Interceptor.java @@ -1,6 +1,6 @@ package org.robolectric.internal.bytecode; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.util.Function; import org.robolectric.util.ReflectionHelpers; @@ -22,7 +22,7 @@ public abstract class Interceptor { abstract public MethodHandle getMethodHandle(String methodName, MethodType type) throws NoSuchMethodException, IllegalAccessException; - @NotNull + @Nonnull protected static Function<Object, Object> returnDefaultValue(final MethodSignature methodSignature) { return new Function<Object, Object>() { @Override diff --git a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java index ac847a072..8b1904208 100644 --- a/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java +++ b/robolectric-sandbox/src/main/java/org/robolectric/internal/bytecode/SandboxClassLoader.java @@ -1,6 +1,6 @@ package org.robolectric.internal.bytecode; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.FieldVisitor; @@ -369,7 +369,7 @@ public class SandboxClassLoader extends URLClassLoader implements Opcodes { doSpecialHandling(); } - @NotNull + @Nonnull private Set<String> instrumentMethods() { Set<String> foundMethods = new HashSet<>(); List<MethodNode> methods = new ArrayList<>(classNode.methods); diff --git a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java index 3448a0a48..1d9ec5038 100644 --- a/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java +++ b/robolectric-sandbox/src/test/java/org/robolectric/SandboxClassLoaderTest.java @@ -1,6 +1,6 @@ package org.robolectric; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; @@ -590,7 +590,7 @@ public class SandboxClassLoaderTest { return m.invoke(shadow.directlyOn(instance, (Class<Object>) theClass)); } - @NotNull + @Nonnull private InstrumentationConfiguration.Builder configureBuilder() { InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder(); builder.doNotAcquirePackage("java.") diff --git a/robolectric-shadows/shadows-core/build.gradle b/robolectric-shadows/shadows-core/build.gradle index c28ed2987..657e81215 100644 --- a/robolectric-shadows/shadows-core/build.gradle +++ b/robolectric-shadows/shadows-core/build.gradle @@ -49,7 +49,7 @@ dependencies { compile project(":robolectric-utils") // Compile dependencies - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" compile "com.almworks.sqlite4java:sqlite4java:0.282" compileOnly(AndroidSdk.MAX_SDK.coordinates) { force = true } compile "com.ibm.icu:icu4j:53.1" diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java index 14a2ecde0..26587d657 100644 --- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java +++ b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowActivityThread.java @@ -3,7 +3,7 @@ package org.robolectric.shadows; import android.app.ActivityThread; import android.content.pm.PackageManager; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -30,7 +30,7 @@ public class ShadowActivityThread { } return Proxy.newProxyInstance(classLoader, new Class[]{iPackageManagerClass}, new InvocationHandler() { @Override - public Object invoke(Object proxy, @NotNull Method method, Object[] args) throws Exception { + public Object invoke(Object proxy, @Nonnull Method method, Object[] args) throws Exception { if (method.getName().equals("getApplicationInfo")) { String packageName = (String) args[0]; int flags = (Integer) args[1]; diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java index 815c30e75..768a77514 100644 --- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java +++ b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowAssetManager.java @@ -8,7 +8,7 @@ import android.content.res.XmlResourceParser; import android.os.ParcelFileDescriptor; import android.util.AttributeSet; import android.util.TypedValue; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.RuntimeEnvironment; import org.robolectric.android.XmlResourceParserImpl; import org.robolectric.annotation.HiddenApi; @@ -612,7 +612,7 @@ public final class ShadowAssetManager { return resolveStyle(getResName(resId), themeStyleSet); } - private Style resolveStyle(@NotNull ResName themeStyleName, Style themeStyleSet) { + private Style resolveStyle(@Nonnull ResName themeStyleName, Style themeStyleSet) { TypedResource themeStyleResource = resourceTable.getValue(themeStyleName, RuntimeEnvironment.getQualifiers()); if (themeStyleResource == null) return null; StyleData themeStyleData = (StyleData) themeStyleResource.getData(); @@ -816,7 +816,7 @@ public final class ShadowAssetManager { return typedArray; } - private AttributeResource findAttributeValue(int resId, AttributeSet attributeSet, Style styleAttrStyle, Style defStyleFromAttr, Style defStyleFromRes, @NotNull Style themeStyleSet) { + private AttributeResource findAttributeValue(int resId, AttributeSet attributeSet, Style styleAttrStyle, Style defStyleFromAttr, Style defStyleFromRes, @Nonnull Style themeStyleSet) { if (attributeSet != null) { for (int i = 0; i < attributeSet.getAttributeCount(); i++) { if (attributeSet.getAttributeNameResource(i) == resId && attributeSet.getAttributeValue(i) != null) { @@ -860,7 +860,7 @@ public final class ShadowAssetManager { return themeStyleSet.getAttrValue(attrName); } - @NotNull private ResName getResName(int id) { + @Nonnull private ResName getResName(int id) { ResName resName = resourceTable.getResName(id); if (resName == null) { throw new Resources.NotFoundException("Unable to find resource ID #0x" + Integer.toHexString(id) diff --git a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java index 995bce965..f1d45afa5 100644 --- a/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java +++ b/robolectric-shadows/shadows-core/src/main/java/org/robolectric/shadows/ShadowCanvas.java @@ -8,8 +8,8 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.Rect; import android.graphics.RectF; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; diff --git a/robolectric/build.gradle b/robolectric/build.gradle index ce9dfd544..8be8bef3d 100644 --- a/robolectric/build.gradle +++ b/robolectric/build.gradle @@ -31,7 +31,7 @@ dependencies { // Compile dependencies compile "org.bouncycastle:bcprov-jdk16:1.46" compile "com.thoughtworks.xstream:xstream:1.4.8" - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" compile "org.apache.ant:ant:1.8.0" compile("org.apache.maven:maven-ant-tasks:2.1.3") { diff --git a/robolectric/src/main/java/org/robolectric/ConfigMerger.java b/robolectric/src/main/java/org/robolectric/ConfigMerger.java index 353d41543..8682fef87 100644 --- a/robolectric/src/main/java/org/robolectric/ConfigMerger.java +++ b/robolectric/src/main/java/org/robolectric/ConfigMerger.java @@ -1,8 +1,8 @@ package org.robolectric; import com.google.common.annotations.VisibleForTesting; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.robolectric.annotation.Config; import org.robolectric.util.Join; @@ -93,7 +93,7 @@ public class ConfigMerger { } } - @NotNull @VisibleForTesting + @Nonnull @VisibleForTesting List<String> packageHierarchyOf(Class<?> javaClass) { Package aPackage = javaClass.getPackage(); String testPackageName = aPackage == null ? "" : aPackage.getName(); @@ -107,7 +107,7 @@ public class ConfigMerger { return packageHierarchy; } - @NotNull + @Nonnull private List<Class> parentClassesFor(Class testClass) { List<Class> testClassHierarchy = new ArrayList<>(); while (testClass != null && !testClass.equals(Object.class)) { diff --git a/robolectric/src/main/java/org/robolectric/ParameterizedRobolectricTestRunner.java b/robolectric/src/main/java/org/robolectric/ParameterizedRobolectricTestRunner.java index 12c2d6021..d2ab59b5c 100644 --- a/robolectric/src/main/java/org/robolectric/ParameterizedRobolectricTestRunner.java +++ b/robolectric/src/main/java/org/robolectric/ParameterizedRobolectricTestRunner.java @@ -1,6 +1,6 @@ package org.robolectric; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Assert; import org.junit.runner.Runner; import org.junit.runners.Parameterized; @@ -99,7 +99,7 @@ public final class ParameterizedRobolectricTestRunner extends Suite { validateOnlyOneConstructor(errors); } - @NotNull + @Nonnull @Override protected SdkEnvironment getSandbox(FrameworkMethod method) { SdkEnvironment sandbox = super.getSandbox(method); diff --git a/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java b/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java index 5fc62829d..6cbf1024a 100644 --- a/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java +++ b/robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java @@ -3,7 +3,7 @@ package org.robolectric; import android.app.Application; import android.os.Build; import java.io.InputStream; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Ignore; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.InitializationError; @@ -125,7 +125,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { * @since 2.3 */ @Override - @NotNull + @Nonnull protected ClassHandler createClassHandler(ShadowMap shadowMap, Sandbox sandbox) { return new ShadowWrangler(shadowMap, ((SdkEnvironment) sandbox).getSdkConfig().getApiLevel(), getInterceptors()); } @@ -138,7 +138,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { * @return an {@link ConfigMerger}. * @since 3.2 */ - @NotNull + @Nonnull private ConfigMerger createConfigMerger() { return new ConfigMerger(); } @@ -151,13 +151,13 @@ public class RobolectricTestRunner extends SandboxTestRunner { * @return an {@link SdkPicker}. * @since 3.2 */ - @NotNull + @Nonnull protected SdkPicker createSdkPicker() { return new SdkPicker(); } @Override - @NotNull // todo + @Nonnull // todo protected Collection<Interceptor> findInterceptors() { return AndroidInterceptors.all(); } @@ -172,7 +172,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { * @deprecated Override {@link #createClassLoaderConfig(FrameworkMethod)} instead */ @Deprecated - @NotNull + @Nonnull public InstrumentationConfiguration createClassLoaderConfig(Config config) { FrameworkMethod method = ((MethodPassThrough) config).method; Builder builder = new InstrumentationConfiguration.Builder(super.createClassLoaderConfig(method)); @@ -184,7 +184,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { /** * {@inheritDoc} */ - @NotNull + @Nonnull protected InstrumentationConfiguration createClassLoaderConfig(final FrameworkMethod method) { return createClassLoaderConfig(new Config.Builder(((RobolectricFrameworkMethod) method).config) { @Override @@ -201,7 +201,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { * * @return a class which implements {@link TestLifecycle}. This implementation returns a {@link DefaultTestLifecycle}. */ - @NotNull + @Nonnull protected Class<? extends TestLifecycle> getTestLifecycleClass() { return DefaultTestLifecycle.class; } @@ -234,7 +234,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { /** * Returns the ResourceProvider for the compile time SDK. */ - @NotNull + @Nonnull private static PackageResourceTable getCompiletimeSdkResourceTable() { if (compiletimeSdkResourceTable == null) { ResourceTableFactory resourceTableFactory = new ResourceTableFactory(); @@ -256,7 +256,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { } @Override - @NotNull + @Nonnull protected SdkEnvironment getSandbox(FrameworkMethod method) { RobolectricFrameworkMethod roboMethod = (RobolectricFrameworkMethod) method; SdkConfig sdkConfig = roboMethod.sdkConfig; @@ -412,7 +412,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { return new Config.Builder().build(); } - @NotNull + @Nonnull protected Class<?>[] getExtraShadows(FrameworkMethod frameworkMethod) { Config config = ((RobolectricFrameworkMethod) frameworkMethod).config; return config.shadows(); @@ -495,14 +495,14 @@ public class RobolectricTestRunner extends SandboxTestRunner { } static class RobolectricFrameworkMethod extends FrameworkMethod { - private final @NotNull AndroidManifest appManifest; - final @NotNull SdkConfig sdkConfig; - final @NotNull Config config; + private final @Nonnull AndroidManifest appManifest; + final @Nonnull SdkConfig sdkConfig; + final @Nonnull Config config; private boolean includeApiLevelInName = true; TestLifecycle testLifecycle; ParallelUniverseInterface parallelUniverseInterface; - RobolectricFrameworkMethod(@NotNull Method method, @NotNull AndroidManifest appManifest, @NotNull SdkConfig sdkConfig, @NotNull Config config) { + RobolectricFrameworkMethod(@Nonnull Method method, @Nonnull AndroidManifest appManifest, @Nonnull SdkConfig sdkConfig, @Nonnull Config config) { super(method); this.appManifest = appManifest; this.sdkConfig = sdkConfig; @@ -521,7 +521,7 @@ public class RobolectricTestRunner extends SandboxTestRunner { includeApiLevelInName = false; } - @NotNull + @Nonnull public AndroidManifest getAppManifest() { return appManifest; } diff --git a/robolectric/src/main/java/org/robolectric/SdkPicker.java b/robolectric/src/main/java/org/robolectric/SdkPicker.java index 76a907b9b..a5c9ae1b9 100644 --- a/robolectric/src/main/java/org/robolectric/SdkPicker.java +++ b/robolectric/src/main/java/org/robolectric/SdkPicker.java @@ -2,8 +2,8 @@ package org.robolectric; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.robolectric.annotation.Config; import org.robolectric.annotation.internal.ConfigUtils; import org.robolectric.internal.SdkConfig; @@ -48,7 +48,7 @@ public class SdkPicker { * @return the list of {@link SdkConfig}s. * @since 3.2 */ - @NotNull + @Nonnull public List<SdkConfig> selectSdks(Config config, AndroidManifest appManifest) { Set<SdkConfig> sdks = new TreeSet<>(configuredSdks(config, appManifest)); Set<SdkConfig> enabledSdks = enumerateEnabledSdks(); @@ -125,7 +125,7 @@ public class SdkPicker { } } - @NotNull + @Nonnull protected Set<SdkConfig> sdkRange(int minSdk, int maxSdk) { if (maxSdk < minSdk) { throw new IllegalArgumentException("minSdk=" + minSdk + " is greater than maxSdk=" + maxSdk); @@ -146,7 +146,7 @@ public class SdkPicker { return sdkConfigs; } - @NotNull + @Nonnull private static List<SdkConfig> map(Collection<Integer> supportedSdks) { ArrayList<SdkConfig> sdkConfigs = new ArrayList<>(); for (int supportedSdk : supportedSdks) { @@ -155,7 +155,7 @@ public class SdkPicker { return sdkConfigs; } - @NotNull + @Nonnull private static List<SdkConfig> map(int[] supportedSdks) { ArrayList<SdkConfig> sdkConfigs = new ArrayList<>(); for (int supportedSdk : supportedSdks) { diff --git a/robolectric/src/main/java/org/robolectric/android/AndroidInterceptors.java b/robolectric/src/main/java/org/robolectric/android/AndroidInterceptors.java index 2ded0b4fd..4b9a7aad3 100644 --- a/robolectric/src/main/java/org/robolectric/android/AndroidInterceptors.java +++ b/robolectric/src/main/java/org/robolectric/android/AndroidInterceptors.java @@ -1,7 +1,7 @@ package org.robolectric.android; import android.content.Context; -import org.jetbrains.annotations.Nullable; +import javax.annotation.Nullable; import org.robolectric.internal.bytecode.Interceptor; import org.robolectric.internal.bytecode.MethodRef; import org.robolectric.internal.bytecode.MethodSignature; diff --git a/robolectric/src/main/java/org/robolectric/internal/SandboxFactory.java b/robolectric/src/main/java/org/robolectric/internal/SandboxFactory.java index 5596d4af4..afd090b7b 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SandboxFactory.java +++ b/robolectric/src/main/java/org/robolectric/internal/SandboxFactory.java @@ -1,6 +1,6 @@ package org.robolectric.internal; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.internal.bytecode.InstrumentationConfiguration; import org.robolectric.internal.bytecode.SandboxClassLoader; import org.robolectric.internal.dependency.DependencyResolver; @@ -43,7 +43,7 @@ public class SandboxFactory { return sdkEnvironment; } - @NotNull + @Nonnull public ClassLoader createClassLoader(InstrumentationConfiguration instrumentationConfig, URL... urls) { URLClassLoader systemClassLoader = (URLClassLoader) ClassLoader.getSystemClassLoader(); return new SandboxClassLoader(systemClassLoader, instrumentationConfig, urls); diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java index 04d50ddce..cbe84c2ce 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java +++ b/robolectric/src/main/java/org/robolectric/internal/SdkConfig.java @@ -1,7 +1,7 @@ package org.robolectric.internal; import android.os.Build; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.internal.dependency.DependencyJar; import org.robolectric.util.Logger; @@ -81,7 +81,7 @@ public class SdkConfig implements Comparable<SdkConfig> { } @Override - public int compareTo(@NotNull SdkConfig o) { + public int compareTo(@Nonnull SdkConfig o) { return apiLevel - o.apiLevel; } diff --git a/robolectric/src/main/java/org/robolectric/internal/SdkEnvironment.java b/robolectric/src/main/java/org/robolectric/internal/SdkEnvironment.java index e890ce23f..2ee7e7926 100644 --- a/robolectric/src/main/java/org/robolectric/internal/SdkEnvironment.java +++ b/robolectric/src/main/java/org/robolectric/internal/SdkEnvironment.java @@ -1,6 +1,6 @@ package org.robolectric.internal; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.internal.bytecode.Sandbox; import org.robolectric.internal.dependency.DependencyResolver; import org.robolectric.res.Fs; @@ -25,7 +25,7 @@ public class SdkEnvironment extends Sandbox { return systemResourceTable; } - @NotNull + @Nonnull private ResourcePath createRuntimeSdkResourcePath(DependencyResolver dependencyResolver) { try { Fs systemResFs = Fs.fromJar(dependencyResolver.getLocalArtifactUrl(sdkConfig.getAndroidSdkDependency())); diff --git a/robolectric/src/test/java/org/robolectric/ConfigTest.java b/robolectric/src/test/java/org/robolectric/ConfigTest.java index b6a621655..533ff9c80 100644 --- a/robolectric/src/test/java/org/robolectric/ConfigTest.java +++ b/robolectric/src/test/java/org/robolectric/ConfigTest.java @@ -1,6 +1,6 @@ package org.robolectric; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Test; import org.robolectric.annotation.Config; @@ -151,7 +151,7 @@ public class ConfigTest { return "sdk=" + Arrays.toString(config.sdk()) + ", minSdk=" + config.minSdk() + ", maxSdk=" + config.maxSdk(); } - @NotNull + @Nonnull private Config overlay(Config.Implementation base, Config.Implementation build) { return new Config.Builder(base).overlay(build).build(); } diff --git a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerMultiApiTest.java b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerMultiApiTest.java index 0b395f17d..1a5208f66 100644 --- a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerMultiApiTest.java +++ b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerMultiApiTest.java @@ -1,7 +1,7 @@ package org.robolectric; import android.os.Build; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.junit.runner.Description; @@ -205,10 +205,10 @@ public class RobolectricTestRunnerMultiApiTest { /////////////////////////// - @NotNull + @Nonnull private RobolectricTestRunner runnerOf(Class<?> testClass) throws InitializationError { return new RobolectricTestRunner(testClass) { - @NotNull @Override + @Nonnull @Override protected SdkPicker createSdkPicker() { return sdkPicker; } diff --git a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java index 622a42c19..91a764946 100644 --- a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java +++ b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerSelfTest.java @@ -5,7 +5,7 @@ import android.content.res.Resources; import android.os.Build; import org.assertj.core.api.Assertions; import org.hamcrest.CoreMatchers; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; @@ -124,7 +124,7 @@ public class RobolectricTestRunnerSelfTest { instance = this; } - @NotNull + @Nonnull @Override protected Class<? extends TestLifecycle> getTestLifecycleClass() { return MyTestLifecycle.class; } diff --git a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java index 01077920e..8e8dad231 100644 --- a/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java +++ b/robolectric/src/test/java/org/robolectric/RobolectricTestRunnerTest.java @@ -1,7 +1,7 @@ package org.robolectric; import android.os.Build; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -132,7 +132,7 @@ public class RobolectricTestRunnerTest { super(testClass); } - @NotNull + @Nonnull @Override protected SdkPicker createSdkPicker() { return new SdkPicker(asList(new SdkConfig(JELLY_BEAN)), new Properties()); diff --git a/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java b/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java index d03c23675..af3daa787 100644 --- a/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java +++ b/robolectric/src/test/java/org/robolectric/TestRunnerSequenceTest.java @@ -1,7 +1,7 @@ package org.robolectric; import android.app.Application; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -133,13 +133,13 @@ public class TestRunnerSequenceTest { super(testClass); } - @NotNull + @Nonnull @Override protected SdkPicker createSdkPicker() { return new SdkPicker(singletonList(new SdkConfig(JELLY_BEAN)), new Properties()); } - @NotNull + @Nonnull @Override protected InstrumentationConfiguration createClassLoaderConfig(FrameworkMethod method) { InstrumentationConfiguration.Builder builder = new InstrumentationConfiguration.Builder(super.createClassLoaderConfig(method)); @@ -152,7 +152,7 @@ public class TestRunnerSequenceTest { return new AndroidManifest(resourceFile("TestAndroidManifest.xml"), resourceFile("res"), resourceFile("assets")); } - @NotNull + @Nonnull @Override protected Class<? extends TestLifecycle> getTestLifecycleClass() { return MyTestLifecycle.class; } diff --git a/robolectric/src/test/java/org/robolectric/android/FailureListener.java b/robolectric/src/test/java/org/robolectric/android/FailureListener.java index 3efeaf426..3872a0c9b 100644 --- a/robolectric/src/test/java/org/robolectric/android/FailureListener.java +++ b/robolectric/src/test/java/org/robolectric/android/FailureListener.java @@ -1,6 +1,6 @@ package org.robolectric.android; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunListener; import org.junit.runner.notification.RunNotifier; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; public class FailureListener extends RunListener { - @NotNull + @Nonnull public static List<Failure> runTests(Class<?> testClass) throws InitializationError { RunNotifier notifier = new RunNotifier(); FailureListener failureListener = new FailureListener(); diff --git a/robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidSandboxClassLoaderTest.java b/robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidSandboxClassLoaderTest.java index 98ba5b62e..3c3744abe 100644 --- a/robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidSandboxClassLoaderTest.java +++ b/robolectric/src/test/java/org/robolectric/internal/bytecode/AndroidSandboxClassLoaderTest.java @@ -1,7 +1,7 @@ package org.robolectric.internal.bytecode; import android.os.Build; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; import org.robolectric.android.AndroidInterceptors; @@ -30,7 +30,7 @@ public class AndroidSandboxClassLoaderTest { //////////////////////// - @NotNull + @Nonnull private InstrumentationConfiguration.Builder configureBuilder() { InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder(); builder.doNotAcquirePackage("java."); diff --git a/robolectric/src/test/java/org/robolectric/res/FileFsFileTest.java b/robolectric/src/test/java/org/robolectric/res/FileFsFileTest.java index 091ed0a26..f2c38c0b8 100644 --- a/robolectric/src/test/java/org/robolectric/res/FileFsFileTest.java +++ b/robolectric/src/test/java/org/robolectric/res/FileFsFileTest.java @@ -5,7 +5,7 @@ import java.util.ArrayList; import java.util.List; import edu.emory.mathcs.backport.java.util.Collections; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -85,7 +85,7 @@ public class FileFsFileTest { return parts; } - @NotNull + @Nonnull private String safe(String path) { return path.replace("/", File.separator); } diff --git a/robolectric/src/test/java/org/robolectric/res/ResBundleTest.java b/robolectric/src/test/java/org/robolectric/res/ResBundleTest.java index 88aad2656..038047b38 100644 --- a/robolectric/src/test/java/org/robolectric/res/ResBundleTest.java +++ b/robolectric/src/test/java/org/robolectric/res/ResBundleTest.java @@ -1,6 +1,6 @@ package org.robolectric.res; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.junit.Before; import org.junit.Test; @@ -195,7 +195,7 @@ public class ResBundleTest { return createStringTypedResource("title from resourceLoader1", qualifiers); } - @NotNull + @Nonnull private static TypedResource<String> createStringTypedResource(String str, String qualifiers) { XmlContext mockXmlContext = mock(XmlContext.class); when(mockXmlContext.getQualifiers()).thenReturn(qualifiers); diff --git a/robolectric/src/test/java/org/robolectric/util/TestUtil.java b/robolectric/src/test/java/org/robolectric/util/TestUtil.java index 0bdf309c4..8ae54e0e7 100644 --- a/robolectric/src/test/java/org/robolectric/util/TestUtil.java +++ b/robolectric/src/test/java/org/robolectric/util/TestUtil.java @@ -1,7 +1,7 @@ package org.robolectric.util; import android.app.Application; -import org.jetbrains.annotations.NotNull; +import javax.annotation.Nonnull; import org.robolectric.R; import org.robolectric.annotation.Config; import org.robolectric.internal.SdkConfig; @@ -104,7 +104,7 @@ public abstract class TestUtil { return SYSTEM_RESOURCE_PATH; } - @NotNull + @Nonnull public static ResourcePath sdkResources(int apiLevel) { Fs sdkResFs = Fs.fromJar(new MavenDependencyResolver().getLocalArtifactUrl(new SdkConfig(apiLevel).getAndroidSdkDependency())); return new ResourcePath(null, sdkResFs.join("res"), null, null); diff --git a/shadow-api/build.gradle b/shadow-api/build.gradle index e0d974818..91e904dcd 100644 --- a/shadow-api/build.gradle +++ b/shadow-api/build.gradle @@ -4,7 +4,7 @@ new RoboJavaModulePlugin( dependencies { // Compile dependencies - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" // Testing dependencies testCompile "junit:junit:4.12" diff --git a/testutil/build.gradle b/testutil/build.gradle index c58c274ae..ce17e4a7e 100644 --- a/testutil/build.gradle +++ b/testutil/build.gradle @@ -3,7 +3,7 @@ new RoboJavaModulePlugin().apply(project) dependencies { // Compile dependencies compileOnly "junit:junit:4.12" - compileOnly "com.intellij:annotations:12.0" + compileOnly "com.google.code.findbugs:jsr305:3.0.1" // Testing dependencies } |