Remove Callback suffix from UploadProgress interface

Author: kevinsawicki

lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java

@@ -381,7 +381,7 @@ public static void setConnectionFactory(final ConnectionFactory connectionFactor
  /**
  * Callback interface for reporting upload progress for a request.
  */
- public interface UploadProgressCallback {
+ public interface UploadProgress {
 
  /**
  * Callback invoked as data is uploaded by the request.
@@ -392,7 +392,7 @@ public interface UploadProgressCallback {
  */
  void onUpload(int uploaded, int total);
 
- UploadProgressCallback DEFAULT = new UploadProgressCallback() {
+ UploadProgress DEFAULT = new UploadProgress() {
  public void onUpload(int uploaded, int total) {
  }
  };
@@ -1418,7 +1418,7 @@ public String run() {
 
  private int httpProxyPort;
 
- private UploadProgressCallback progress = UploadProgressCallback.DEFAULT;
+ private UploadProgress progress = UploadProgress.DEFAULT;
 
  /**
  * Create HTTP connection wrapper
@@ -2603,14 +2603,14 @@ public HttpRequest run() throws IOException {
  }
 
  /**
- * Set the UploadProgressCallback for this request
+ * Set the UploadProgress for this request
  *
  * @param callback
  * @return this request
  */
- public HttpRequest progress(final UploadProgressCallback callback) {
+ public HttpRequest progress(final UploadProgress callback) {
  if (callback == null)
- progress = UploadProgressCallback.DEFAULT;
+ progress = UploadProgress.DEFAULT;
  else
  progress = callback;
  return this;

lib/src/test/java/com/github/kevinsawicki/http/HttpRequestTest.java

@@ -43,7 +43,7 @@
 import static org.junit.Assert.fail;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 import com.github.kevinsawicki.http.HttpRequest.ConnectionFactory;
-import com.github.kevinsawicki.http.HttpRequest.UploadProgressCallback;
+import com.github.kevinsawicki.http.HttpRequest.UploadProgress;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
@@ -3466,7 +3466,7 @@ public void handle(Request request, HttpServletResponse response) {
  * @throws Exception
  */
  @Test
- public void uploadProgressCallbackSend() throws Exception {
+ public void uploadProgressSend() throws Exception {
  final AtomicReference<String> body = new AtomicReference<String>();
  handler = new RequestHandler() {
 
@@ -3480,7 +3480,7 @@ public void handle(Request request, HttpServletResponse response) {
  new FileWriter(file).append("hello").close();
 
  final AtomicInteger tx = new AtomicInteger(0);
- UploadProgressCallback progress = new UploadProgressCallback() {
+ UploadProgress progress = new UploadProgress() {
  public void onUpload(int transferred, int total) {
  assertEquals(file.length(), total);
  assertEquals(tx.incrementAndGet(), transferred);
@@ -3496,7 +3496,7 @@ public void onUpload(int transferred, int total) {
  * @throws Exception
  */
  @Test
- public void uploadProgressCallbackSendInputStream() throws Exception {
+ public void uploadProgressSendInputStream() throws Exception {
  final AtomicReference<String> body = new AtomicReference<String>();
  handler = new RequestHandler() {
 
@@ -3510,7 +3510,7 @@ public void handle(Request request, HttpServletResponse response) {
  new FileWriter(file).append("hello").close();
  InputStream input = new FileInputStream(file);
  final AtomicInteger tx = new AtomicInteger(0);
- UploadProgressCallback progress = new UploadProgressCallback() {
+ UploadProgress progress = new UploadProgress() {
  public void onUpload(int transferred, int total) {
  assertEquals(0, total);
  assertEquals(tx.incrementAndGet(), transferred);
@@ -3526,7 +3526,7 @@ public void onUpload(int transferred, int total) {
  * @throws Exception
  */
  @Test
- public void uploadProgressCallbackSendReader() throws Exception {
+ public void uploadProgressSendReader() throws Exception {
  final AtomicReference<String> body = new AtomicReference<String>();
  handler = new RequestHandler() {
 
@@ -3538,7 +3538,7 @@ public void handle(Request request, HttpServletResponse response) {
  };
 
  final AtomicInteger tx = new AtomicInteger(0);
- UploadProgressCallback progress = new UploadProgressCallback() {
+ UploadProgress progress = new UploadProgress() {
  public void onUpload(int transferred, int total) {
  assertEquals(-1, total);
  assertEquals(tx.incrementAndGet(), transferred);
@@ -3556,7 +3556,7 @@ public void onUpload(int transferred, int total) {
  * @throws Exception
  */
  @Test
- public void nullUploadProgressCallback() throws Exception {
+ public void nullUploadProgress() throws Exception {
  final AtomicReference<String> body = new AtomicReference<String>();
  handler = new RequestHandler() {