Skip to content

Commit

Permalink
Remvoing searchUrl and searchName from response #60
Browse files Browse the repository at this point in the history
  • Loading branch information
tomasbjerre committed Jun 14, 2018
1 parent c6c873e commit 76bb41a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 22 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Generic Webhook Plugin Changelog
Changelog of Generic Webhook Plugin.
## Unreleased
### GitHub [#60](https://github.com/jenkinsci/generic-webhook-trigger-plugin/issues/60) Value from token Param is not evaluated

**Remvoing searchUrl and searchName from response #60**


[ab155846ea67ea1](https://github.com/jenkinsci/generic-webhook-trigger-plugin/commit/ab155846ea67ea1) Tomas Bjerre *2018-06-14 15:18:01*


## 1.36 (2018-05-18 18:02:15)
### No issue

Expand Down
26 changes: 4 additions & 22 deletions src/main/java/org/jenkinsci/plugins/gwt/GenericTriggerResults.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ public class GenericTriggerResults {
private final Map<String, String> resolvedVariables;
private final String regexpFilterText;
private final String regexpFilterExpression;
private final String searchUrl;
private final String url;
private final long id;
private final boolean triggered;
private final String searchName;

public GenericTriggerResults(
hudson.model.Queue.Item item,
Map<String, String> resolvedVariables,
String regexpFilterText,
String regexpFilterExpression) {
final hudson.model.Queue.Item item,
final Map<String, String> resolvedVariables,
final String regexpFilterText,
final String regexpFilterExpression) {
if (item != null) {
this.url = item.getUrl();
this.id = item.getId();
Expand All @@ -28,14 +26,6 @@ public GenericTriggerResults(
this.triggered = false;
}

if (item != null && item.getApi() != null) {
this.searchUrl = item.getApi().getSearchUrl();
this.searchName = item.getApi().getSearchName();
} else {
this.searchUrl = null;
this.searchName = null;
}

this.resolvedVariables = resolvedVariables;
this.regexpFilterText = regexpFilterText;
this.regexpFilterExpression = regexpFilterExpression;
Expand All @@ -49,10 +39,6 @@ public long getId() {
return id;
}

public String getSearchUrl() {
return searchUrl;
}

public String getUrl() {
return url;
}
Expand All @@ -68,8 +54,4 @@ public String getRegexpFilterText() {
public Map<String, String> getResolvedVariables() {
return resolvedVariables;
}

public String getSearchName() {
return searchName;
}
}

0 comments on commit 76bb41a

Please sign in to comment.