o Discovering and storing jobs in addition to the build.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsJob.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsJob.java
index 7a7f6af..7199bd8 100755
--- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsJob.java
+++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsJob.java
@@ -2,8 +2,8 @@ package io.trygvis.esper.testing.jenkins;
 
 import fj.data.*;
 import static fj.data.Option.*;
+import static io.trygvis.esper.testing.jenkins.JenkinsClient.apiXml;
 import static java.lang.System.currentTimeMillis;
-import org.codehaus.httpcache4j.util.*;
 import org.slf4j.*;
 
 import java.io.*;
@@ -14,14 +14,14 @@ public class JenkinsJob implements Closeable {
 
     private final Logger logger = LoggerFactory.getLogger("jenkins.job");
     private final JenkinsClient client;
-    private final URI uri;
+    private final URI url;
 
     private Option<JenkinsJobXml> latestStatus = none();
     private final ScheduledFuture<?> future;
 
-    public JenkinsJob(ScheduledExecutorService executorService, JenkinsClient client, URI uri) {
+    public JenkinsJob(ScheduledExecutorService executorService, JenkinsClient client, URI url) {
         this.client = client;
-        this.uri = URIBuilder.fromURI(uri).addRawPath("api/xml").toURI();
+        this.url = apiXml(url);
 
         long initialDelay = (long) Math.random() + 1;
         long period = (long) (Math.random() * 100d) + 1;
@@ -43,12 +43,12 @@ public class JenkinsJob implements Closeable {
     private void doWork() {
 
         String name = latestStatus.isSome() && latestStatus.some().name.isSome() ?
-            latestStatus.some().name.some() : uri.toASCIIString();
+            latestStatus.some().name.some() : url.toASCIIString();
 
         try {
             logger.info("Updating " + name);
             long start = currentTimeMillis();
-            latestStatus = client.fetchJob(uri);
+            latestStatus = client.fetchJob(url);
             long end = currentTimeMillis();
             logger.info("Updated " + name + " in " + (end - start) + "ms");
         } catch (Throwable e) {