提交 fadf948f 编写于 作者: J Jake Wharton

Remove use of Objects helper class.

上级 749920a5
// 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> T nonNull(T t, String name) {
if (t == null) throw new NullPointerException(name);
return t;
}
}
// 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() {
......
// 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 {
......
// 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. */
......
// 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);
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册