am 82462cd0: Make default timeout/retry/multiplier values public
* commit '82462cd0a0d7fa58d5497c39534380ad3987fdd1':
Make default timeout/retry/multiplier values public
diff --git a/build.gradle b/build.gradle
index e88a6c5..9f973c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,21 +5,33 @@
// Any other changes to the build config belong in rules.gradle, which
// is used by projects that depend on Volley but define their own
// tools versions across all dependencies to ensure a consistent build.
+//
+// Most users should just add this line to settings.gradle:
+// include(":volley")
+//
+// If you have a more complicated Gradle setup you can choose to use
+// this instead:
+// include(":volley")
+// project(':volley').buildFileName = 'rules.gradle'
buildscript {
repositories {
- mavenCentral()
+ jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:0.14.+'
+ classpath 'com.android.tools.build:gradle:1.3.1'
}
}
apply plugin: 'com.android.library'
+repositories {
+ jcenter()
+}
+
android {
- compileSdkVersion 19
- buildToolsVersion = '21.1.0'
+ compileSdkVersion 22
+ buildToolsVersion = '22.0.1'
}
apply from: 'rules.gradle'
diff --git a/pom.xml b/pom.xml
index 6b8072e..7c37e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>org.robolectric</groupId>
<artifactId>robolectric</artifactId>
- <version>2.2</version>
+ <version>3.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/rules.gradle b/rules.gradle
index 1ec9ee4..04dd681 100644
--- a/rules.gradle
+++ b/rules.gradle
@@ -1 +1,12 @@
+// See build.gradle for an explanation of what this file is.
+
apply plugin: 'com.android.library'
+
+// Check if the android plugin version supports unit testing.
+if (configurations.findByName("testCompile")) {
+ dependencies {
+ testCompile "junit:junit:4.10"
+ testCompile "org.mockito:mockito-core:1.9.5"
+ testCompile "org.robolectric:robolectric:3.0"
+ }
+}
diff --git a/src/main/java/com/android/volley/Request.java b/src/main/java/com/android/volley/Request.java
index 9832952..5b42d1f 100644
--- a/src/main/java/com/android/volley/Request.java
+++ b/src/main/java/com/android/volley/Request.java
@@ -90,12 +90,6 @@
/** Whether or not a response has been delivered for this request yet. */
private boolean mResponseDelivered = false;
- // A cheap variant of request tracing used to dump slow requests.
- private long mRequestBirthTime = 0;
-
- /** Threshold at which we should log the request (even when debug logging is not enabled). */
- private static final long SLOW_REQUEST_THRESHOLD_MS = 3000;
-
/** The retry policy for this request. */
private RetryPolicy mRetryPolicy;
@@ -209,8 +203,6 @@
public void addMarker(String tag) {
if (MarkerLog.ENABLED) {
mEventLog.add(tag, Thread.currentThread().getId());
- } else if (mRequestBirthTime == 0) {
- mRequestBirthTime = SystemClock.elapsedRealtime();
}
}
@@ -241,11 +233,6 @@
mEventLog.add(tag, threadId);
mEventLog.finish(this.toString());
- } else {
- long requestTime = SystemClock.elapsedRealtime() - mRequestBirthTime;
- if (requestTime >= SLOW_REQUEST_THRESHOLD_MS) {
- VolleyLog.d("%d ms: %s", requestTime, this.toString());
- }
}
}
diff --git a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
index ff687d6..c76d39a 100644
--- a/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
+++ b/src/main/java/com/android/volley/toolbox/DiskBasedCache.java
@@ -22,6 +22,7 @@
import com.android.volley.VolleyLog;
import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
@@ -113,7 +114,7 @@
File file = getFileForKey(key);
CountingInputStream cis = null;
try {
- cis = new CountingInputStream(new FileInputStream(file));
+ cis = new CountingInputStream(new BufferedInputStream(new FileInputStream(file)));
CacheHeader.readHeader(cis); // eat header
byte[] data = streamToBytes(cis, (int) (file.length() - cis.bytesRead));
return entry.toCacheEntry(data);
@@ -196,7 +197,7 @@
pruneIfNeeded(entry.data.length);
File file = getFileForKey(key);
try {
- FileOutputStream fos = new FileOutputStream(file);
+ BufferedOutputStream fos = new BufferedOutputStream(new FileOutputStream(file));
CacheHeader e = new CacheHeader(key, entry);
boolean success = e.writeHeader(fos);
if (!success) {
diff --git a/src/main/java/com/android/volley/toolbox/HurlStack.java b/src/main/java/com/android/volley/toolbox/HurlStack.java
index 31d57f0..1be202e 100644
--- a/src/main/java/com/android/volley/toolbox/HurlStack.java
+++ b/src/main/java/com/android/volley/toolbox/HurlStack.java
@@ -23,6 +23,7 @@
import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
import org.apache.http.ProtocolVersion;
import org.apache.http.StatusLine;
import org.apache.http.entity.BasicHttpEntity;
@@ -115,7 +116,9 @@
StatusLine responseStatus = new BasicStatusLine(protocolVersion,
connection.getResponseCode(), connection.getResponseMessage());
BasicHttpResponse response = new BasicHttpResponse(responseStatus);
- response.setEntity(entityFromConnection(connection));
+ if (hasResponseBody(request.getMethod(), responseStatus.getStatusCode())) {
+ response.setEntity(entityFromConnection(connection));
+ }
for (Entry<String, List<String>> header : connection.getHeaderFields().entrySet()) {
if (header.getKey() != null) {
Header h = new BasicHeader(header.getKey(), header.getValue().get(0));
@@ -126,6 +129,20 @@
}
/**
+ * Checks if a response message contains a body.
+ * @see <a href="https://tools.ietf.org/html/rfc7230#section-3.3">RFC 7230 section 3.3</a>
+ * @param requestMethod request method
+ * @param responseCode response status code
+ * @return whether the response has a body
+ */
+ private static boolean hasResponseBody(int requestMethod, int responseCode) {
+ return requestMethod != Request.Method.HEAD
+ && !(HttpStatus.SC_CONTINUE <= responseCode && responseCode < HttpStatus.SC_OK)
+ && responseCode != HttpStatus.SC_NO_CONTENT
+ && responseCode != HttpStatus.SC_NOT_MODIFIED;
+ }
+
+ /**
* Initializes an {@link HttpEntity} from the given {@link HttpURLConnection}.
* @param connection
* @return an HttpEntity populated with data from <code>connection</code>.
diff --git a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
index 8bd98aa..917ddb4 100644
--- a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
+++ b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
@@ -8,7 +8,7 @@
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
import org.robolectric.RobolectricTestRunner;
import static org.junit.Assert.*;
@@ -20,7 +20,7 @@
@Before public void setUp() throws Exception {
mMockImageLoader = new MockImageLoader();
- mNIV = new NetworkImageView(Robolectric.application);
+ mNIV = new NetworkImageView(RuntimeEnvironment.application);
}
@Test public void setImageUrl_requestsImage() {
