changed back to non-streaming result handling because of socket-read hiccups

jexp · jexp · commit 45e6c45eaf95 · 2012-08-06T14:04:47.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.6.1</slf4j.version>
-        <neo4j.version>1.8-SNAPSHOT</neo4j.version>
+        <neo4j.version>1.8.M06</neo4j.version>
         <jersey.version>1.4</jersey.version>
         <blueprints.version>1.2</blueprints.version>
         <gremlin.version>1.5</gremlin.version>
@@ -87,8 +87,25 @@ the relevant Commercial Agreement.
         <dependency>
           <groupId>org.codehaus.jackson</groupId>
           <artifactId>jackson-jaxrs</artifactId>
-          <version>1.8.3</version>
+          <version>1.8.5</version>
         </dependency>
+        <!--dependency>
+        	<groupId>com.sun.jersey.contribs</groupId>
+        	<artifactId>jersey-apache-client4</artifactId>
+        	<version>1.9-ea04</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.1.3</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.1.3</version>
+            <scope>compile</scope>
+        </dependency-->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -153,6 +170,10 @@ the relevant Commercial Agreement.
                   <groupId>com.sun.jersey</groupId>
                   <artifactId>jersey-server</artifactId>
               </exclusion>
+              <exclusion>
+                <artifactId>jackson-jaxrs</artifactId>
+                <groupId>org.codehaus.jackson</groupId>
+              </exclusion>
               <exclusion>
                   <groupId>de.huxhorn.lilith</groupId>
                   <artifactId>de.huxhorn.lilith.3rdparty.rrd4j</artifactId>
diff --git a/src/main/java/org/neo4j/rest/graphdb/ExecutingRestRequest.java b/src/main/java/org/neo4j/rest/graphdb/ExecutingRestRequest.java
@@ -66,7 +66,6 @@ protected void addAuthFilter(String username, String password) {
 
     protected Client createClient() {
         Client client = Client.create();
-
         client.setConnectTimeout(CONNECT_TIMEOUT);
         client.setReadTimeout(READ_TIMEOUT);
         client.setChunkedEncodingSize(8*1024);
diff --git a/src/main/java/org/neo4j/rest/graphdb/RequestResult.java b/src/main/java/org/neo4j/rest/graphdb/RequestResult.java
@@ -19,6 +19,7 @@
  */
 package org.neo4j.rest.graphdb;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.util.Map;
@@ -76,8 +77,18 @@ public static RequestResult batchResult(RestOperation restOperation){
     public static RequestResult extractFrom(ClientResponse clientResponse) {
         final int status = clientResponse.getStatus();
         final URI location = clientResponse.getLocation();
-        final InputStream data = status != Response.Status.NO_CONTENT.getStatusCode() ? clientResponse.getEntityInputStream() : null;
-        return new RequestResult(status, uriString(location), data,clientResponse);
+        // final InputStream data;
+        if (status == Response.Status.NO_CONTENT.getStatusCode()) {
+        //    data = null;
+            clientResponse.close();
+            return new RequestResult(status, uriString(location), null,clientResponse);
+        } else {
+        //    data = clientResponse.getEntityInputStream();
+            RequestResult result = new RequestResult(status, uriString(location), clientResponse.getEntity(String.class));
+            clientResponse.close();
+            return result;
+        }
+        //return new RequestResult(status, uriString(location), data,clientResponse);
     }
 
     private static String uriString(URI location) {
@@ -138,11 +149,19 @@ public String getText() {
     }
 
     private void closeStream() {
+        if (stream!=null) readFully(stream);
         stream = null;
         if (response!=null) {
             response.close();
             response = null;
         }
     }
 
+    private void readFully(InputStream stream) {
+        try {
+            while (stream.read()!=-1);
+        } catch (IOException e) {
+            // ignore
+        }
+    }
 }
diff --git a/src/test/java/org/neo4j/rest/graphdb/LocalTestServer.java b/src/test/java/org/neo4j/rest/graphdb/LocalTestServer.java
@@ -25,6 +25,7 @@
 import org.neo4j.server.CommunityNeoServer;
 import org.neo4j.server.configuration.PropertyFileConfigurator;
 import org.neo4j.server.database.Database;
+import org.neo4j.server.database.WrappingDatabase;
 import org.neo4j.server.modules.RESTApiModule;
 import org.neo4j.server.modules.ServerModule;
 import org.neo4j.server.modules.ThirdPartyJAXRSModule;
@@ -100,6 +101,11 @@ protected int getWebServerPort() {
                 return port;
             }
 
+            @Override
+            protected Database createDatabase() {
+                return new WrappingDatabase(graphDatabase);
+            }
+
             @Override
             protected StartupHealthCheck createHealthCheck() {
                 return new StartupHealthCheck();
