Skip to content

make use of none httpclient stuff for the stub #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JanVerstuyft wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make use of none httpclient stuff for the stub #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<url>https://github.com/smartrics/RestFixtureLiveDoc</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<smartrics.RestFixture.version>4.4</smartrics.RestFixture.version>
<smartrics.RestFixture.version>4.5-SNAPSHOT</smartrics.RestFixture.version>
</properties>
<licenses>
<license>
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/smartrics/rest/test/fitnesse/drivers/ClientDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,24 @@
*/
package smartrics.rest.test.fitnesse.drivers;

import org.apache.commons.httpclient.HttpClient;

import org.apache.http.impl.client.HttpClientBuilder;
import smartrics.rest.client.RestClient;
import smartrics.rest.client.RestClientImpl;
import smartrics.rest.client.RestRequest;
import smartrics.rest.client.RestRequest.Method;
import smartrics.rest.client.RestResponse;

import java.util.concurrent.TimeUnit;

public class ClientDriver {

public static void main(String[] args) {
postForm(args);
}

public static void postForm(String[] args) {
RestClient c = new RestClientImpl(new HttpClient());
RestClient c = buildRestClient();
RestRequest req = new RestRequest();
req.setBody("name=n&data=d1");
req.setResource("/resources/");
Expand All @@ -45,8 +47,13 @@ public static void postForm(String[] args) {
System.out.println("=======>\n" + res + "\n<=======");
}

private static RestClientImpl buildRestClient() {
return new RestClientImpl(HttpClientBuilder.create()
.setConnectionTimeToLive(60, TimeUnit.MILLISECONDS).build());
}

public static void postXml(String[] args) {
RestClient c = new RestClientImpl(new HttpClient());
RestClient c = buildRestClient();
RestRequest req = new RestRequest();

req.setBody("<resource><name>n</name><data>d1</data></resource>");
Expand Down
23 changes: 12 additions & 11 deletions src/main/java/smartrics/rest/test/fitnesse/fixture/StubsServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@

import static smartrics.rest.test.fitnesse.fixture.ServletUtils.sanitiseUri;

import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.Charset;
import java.util.Enumeration;
import java.util.List;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpParser;

import smartrics.rest.client.RestResponse;

public class StubsServlet extends HttpServlet {
Expand All @@ -55,18 +55,19 @@ protected void service(HttpServletRequest req, HttpServletResponse resp)
if (method.equals("POST") && uri.endsWith("/responses")) {
nextResponse = new RestResponse();
InputStream is = req.getInputStream();
String line = HttpParser.readLine(is, Charset.defaultCharset()
.name());
BufferedReader reader = new BufferedReader(new InputStreamReader(is, Charset.defaultCharset()));
String line = reader.readLine();
String[] incipit = line.split(" ");
nextResponse.setStatusCode(Integer.valueOf(incipit[0]));
Header[] headers = HttpParser.parseHeaders(is, Charset
.defaultCharset().name());
for (Header h : headers) {
nextResponse.addHeader(h.getName(), h.getValue());

Enumeration<String> headerNames = req.getHeaderNames();
while (headerNames.hasMoreElements()) {
String headerName = headerNames.nextElement();
nextResponse.addHeader(headerName, req.getHeader(headerName));
}
line = HttpParser.readLine(is, Charset.defaultCharset().name());
line = reader.readLine();
while (line.trim().length() < 1) {
line = HttpParser.readLine(is, Charset.defaultCharset().name());
line = reader.readLine();
}
// check content length and decide how much body you need to parse
List<smartrics.rest.client.RestData.Header> cl = nextResponse
Expand Down