diff options
Diffstat (limited to 'src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java')
-rwxr-xr-x | src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java index bd99768..0195900 100755 --- a/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java +++ b/src/main/java/io/trygvis/esper/testing/jenkins/JenkinsDao.java @@ -18,11 +18,11 @@ public class JenkinsDao { private final Connection c; - private static final String JENKINS_SERVER = "uuid, created_date, url"; + public static final String JENKINS_SERVER = "uuid, created_date, url"; - private static final String JENKINS_JOB = "uuid, created_date, server, url, job_type, display_name"; + public static final String JENKINS_JOB = "uuid, created_date, server, url, job_type, display_name"; - private static final String JENKINS_BUILD = "uuid, created_date, job, entry_id, url, result, number, duration, timestamp"; + public static final String JENKINS_BUILD = "uuid, created_date, job, entry_id, url, result, number, duration, timestamp"; public JenkinsDao(Connection c) { this.c = c; @@ -36,6 +36,14 @@ public class JenkinsDao { URI.create(rs.getString(i))); } + public List<JenkinsServerDto> toServerList(ResultSet rs) throws SQLException { + List<JenkinsServerDto> list = new ArrayList<>(); + while (rs.next()) { + list.add(jenkinsServer(rs)); + } + return list; + } + private JenkinsJobDto jenkinsJob(ResultSet rs) throws SQLException { int i = 1; return new JenkinsJobDto( @@ -46,6 +54,14 @@ public class JenkinsDao { fromNull(rs.getString(i))); } + public List<JenkinsJobDto> toJobList(ResultSet rs) throws SQLException { + List<JenkinsJobDto> list = new ArrayList<>(); + while (rs.next()) { + list.add(jenkinsJob(rs)); + } + return list; + } + private JenkinsBuildDto jenkinsBuild(ResultSet rs) throws SQLException { int i = 1; return new JenkinsBuildDto( @@ -65,13 +81,7 @@ public class JenkinsDao { where += enabledOnly ? "enabled=true" : ""; try (PreparedStatement s = c.prepareStatement("SELECT " + JENKINS_SERVER + " FROM jenkins_server " + where)) { - ResultSet rs = s.executeQuery(); - - List<JenkinsServerDto> servers = new ArrayList<>(); - while (rs.next()) { - servers.add(jenkinsServer(rs)); - } - return servers; + return toServerList(s.executeQuery()); } } |