Log network access via slf4j.

enabler/pom.xml

@@ -23,6 +23,13 @@
 			<version>18.0</version>
 		</dependency>
 
+		<!-- org.slf4j.* -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.12</version>
+		</dependency>
+
 		<!-- javax.annotation.* -->
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
@@ -51,6 +58,14 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!-- org.slf4j.* -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-jdk14</artifactId>
+			<version>1.7.12</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

enabler/src/de/schildbach/pte/AbstractEfaProvider.java

@@ -270,9 +270,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		final CharSequence page = ParserUtils.scrape(uri.toString(), httpPost ? parameters.substring(1) : null, Charsets.UTF_8);
 		final ResultHeader header = new ResultHeader(network, SERVER_PRODUCT);
 
@@ -383,9 +380,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -433,9 +427,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -555,9 +546,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -637,9 +625,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -952,9 +937,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -1512,9 +1494,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -1677,9 +1656,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -2135,9 +2111,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -2174,9 +2147,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 		if (!httpPost)
 			uri.append(parameters);
 
-		// System.out.println(uri);
-		// System.out.println(parameters);
-
 		InputStream is = null;
 		String firstChars = null;
 
@@ -2269,8 +2239,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 
 	private QueryTripsResult queryTrips(final String uri, final InputStream is) throws XmlPullParserException, IOException
 	{
-		// System.out.println(uri);
-
 		final XmlPullParser pp = parserFactory.newPullParser();
 		pp.setInput(is, null);
 		final ResultHeader header = enterItdRequest(pp);
@@ -2855,8 +2823,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 	private QueryTripsResult queryTripsMobile(final String uri, final Location from, final @Nullable Location via, final Location to,
 			final InputStream is) throws XmlPullParserException, IOException
 	{
-		// System.out.println(uri);
-
 		final XmlPullParser pp = parserFactory.newPullParser();
 		pp.setInput(is, null);
 		final ResultHeader header = enterEfa(pp);

enabler/src/de/schildbach/pte/AbstractHafasProvider.java

@@ -369,9 +369,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	{
 		final CharSequence page = ParserUtils.scrape(uri, null, jsonGetStopsEncoding);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		final Matcher mJson = P_AJAX_GET_STOPS_JSON.matcher(page);
 		if (mJson.matches())
 		{
@@ -516,9 +513,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			reader.replace(" <> ", " &#x2194; "); // left-right arrow
 			addCustomReplaces(reader);
 
-			// System.out.println(uri);
-			// ParserUtils.printFromReader(reader);
-
 			final XmlPullParserFactory factory = XmlPullParserFactory.newInstance(System.getProperty(XmlPullParserFactory.PROPERTY_NAME), null);
 			final XmlPullParser pp = factory.newPullParser();
 			pp.setInput(reader);
@@ -873,9 +867,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	{
 		final String request = wrapReqC(conReq, null);
 
-		// System.out.println(request);
-		// ParserUtils.printXml(ParserUtils.scrape(queryEndpoint, request, null, null));
-
 		Reader reader = null;
 		String firstChars = null;
 
@@ -1524,8 +1515,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 		 * Many thanks to Malte Starostik and Robert, who helped a lot with analyzing this API!
 		 */
 
-		// System.out.println(uri);
-
 		LittleEndianDataInputStream is = null;
 
 		try
@@ -2433,9 +2422,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 	{
 		final CharSequence page = ParserUtils.scrape(uri, null, jsonNearbyLocationsEncoding);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final JSONObject head = new JSONObject(page.toString());

enabler/src/de/schildbach/pte/AbstractNavitiaProvider.java

@@ -794,8 +794,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 				+ "&depth=0";
 		final CharSequence page = ParserUtils.scrape(queryUri, authorization);
 
-		// System.out.println(queryUri);
-
 		try
 		{
 			final JSONObject head = new JSONObject(page.toString());
@@ -871,8 +869,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 
 			final CharSequence page = ParserUtils.scrape(queryUri.toString(), authorization);
 
-			// System.out.println(queryUri);
-
 			final JSONObject head = new JSONObject(page.toString());
 
 			final JSONArray departures = head.getJSONArray("departures");
@@ -962,8 +958,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 		final String queryUri = uri() + "places?q=" + ParserUtils.urlEncode(nameCstr) + "&type[]=stop_area&type[]=address" + "&depth=1";
 		final CharSequence page = ParserUtils.scrape(queryUri, authorization);
 
-		// System.out.println(queryUri);
-
 		try
 		{
 			final List<SuggestedLocation> locations = new ArrayList<SuggestedLocation>();
@@ -1085,8 +1079,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 
 				final CharSequence page = ParserUtils.scrape(queryUri.toString(), authorization);
 
-				// System.out.println(queryUri);
-
 				try
 				{
 					final JSONObject head = new JSONObject(page.toString());
@@ -1183,8 +1175,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 		final String queryUri = later ? context.nextQueryUri : context.prevQueryUri;
 		final CharSequence page = ParserUtils.scrape(queryUri, authorization);
 
-		// System.out.println(queryUri);
-
 		try
 		{
 			if (from.isIdentified() && to.isIdentified())
@@ -1222,8 +1212,6 @@ public abstract class AbstractNavitiaProvider extends AbstractNetworkProvider
 		final String queryUri = uri();
 		final CharSequence page = ParserUtils.scrape(queryUri, authorization);
 
-		// System.out.println(queryUri);
-
 		try
 		{
 			// Get shape string.

enabler/src/de/schildbach/pte/InvgProvider.java

@@ -183,9 +183,6 @@ public class InvgProvider extends AbstractHafasProvider
 		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, false, null);
 		final CharSequence page = ParserUtils.scrape(uri.toString());
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		// parse page
 		final Matcher mHeadCoarse = P_DEPARTURES_HEAD_COARSE.matcher(page);
 		if (mHeadCoarse.matches())

enabler/src/de/schildbach/pte/SeptaProvider.java

@@ -169,9 +169,6 @@ public class SeptaProvider extends AbstractHafasProvider
 		appendXmlStationBoardParameters(uri, time, stationId, maxDepartures, false, null);
 		final CharSequence page = ParserUtils.scrape(uri.toString());
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		// parse page
 		final Matcher mPageCoarse = P_DEPARTURES_PAGE_COARSE.matcher(page);
 		if (mPageCoarse.matches())

enabler/src/de/schildbach/pte/VrsProvider.java

@@ -390,9 +390,6 @@ public class VrsProvider extends AbstractNetworkProvider
 
 		final CharSequence page = ParserUtils.scrape(uri.toString(), null, Charsets.UTF_8);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final List<Location> locations = new ArrayList<Location>();
@@ -455,9 +452,6 @@ public class VrsProvider extends AbstractNetworkProvider
 		}
 		final CharSequence page = ParserUtils.scrape(uri.toString(), null, Charsets.UTF_8);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final JSONObject head = new JSONObject(page.toString());
@@ -554,9 +548,6 @@ public class VrsProvider extends AbstractNetworkProvider
 
 		final CharSequence page = ParserUtils.scrape(uri.toString(), null, Charsets.UTF_8);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final JSONObject head = new JSONObject(page.toString());
@@ -626,9 +617,6 @@ public class VrsProvider extends AbstractNetworkProvider
 
 		final CharSequence page = ParserUtils.scrape(uri, null, Charsets.UTF_8);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final List<SuggestedLocation> locations = new ArrayList<SuggestedLocation>();
@@ -757,9 +745,6 @@ public class VrsProvider extends AbstractNetworkProvider
 
 		final CharSequence page = ParserUtils.scrape(uri.toString(), null, Charsets.UTF_8);
 
-		// System.out.println(uri);
-		// System.out.println(page);
-
 		try
 		{
 			final List<Trip> trips = new ArrayList<Trip>();

enabler/src/de/schildbach/pte/util/ParserUtils.java

@@ -40,6 +40,9 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.base.Charsets;
 
 import de.schildbach.pte.exception.BlockedException;
@@ -62,6 +65,8 @@ public final class ParserUtils
 	private static final int SCRAPE_READ_TIMEOUT = 15000;
 	private static HttpCookie sessionCookie;
 
+	private static final Logger log = LoggerFactory.getLogger(ParserUtils.class);
+
 	public static final CharSequence scrape(final String url) throws IOException
 	{
 		return scrape(url, null);
@@ -129,6 +134,8 @@ public final class ParserUtils
 	public static final InputStream scrapeInputStream(final String urlStr, final String postRequest, Charset requestEncoding, final String referer,
 			final String sessionCookieName, final String authorization) throws IOException
 	{
+		log.debug("{}: {}", postRequest != null ? "POST" : "GET", urlStr);
+
 		if (requestEncoding == null)
 			requestEncoding = Charsets.ISO_8859_1;
 
@@ -244,7 +251,7 @@ public final class ParserUtils
 			{
 				final String message = "got response: " + responseCode + " " + connection.getResponseMessage();
 				if (tries-- > 0)
-					System.out.println(message + ", retrying...");
+					log.info("{}, retrying...", message);
 				else
 					throw new IOException(message + ": " + url);
 			}