diff options
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/util')
3 files changed, 27 insertions, 27 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/util/HttpClient.java b/src/main/java/io/trygvis/esper/testing/util/HttpClient.java index 420a949..9596fd1 100755 --- a/src/main/java/io/trygvis/esper/testing/util/HttpClient.java +++ b/src/main/java/io/trygvis/esper/testing/util/HttpClient.java @@ -10,6 +10,7 @@ import org.apache.http.params.*; import org.codehaus.httpcache4j.*; import org.codehaus.httpcache4j.cache.*; import org.codehaus.httpcache4j.resolver.*; +import org.slf4j.*; import java.io.*; import java.net.*; @@ -18,6 +19,8 @@ import static java.lang.System.*; public class HttpClient<A> { + private static final Logger logger = LoggerFactory.getLogger(HttpClient.class); + private final HTTPCache http; private final F<HTTPResponse, Option<A>> f; @@ -26,25 +29,25 @@ public class HttpClient<A> { this.f = f; } - public static <A> HttpClient<A> httpClient(HTTPCache http, final F<InputStream, Option<A>> f) { - return new HttpClient<>(http, new F<HTTPResponse, Option<A>>() { + public static <A> F<HTTPResponse, Option<A>> inputStreamOnly(final F<InputStream, Option<A>> f) { + return new F<HTTPResponse, Option<A>>() { @Override public Option<A> f(HTTPResponse response) { return f.f(response.getPayload().getInputStream()); } - }); + }; } public Option<A> fetch(URI uri) throws IOException { HTTPResponse response = null; try { - System.out.println("Fetching " + uri); - long start = currentTimeMillis(); +// logger.debug("Fetching " + uri); +// long start = currentTimeMillis(); response = http.execute(new HTTPRequest(uri)); - long end = currentTimeMillis(); +// long end = currentTimeMillis(); int code = response.getStatus().getCode(); - System.out.println("Fetched in " + (end - start) + "ms. Status: " + code); +// logger.debug("Fetched in " + (end - start) + "ms. Status: " + code); if (code != 200) { throw new IOException("Did not get 200 back, got " + code); @@ -88,7 +91,7 @@ public class HttpClient<A> { } public HTTPResponse resolve(HTTPRequest request) throws IOException { - System.out.println(request.getRequestURI() + ": Executing"); + logger.debug(request.getRequestURI() + ": Executing"); long start = currentTimeMillis(); Status status = null; try { @@ -106,7 +109,7 @@ public class HttpClient<A> { s += "with exception"; } - System.out.println(s); + logger.debug(s); } } diff --git a/src/main/java/io/trygvis/esper/testing/util/XmlHttpClient.java b/src/main/java/io/trygvis/esper/testing/util/XmlHttpClient.java index dc3b46f..7e5e298 100755 --- a/src/main/java/io/trygvis/esper/testing/util/XmlHttpClient.java +++ b/src/main/java/io/trygvis/esper/testing/util/XmlHttpClient.java @@ -6,22 +6,16 @@ import org.codehaus.httpcache4j.cache.*; import org.jdom2.*; import java.io.*; -import java.net.*; -public class XmlHttpClient { - - private final HttpClient<Document> httpClient; +public class XmlHttpClient extends HttpClient<Document> { public XmlHttpClient(HTTPCache http) { - final XmlParser parser = new XmlParser(); - httpClient = HttpClient.httpClient(http, new F<InputStream, Option<Document>>() { + super(http, HttpClient.inputStreamOnly(new F<InputStream, Option<Document>>() { + final XmlParser parser = new XmlParser(); + public Option<Document> f(InputStream inputStream) { return parser.parseDocument(inputStream); } - }); - } - - public Option<Document> fetch(URI uri) throws IOException { - return httpClient.fetch(uri); + })); } } diff --git a/src/main/java/io/trygvis/esper/testing/util/XmlParser.java b/src/main/java/io/trygvis/esper/testing/util/XmlParser.java index e1b463f..9c585fc 100755 --- a/src/main/java/io/trygvis/esper/testing/util/XmlParser.java +++ b/src/main/java/io/trygvis/esper/testing/util/XmlParser.java @@ -1,16 +1,20 @@ package io.trygvis.esper.testing.util; import fj.data.*; -import static fj.data.Option.*; -import static javax.xml.stream.XMLStreamConstants.*; import org.h2.util.*; import org.jdom2.*; import org.jdom2.input.*; +import org.slf4j.*; -import java.io.*; import javax.xml.stream.*; +import java.io.*; + +import static fj.data.Option.*; +import static javax.xml.stream.XMLStreamConstants.*; public class XmlParser { + private static final Logger logger = LoggerFactory.getLogger(XmlParser.class); + public static boolean debugXml; private final XMLInputFactory xmlInputFactory; @@ -29,10 +33,9 @@ public class XmlParser { ByteArrayOutputStream buffer = new ByteArrayOutputStream(); IOUtils.copy(stream, buffer); byte[] bytes = buffer.toByteArray(); - System.out.println("------------------------------------------------"); - System.out.write(bytes); - System.out.println(); - System.out.println("------------------------------------------------"); + logger.debug("------------------------------------------------"); + logger.debug(new String(bytes, "utf-8")); + logger.debug("------------------------------------------------"); stream = new ByteArrayInputStream(bytes); } |