You are viewing a plain text version of this content. The canonical link for it is here.
Posted to droids-commits@incubator.apache.org by th...@apache.org on 2010/04/30 11:57:08 UTC
svn commit: r939647 - in
/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids:
api/AdvancedManagedContentEntity.java
protocol/http/AdvancedHttpContentEntity.java
protocol/http/AdvancedHttpProtocol.java protocol/http/HttpProtocol.java
Author: thorsten
Date: Fri Apr 30 11:57:08 2010
New Revision: 939647
URL: http://svn.apache.org/viewvc?rev=939647&view=rev
Log:
DROIDS-75
Reporter: Richard Frovarp
Patch: Richard Frovarp
review: thorsten
Added:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/AdvancedManagedContentEntity.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpContentEntity.java
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpProtocol.java
Modified:
incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
Added: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/AdvancedManagedContentEntity.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/AdvancedManagedContentEntity.java?rev=939647&view=auto
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/AdvancedManagedContentEntity.java (added)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/api/AdvancedManagedContentEntity.java Fri Apr 30 11:57:08 2010
@@ -0,0 +1,36 @@
+package org.apache.droids.api;
+
+import java.util.Set;
+
+/**
+ * Handler that provides metadata information.
+ *
+ */
+public interface AdvancedManagedContentEntity extends ManagedContentEntity {
+
+ /**
+ * Get metadata value
+ * @param key value to get
+ * @return value, null if not found
+ */
+ public String getValue(String key);
+
+ /**
+ * Retrieve set of valid keys.
+ * @return set of valid metadata keys
+ */
+ public Set<String> metadataKeySet();
+
+ /**
+ * Checks for existence of metadata key
+ * @param key key to test
+ * @return true if key exists
+ */
+ public boolean containsMetadataKey(String key);
+
+ /**
+ * Returns the content length if known
+ * @return number of bytes, negative if unknown
+ */
+ public long getContentLength();
+}
Added: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpContentEntity.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpContentEntity.java?rev=939647&view=auto
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpContentEntity.java (added)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpContentEntity.java Fri Apr 30 11:57:08 2010
@@ -0,0 +1,50 @@
+package org.apache.droids.protocol.http;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.droids.api.AdvancedManagedContentEntity;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+
+public class AdvancedHttpContentEntity extends HttpContentEntity implements
+ AdvancedManagedContentEntity {
+
+ private Map<String,String> metadata = new HashMap<String,String>();
+ private long contentLength;
+
+ public AdvancedHttpContentEntity(HttpEntity entity) throws IOException {
+ super(entity);
+ }
+
+ public AdvancedHttpContentEntity(HttpEntity entity, Header[] allHeaders) throws IOException {
+ super(entity);
+ for(Header h : allHeaders) {
+ metadata.put(h.getName(), h.getValue());
+ }
+ contentLength = entity.getContentLength();
+ }
+
+ @Override
+ public boolean containsMetadataKey(String key) {
+ return metadata.containsKey(key);
+ }
+
+ @Override
+ public String getValue(String key) {
+ return metadata.get(key);
+ }
+
+ @Override
+ public Set<String> metadataKeySet() {
+ return metadata.keySet();
+ }
+
+ @Override
+ public long getContentLength() {
+ return this.contentLength;
+ }
+
+}
Added: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpProtocol.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpProtocol.java?rev=939647&view=auto
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpProtocol.java (added)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/AdvancedHttpProtocol.java Fri Apr 30 11:57:08 2010
@@ -0,0 +1,46 @@
+package org.apache.droids.protocol.http;
+
+import java.io.IOException;
+import java.net.URI;
+
+import org.apache.droids.api.AdvancedManagedContentEntity;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.HttpResponseException;
+import org.apache.http.client.methods.HttpGet;
+
+public class AdvancedHttpProtocol extends HttpProtocol {
+
+ public AdvancedHttpProtocol(HttpClient httpclient) {
+ super(httpclient);
+ }
+
+ public AdvancedHttpProtocol() {
+ super();
+ }
+
+ @Override
+ public AdvancedManagedContentEntity load(URI uri) throws IOException {
+ HttpGet httpget = new HttpGet(uri);
+ HttpResponse response = getHttpClient().execute(httpget);
+ StatusLine statusline = response.getStatusLine();
+ if (statusline.getStatusCode() >= HttpStatus.SC_BAD_REQUEST) {
+ httpget.abort();
+ throw new HttpResponseException(
+ statusline.getStatusCode(), statusline.getReasonPhrase());
+ }
+ HttpEntity entity = response.getEntity();
+ if (entity == null) {
+ // Should _almost_ never happen with HTTP GET requests.
+ throw new ClientProtocolException("Empty entity");
+ }
+ return new AdvancedHttpContentEntity(entity,response.getAllHeaders());
+ }
+}
+
+
+
Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java?rev=939647&r1=939646&r2=939647&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/protocol/http/HttpProtocol.java Fri Apr 30 11:57:08 2010
@@ -150,5 +150,9 @@ public class HttpProtocol extends Loggab
public void setForceAllow(boolean forceAllow) {
this.forceAllow = forceAllow;
}
+
+ protected HttpClient getHttpClient() {
+ return this.httpclient;
+ }
}