Author: adc
Date: Tue Sep 13 01:35:22 2011
New Revision: 1170004
URL: http://svn.apache.org/viewvc?rev=1170004&view=rev
Log:
Updated some bits for S3/EC2 code.
Modified:
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
Modified:
mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java?rev=1170004&r1=1170003&r2=1170004&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
(original)
+++ mina/sandbox/adc/ahc/api/src/main/java/org/apache/ahc/api/HttpRequest.java
Tue Sep 13 01:35:22 2011
@@ -28,7 +28,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.ahc.HttpHeaders;
import org.apache.ahc.api.mime.MimeContent;
-import org.apache.ahc.api.mime.MimeListener;
+import org.apache.ahc.api.mime.MimeContentListener;
/**
@@ -40,7 +40,7 @@ public abstract class HttpRequest implem
private HttpVerb verb;
private HttpHeaders headers;
private final List<MimeContent> mimeContent = new ArrayList<MimeContent>();
- private final List<MimeListener> listeners = new ArrayList<MimeListener>();
+ private final List<MimeContentListener> listeners = new
ArrayList<MimeContentListener>();
private int timeout;
private TimeUnit timeUnit;
@@ -48,7 +48,7 @@ public abstract class HttpRequest implem
{
}
- public HttpRequest(URL url, HttpVerb verb, HttpHeaders headers,
List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout,
TimeUnit timeUnit)
+ public HttpRequest(URL url, HttpVerb verb, HttpHeaders headers,
List<MimeContent> mimeContent, List<MimeContentListener> listeners, int
timeout, TimeUnit timeUnit)
{
try
{
@@ -116,13 +116,6 @@ public abstract class HttpRequest implem
return mimeContent;
}
- public HttpRequest addMimeContent(MimeContent content)
- {
- mimeContent.add(content);
-
- return this;
- }
-
public HttpRequest addMimeContent(MimeContent... contentSet)
{
mimeContent.addAll(Arrays.asList(contentSet));
@@ -148,14 +141,14 @@ public abstract class HttpRequest implem
return this;
}
- public List<MimeListener> getListeners()
+ public List<MimeContentListener> getListeners()
{
return listeners;
}
- public HttpRequest addMimeContentListener(MimeListener listener)
+ public HttpRequest addMimeListeners(MimeContentListener...
contentListenerSet)
{
- listeners.add(listener);
+ listeners.addAll(Arrays.asList(contentListenerSet));
return this;
}
Modified:
mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java?rev=1170004&r1=1170003&r2=1170004&view=diff
==============================================================================
--- mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
(original)
+++ mina/sandbox/adc/ahc/api/src/test/java/org/apache/ahc/api/ClientTest.java
Tue Sep 13 01:35:22 2011
@@ -205,7 +205,7 @@ public class ClientTest
HttpResponse response = mock(HttpResponse.class);
when(request.setUrl(any(URL.class))).thenReturn(request);
-
when(request.addMimeContentListener(any(MimeListener.class))).thenReturn(request);
+
when(request.addMimeListeners(any(MimeContentListener.class))).thenReturn(request);
when(client.send(any(HttpRequest.class))).thenReturn(future);
when(future.get()).thenReturn(response);
@@ -213,14 +213,8 @@ public class ClientTest
* Start of test
*/
request.setUrl(new
URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245";))
- .addMimeContentListener(new MimeListener()
+ .addMimeListeners(new MimeContentListener()
{
- public MimeContentListener content(String name, String
fileName, String contentType, int contentSize)
- {
- return new MimeContentListener()
- {
- }; //Todo change body of implemented methods use File
| Settings | File Templates.
- }
});
HttpResponse hr = client.send(request).get();
@@ -240,7 +234,7 @@ public class ClientTest
HttpResponse response = mock(HttpResponse.class);
when(request.setUrl(any(URL.class))).thenReturn(request);
-
when(request.addMimeContentListener(any(MimeListener.class))).thenReturn(request);
+
when(request.addMimeListeners(any(MimeContentListener.class))).thenReturn(request);
when(client.send(any(HttpRequest.class))).thenReturn(future);
when(future.get()).thenReturn(response);
@@ -248,14 +242,8 @@ public class ClientTest
* Start of test
*/
request.setUrl(new
URL("http://rest.acme.com/rest/student/41134?token=dFWEGV8ss63dmcs0245";))
- .addMimeContentListener(new MimeListener()
+ .addMimeListeners(new MimeContentListener()
{
- public MimeContentListener content(String name, String
fileName, String contentType, int contentSize)
- {
- return new MimeContentListener()
- {
- }; //Todo change body of implemented methods use File
| Settings | File Templates.
- }
});
HttpResponse hr = client.send(request).get();
Modified:
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
URL:
http://svn.apache.org/viewvc/mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java?rev=1170004&r1=1170003&r2=1170004&view=diff
==============================================================================
---
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
(original)
+++
mina/sandbox/adc/ahc/mina2/src/main/java/org/apache/ahc/mina2/AsyncHttpRequest.java
Tue Sep 13 01:35:22 2011
@@ -29,7 +29,7 @@ import org.apache.ahc.api.HttpListener;
import org.apache.ahc.api.HttpRequest;
import org.apache.ahc.api.HttpVerb;
import org.apache.ahc.api.mime.MimeContent;
-import org.apache.ahc.api.mime.MimeListener;
+import org.apache.ahc.api.mime.MimeContentListener;
/**
@@ -43,7 +43,7 @@ public class AsyncHttpRequest extends Ht
{
}
- public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers,
List<MimeContent> mimeContent, List<MimeListener> listeners, int timeout,
TimeUnit timeUnit)
+ public AsyncHttpRequest(URL url, HttpVerb verb, HttpHeaders headers,
List<MimeContent> mimeContent, List<MimeContentListener> listeners, int
timeout, TimeUnit timeUnit)
{
super(url, verb, headers, mimeContent, listeners, timeout, timeUnit);
}
