Skip to content

Commit 49fb2af

Browse files
committed
Fixed #220
o getViews() default api/json?depth=1 cause timeout
1 parent 02caf94 commit 49fb2af

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

ReleaseNotes.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
## Release 0.3.8 (NOT RELEASED YET)
44

5-
* ?
5+
* [Fixed Issue 220][issue-220]
6+
7+
`getViews()` Do not use `api/json?depth=1` cause timeout.
8+
69

710
### API Changes
811

@@ -949,6 +952,7 @@ TestReport testReport = mavenJob.getLastSuccessfulBuild().getTestReport();
949952
[issue-209]: https://github.com/jenkinsci/java-client-api/issues/209
950953
[issue-211]: https://github.com/jenkinsci/java-client-api/issues/211
951954
[issue-215]: https://github.com/jenkinsci/java-client-api/issues/215
955+
[issue-220]: https://github.com/jenkinsci/java-client-api/issues/220
952956
[pull-123]: https://github.com/jenkinsci/java-client-api/pull/123
953957
[pull-149]: https://github.com/jenkinsci/java-client-api/pull/149
954958
[pull-158]: https://github.com/jenkinsci/java-client-api/pull/158

jenkins-client/src/main/java/com/offbytwo/jenkins/JenkinsServer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public Map<String, View> getViews() throws IOException {
188188
* @throws IOException in case of an error.
189189
*/
190190
public Map<String, View> getViews(FolderJob folder) throws IOException {
191-
List<View> views = client.get(toBaseUrl(folder) + "?depth=1", MainView.class).getViews();
191+
List<View> views = client.get(toBaseUrl(folder), MainView.class).getViews();
192192
return Maps.uniqueIndex(views, new Function<View, String>() {
193193
@Override
194194
public String apply(View view) {
@@ -203,7 +203,6 @@ public String apply(View view) {
203203
item.setClient(client);
204204
}
205205

206-
// return view.getName().toLowerCase();
207206
return view.getName();
208207
}
209208
});

jenkins-client/src/test/java/com/offbytwo/jenkins/JenkinsTestManualTestReport.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
package com.offbytwo.jenkins;
22

3+
import java.io.IOException;
34
import java.net.URI;
45
import java.util.List;
6+
import java.util.Map;
7+
import java.util.Map.Entry;
58

9+
import org.junit.Ignore;
610
import org.junit.Test;
711

812
import com.offbytwo.jenkins.model.Build;
913
import com.offbytwo.jenkins.model.JobWithDetails;
1014
import com.offbytwo.jenkins.model.TestReport;
1115
import com.offbytwo.jenkins.model.TestResult;
1216
import com.offbytwo.jenkins.model.TestSuites;
17+
import com.offbytwo.jenkins.model.View;
1318

1419
public class JenkinsTestManualTestReport {
1520

16-
@Test
21+
@Ignore
1722
public void firstTest() throws Exception {
1823

1924
JenkinsServer js = new JenkinsServer(URI.create("http://localhost:10090/buildserver/"), "admin", "admin");
@@ -37,4 +42,15 @@ public void firstTest() throws Exception {
3742
List<TestSuites> suites = testResult.getSuites();
3843

3944
}
45+
46+
@Test
47+
public void anotherTest() throws IOException {
48+
JenkinsServer js = new JenkinsServer(URI.create("http://localhost:10090/buildserver/"), "admin", "admin");
49+
Map<String, View> views = js.getViews();
50+
for (Entry<String, View> item : views.entrySet()) {
51+
View value = item.getValue();
52+
System.out.println("URL: " + value.getUrl());
53+
}
54+
55+
}
4056
}

0 commit comments

Comments
 (0)