diff options
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java index fa30f14..4bbc007 100755 --- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java +++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsServerActor.java @@ -56,7 +56,7 @@ public class JenkinsServerActor implements TransactionalActor { JenkinsBuildXml build = buildXmlOption.some(); - URI jobUrl = createJobUrl(build.url.toASCIIString()); + URI jobUrl = extrapolateJobUrlFromBuildUrl(build.url.toASCIIString()); Option<JenkinsJobDto> jobDtoOption = dao.selectJobByUrl(jobUrl); @@ -102,7 +102,7 @@ public class JenkinsServerActor implements TransactionalActor { /** * This sucks, a build should really include the URL to the job. */ - public static URI createJobUrl(String u) { + public static URI extrapolateJobUrlFromBuildUrl(String u) { if (!u.matches(".*/[0-9]*/")) { throw new RuntimeException("Not a valid build url: " + u); } @@ -112,4 +112,17 @@ public class JenkinsServerActor implements TransactionalActor { return URI.create(u); } + + public static String extrapolateMavenModuleFromMavenModuleSetUrl(String u) { + int i = u.lastIndexOf("/"); + if (i == -1) { + throw new RuntimeException("Illegal URL"); + } + u = u.substring(0, i); + i = u.lastIndexOf("/"); + if (i == -1) { + throw new RuntimeException("Illegal URL"); + } + return u.substring(0, i + 1); + } } |