[crawler-jsoup] configurable timeout; fixes #29

Author: Stefan Bley

crawler-api/src/main/java/de/saxsys/projectiler/crawler/Settings.java

@@ -1,5 +1,7 @@
 package de.saxsys.projectiler.crawler;
 
+import java.util.concurrent.TimeUnit;
+
 /**
  * Projectile settings.
  * 
@@ -15,4 +17,9 @@ public String getProjectileUrl() {
 	public String getTimeFormat() {
 		return "HH:mm";
 	}
+
+	/** Connection timeout in millis */
+	public int getTimeout() {
+		return (int) TimeUnit.SECONDS.toMillis(10);
+	}
 }

crawler-jsoup/src/main/java/de/saxsys/projectiler/crawler/jsoup/JSoupCrawler.java

@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
+import org.jsoup.Connection;
 import org.jsoup.Connection.Method;
 import org.jsoup.Connection.Response;
 import org.jsoup.Jsoup;
@@ -98,10 +99,9 @@ public void clock(final Credentials credentials, final String projectName, final
 	 *             if the credentials are wrong
 	 */
 	private Document login(final Credentials cred) throws IOException, InvalidCredentialsException {
-		Response response = Jsoup.connect(settings.getProjectileUrl()).method(Method.POST)
-				.data("login", cred.getUsername()).data("password", cred.getPassword())
-				.data("jsenabled", "0").data("external.loginOK.x", "8")
-				.data("external.loginOK.y", "8").execute();
+		Response response = jsoupConnection().data("login", cred.getUsername())
+				.data("password", cred.getPassword()).data("jsenabled", "0")
+				.data("external.loginOK.x", "8").data("external.loginOK.y", "8").execute();
 		Document startPage = response.parse();
 		if (startPage.getElementsByAttributeValue("name", "password").isEmpty()) {
 			String sessionId = response.cookie(JSESSIONID);
@@ -124,9 +124,7 @@ private Document openTimeTracker(final Document startPage) throws IOException {
 		Document introPage = openStandardIntroPage(currentPage);
 
 		String today = formatToday();
-		Response response = Jsoup
-				.connect(settings.getProjectileUrl())
-				.method(Method.POST)
+		Response response = jsoupConnection()
 				.cookies(cookies)
 				.data("taid", taid)
 				.data("CurrentFocusField", "0")
@@ -150,9 +148,7 @@ private Document openTimeTracker(final Document startPage) throws IOException {
 	}
 
 	private Document openIntroPage(Document startPage) throws IOException {
-		Response response = Jsoup
-				.connect(settings.getProjectileUrl())
-				.method(Method.POST)
+		Response response = jsoupConnection()
 				.cookies(cookies)
 				.data("taid", taid)
 				.data("CurrentFocusField", "0")
@@ -170,9 +166,7 @@ private Document openIntroPage(Document startPage) throws IOException {
 	}
 
 	private Document openStandardIntroPage(final Document startPage) throws IOException {
-		Response response = Jsoup
-				.connect(settings.getProjectileUrl())
-				.method(Method.POST)
+		Response response = jsoupConnection()
 				.cookies(cookies)
 				.data("taid", taid)
 				.data("CurrentFocusField", "0")
@@ -188,7 +182,7 @@ private Document openStandardIntroPage(final Document startPage) throws IOExcept
 
 	private List<String> readProjectNames(final Document timeTrackerPage) throws IOException,
 			CrawlingException {
-		List<String> projectNames = new ArrayList<>();
+		List<String> projectNames = new ArrayList<String>();
 		Elements options = timeTrackerPage.select("select[id$=NewWhat_0_0] option");
 		if (options.isEmpty()) {
 			throw new CrawlingException("No projects found.");
@@ -213,9 +207,7 @@ private void clockTime(final Date start, final Date end, final String projectNam
 				break;
 			}
 		}
-		Response response = Jsoup
-				.connect(settings.getProjectileUrl())
-				.method(Method.POST)
+		Response response = jsoupConnection()
 				.cookies(cookies)
 				.data("taid", taid)
 				.data("CurrentFocusField", "name")
@@ -262,8 +254,7 @@ private void clockTime(final Date start, final Date end, final String projectNam
 	}
 
 	private void logout(final Document page) throws IOException {
-		Response execute = Jsoup.connect(settings.getProjectileUrl()).method(Method.POST)
-				.cookies(cookies).data("taid", taid)
+		Response execute = jsoupConnection().cookies(cookies).data("taid", taid)
 				.data(page.select("input[name$=L.BUTTON.logout]").first().attr("name") + ".x", "8")
 				.data(page.select("input[name$=L.BUTTON.logout]").first().attr("name") + ".y", "8")
 				.execute();
@@ -275,6 +266,15 @@ private void logout(final Document page) throws IOException {
 		}
 	}
 
+	/**
+	 * Creates a JSoup connection to Projectile with method POST and given
+	 * timeout
+	 */
+	private Connection jsoupConnection() {
+		return Jsoup.connect(settings.getProjectileUrl()).timeout(settings.getTimeout())
+				.method(Method.POST);
+	}
+
 	/** Reads the transaction ID from the response and stores it to a field */
 	private void saveTaid(final Document page) {
 		taid = page.select("input[name=taid]").val();