Skip to content

Commit 9dbdbba

Browse files
mwinter69jakub-bochenski
authored andcommitted
[JENKINS-49451] Fix logstash Notifier setp (#53)
[JENKINS-49451] add getters for fields we need getters for the fields so the UI can properly work with them add check for valid integer add clazz number which auto checks for integer
1 parent 1a4d220 commit 9dbdbba

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

src/main/java/jenkins/plugins/logstash/LogstashNotifier.java

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,14 @@
3737
import hudson.tasks.BuildStepMonitor;
3838
import hudson.tasks.Notifier;
3939
import hudson.tasks.Publisher;
40-
40+
import hudson.util.FormValidation;
4141
import jenkins.tasks.SimpleBuildStep;
4242
import java.io.OutputStream;
4343
import java.io.PrintStream;
4444
import java.io.IOException;
4545

4646
import org.kohsuke.stapler.DataBoundConstructor;
47+
import org.kohsuke.stapler.QueryParameter;
4748
import org.jenkinsci.Symbol;
4849

4950
/**
@@ -63,6 +64,16 @@ public LogstashNotifier(int maxLines, boolean failBuild) {
6364
this.failBuild = failBuild;
6465
}
6566

67+
public int getMaxLines()
68+
{
69+
return maxLines;
70+
}
71+
72+
public boolean isFailBuild()
73+
{
74+
return failBuild;
75+
}
76+
6677
@Override
6778
public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListener listener) {
6879
return perform(build, listener);
@@ -111,5 +122,19 @@ public boolean isApplicable(@SuppressWarnings("rawtypes") Class<? extends Abstra
111122
public String getDisplayName() {
112123
return Messages.DisplayName();
113124
}
125+
126+
/*
127+
* Form validation methods
128+
*/
129+
public FormValidation doCheckMaxLines(@QueryParameter("value") String value) {
130+
try {
131+
Integer.parseInt(value);
132+
} catch (NumberFormatException e) {
133+
return FormValidation.error(Messages.ValueIsInt());
134+
}
135+
136+
return FormValidation.ok();
137+
}
138+
114139
}
115140
}

src/main/resources/jenkins/plugins/logstash/LogstashNotifier/config.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
22
<f:block>
33
<f:entry title="${%Max lines}" field="maxLines">
4-
<f:number default="1000" value="${instance.maxLines}" checkUrl="'descriptorByName/LogstashInstallation/checkInteger?value='+escape(this.value)" />
4+
<f:number default="1000" value="${instance.maxLines}" clazz="required number"/>
55
</f:entry>
66
<f:entry title="${%Can fail build}" field="failBuild">
77
<f:checkbox checked="${instance.failBuild}" />

0 commit comments

Comments
 (0)