diff --git a/io/src/main/java/retrofit/internal/Objects.java b/io/src/main/java/retrofit/internal/Objects.java deleted file mode 100644 index 68c9224d3947c20a395a1036ed86a933ade1f2f8..0000000000000000000000000000000000000000 --- a/io/src/main/java/retrofit/internal/Objects.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2010 Square, Inc. -package retrofit.internal; - -/** - * Object utility methods. - * - * @author Bob Lee (bob@squareup.com) - */ -public class Objects { - - /** - * Returns t unless it's null. - * - * @throws NullPointerException if t is null - */ - public static T nonNull(T t, String name) { - if (t == null) throw new NullPointerException(name); - return t; - } -} diff --git a/io/src/main/java/retrofit/io/AbstractTypedBytes.java b/io/src/main/java/retrofit/io/AbstractTypedBytes.java index e1cb7df7b51f0b5a6ec75bf0a9dc44c60b51a127..1456da9ab01c0c4b53d320d4a23b5f681d8a0278 100644 --- a/io/src/main/java/retrofit/io/AbstractTypedBytes.java +++ b/io/src/main/java/retrofit/io/AbstractTypedBytes.java @@ -1,8 +1,6 @@ // Copyright 2010 Square, Inc. package retrofit.io; -import retrofit.internal.Objects; - import java.io.Serializable; /** @@ -21,7 +19,8 @@ public abstract class AbstractTypedBytes implements TypedBytes, Serializable { * @throws NullPointerException if mimeType is null */ public AbstractTypedBytes(MimeType mimeType) { - this.mimeType = Objects.nonNull(mimeType, "mimeType"); + if (mimeType == null) throw new NullPointerException("mimeType"); + this.mimeType = mimeType; } public MimeType mimeType() { diff --git a/io/src/main/java/retrofit/io/TypedByteArray.java b/io/src/main/java/retrofit/io/TypedByteArray.java index 728bdcf19c2fd60c3d9f607fc05f5c4c0a21b5fb..69c35580299d5a0ea3672952e5b6dadcd10dba3a 100644 --- a/io/src/main/java/retrofit/io/TypedByteArray.java +++ b/io/src/main/java/retrofit/io/TypedByteArray.java @@ -1,8 +1,6 @@ // Copyright 2010 Square, Inc. package retrofit.io; -import retrofit.internal.Objects; - import java.io.IOException; import java.io.OutputStream; import java.util.Arrays; @@ -24,7 +22,8 @@ public class TypedByteArray extends AbstractTypedBytes { */ public TypedByteArray(byte[] bytes, MimeType mimeType) { super(mimeType); - this.bytes = Objects.nonNull(bytes, "bytes"); + if (bytes == null) throw new NullPointerException("bytes"); + this.bytes = bytes; } public void writeTo(OutputStream out) throws IOException { diff --git a/io/src/main/java/retrofit/io/TypedFile.java b/io/src/main/java/retrofit/io/TypedFile.java index 98d98eabdf14f59c9f82503e085fa1e815efb550..948f514a71c63f1312bc289d405cca3521dd0400 100644 --- a/io/src/main/java/retrofit/io/TypedFile.java +++ b/io/src/main/java/retrofit/io/TypedFile.java @@ -1,8 +1,6 @@ // Copyright 2010 Square, Inc. package retrofit.io; -import retrofit.internal.Objects; - import java.io.File; import java.io.IOException; import java.io.OutputStream; @@ -24,7 +22,8 @@ public class TypedFile extends AbstractTypedBytes { */ public TypedFile(File file, MimeType mimeType) { super(mimeType); - this.file = Objects.nonNull(file, "file"); + if (file == null) throw new NullPointerException("file"); + this.file = file; } /** Returns the file. */ diff --git a/io/src/test/java/retrofit/internal/ObjectsTest.java b/io/src/test/java/retrofit/internal/ObjectsTest.java deleted file mode 100644 index c0aa3dfc8991eb11b556100bc7fab2a1e79c62bd..0000000000000000000000000000000000000000 --- a/io/src/test/java/retrofit/internal/ObjectsTest.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2010 Square, Inc. -package retrofit.internal; - -import org.junit.Test; - -import static org.fest.assertions.api.Assertions.assertThat; -import static org.fest.assertions.api.Fail.fail; - -/** @author Eric Burke (eric@squareup.com) */ -public class ObjectsTest { - @Test public void testNonNull() { - Objects.nonNull(10, "whatever"); - String message = "fail"; - try { - Objects.nonNull(null, message); - fail("Expected NullPointerException"); - } catch (NullPointerException expected) { - assertThat(expected.getMessage()).isEqualTo(message); - } - } -}