Skip to content

Commit 82c5b57

Browse files
res0nanceres0nance
authored
Merge pull request #125 from offa/dev
Exception declaration clean-up and remove JSR 305
2 parents 46ae0e5 + 678cb5d commit 82c5b57

7 files changed

Lines changed: 30 additions & 31 deletions

File tree

‎src/main/java/org/jenkinsci/plugins/parameterizedscheduler/Cron.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public long getInitialDelay() {
2929
}
3030

3131
@Override
32-
protected void doRun() throws Exception {
32+
protected void doRun() {
3333
Jenkins instance = Jenkins.get();
3434

3535
for (AbstractProject<?, ?> project : instance.allItems(AbstractProject.class)) {

‎src/main/java/org/jenkinsci/plugins/parameterizedscheduler/DescriptorImpl.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.jenkinsci.plugins.parameterizedscheduler;
22

33
import static hudson.Util.fixNull;
4+
5+
import edu.umd.cs.findbugs.annotations.NonNull;
46
import hudson.Extension;
57
import hudson.model.Item;
68
import hudson.model.AbstractProject;
@@ -38,6 +40,7 @@ public boolean isApplicable(Item item) {
3840
return result;
3941
}
4042

43+
@NonNull
4144
@Override
4245
public String getDisplayName() {
4346
return Messages.ParameterizedTimerTrigger_DisplayName();

‎src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterParser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.jenkinsci.plugins.parameterizedscheduler;
22

33
import com.google.common.base.Splitter;
4+
import edu.umd.cs.findbugs.annotations.CheckForNull;
45
import hudson.model.ParametersDefinitionProperty;
56
import org.apache.commons.lang.StringUtils;
67

7-
import javax.annotation.CheckForNull;
88
import java.util.Collections;
99
import java.util.List;
1010
import java.util.Map;

‎src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedCronTabList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static ParameterizedCronTabList create(String cronTabSpecification, Hash
4545
try {
4646
result.add(ParameterizedCronTab.create(line, lineNumber, hash, timezone));
4747
} catch (ANTLRException e) {
48-
throw new ANTLRException(String.format("Invalid input: \"%s\": %s", line, e.toString()), e);
48+
throw new ANTLRException(String.format("Invalid input: \"%s\": %s", line, e), e);
4949
}
5050
}
5151
}

‎src/main/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedStaplerRequest.java‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import javax.servlet.DispatcherType;
1616
import javax.servlet.RequestDispatcher;
1717
import javax.servlet.ServletContext;
18-
import javax.servlet.ServletException;
1918
import javax.servlet.ServletInputStream;
2019
import javax.servlet.ServletRequest;
2120
import javax.servlet.ServletResponse;
@@ -25,8 +24,6 @@
2524
import javax.servlet.http.HttpUpgradeHandler;
2625
import javax.servlet.http.Part;
2726
import java.io.BufferedReader;
28-
import java.io.IOException;
29-
import java.io.UnsupportedEncodingException;
3027
import java.lang.reflect.Type;
3128
import java.security.Principal;
3229
import java.util.Calendar;
@@ -66,7 +63,7 @@ public String getHeader(String name) {
6663
}
6764

6865
@Override
69-
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) throws IOException, ServletException {
66+
public <T extends HttpUpgradeHandler> T upgrade(Class<T> handlerClass) {
7067
return null;
7168
}
7269

@@ -183,27 +180,27 @@ public boolean isRequestedSessionIdFromUrl() {
183180
}
184181

185182
@Override
186-
public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
183+
public boolean authenticate(HttpServletResponse response) {
187184
return false;
188185
}
189186

190187
@Override
191-
public void login(String username, String password) throws ServletException {
188+
public void login(String username, String password) {
192189

193190
}
194191

195192
@Override
196-
public void logout() throws ServletException {
193+
public void logout() {
197194

198195
}
199196

200197
@Override
201-
public Collection<Part> getParts() throws IOException, ServletException {
198+
public Collection<Part> getParts() {
202199
return null;
203200
}
204201

205202
@Override
206-
public Part getPart(String name) throws IOException, ServletException {
203+
public Part getPart(String name) {
207204
return null;
208205
}
209206

@@ -224,7 +221,7 @@ public String getCharacterEncoding() {
224221
}
225222

226223
@Override
227-
public void setCharacterEncoding(String env) throws UnsupportedEncodingException {
224+
public void setCharacterEncoding(String env) {
228225

229226
}
230227

@@ -244,7 +241,7 @@ public String getContentType() {
244241
}
245242

246243
@Override
247-
public ServletInputStream getInputStream() throws IOException {
244+
public ServletInputStream getInputStream() {
248245
return null;
249246
}
250247

@@ -291,7 +288,7 @@ public int getServerPort() {
291288
}
292289

293290
@Override
294-
public BufferedReader getReader() throws IOException {
291+
public BufferedReader getReader() {
295292
return null;
296293
}
297294

@@ -427,18 +424,18 @@ public StringBuffer getRequestURLWithQueryString() {
427424
}
428425

429426
@Override
430-
public RequestDispatcher getView(Object it, String viewName) throws IOException {
427+
public RequestDispatcher getView(Object it, String viewName) {
431428
return null;
432429
}
433430

434431
@SuppressWarnings("rawtypes")
435432
@Override
436-
public RequestDispatcher getView(Class clazz, String viewName) throws IOException {
433+
public RequestDispatcher getView(Class clazz, String viewName) {
437434
return null;
438435
}
439436

440437
@Override
441-
public RequestDispatcher getView(Klass<?> clazz, String viewName) throws IOException {
438+
public RequestDispatcher getView(Klass<?> clazz, String viewName) {
442439
return null;
443440
}
444441

@@ -559,12 +556,12 @@ public BindInterceptor setBindListener(BindInterceptor bindListener) {
559556
}
560557

561558
@Override
562-
public JSONObject getSubmittedForm() throws ServletException {
559+
public JSONObject getSubmittedForm() {
563560
return null;
564561
}
565562

566563
@Override
567-
public FileItem getFileItem(String name) throws ServletException, IOException {
564+
public FileItem getFileItem(String name) {
568565
return null;
569566
}
570567

‎src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterParserTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ public void test_ValueContainsEquals_emptyMap() {
9494
}
9595

9696
@Test
97-
public void checkSanity_HappyPath() throws Exception {
97+
public void checkSanity_HappyPath() {
9898
ParameterParser testObject = new ParameterParser();
9999

100100
Mockito.when(mockParametersDefinitionProperty.getParameterDefinitionNames()).thenReturn(Collections.singletonList("name"));
101101
assertNull(testObject.checkSanity("* * * * *%name=value", mockParametersDefinitionProperty));
102102
}
103103

104104
@Test
105-
public void checkSanity_NotDefined_ProjectParameter() throws Exception {
105+
public void checkSanity_NotDefined_ProjectParameter() {
106106
ParameterParser testObject = new ParameterParser();
107107

108108
List<String> list = Collections.singletonList("not name");
@@ -112,7 +112,7 @@ public void checkSanity_NotDefined_ProjectParameter() throws Exception {
112112
}
113113

114114
@Test
115-
public void checkSanity_TrailingSemiColon_IsTrimmed() throws Exception {
115+
public void checkSanity_TrailingSemiColon_IsTrimmed() {
116116
ParameterParser testObject = new ParameterParser();
117117

118118
Mockito.when(mockParametersDefinitionProperty.getParameterDefinitionNames()).thenReturn(
@@ -121,21 +121,21 @@ public void checkSanity_TrailingSemiColon_IsTrimmed() throws Exception {
121121
}
122122

123123
@Test
124-
public void checkSanity_NoParametersIsNoBigDeal() throws Exception {
124+
public void checkSanity_NoParametersIsNoBigDeal() {
125125
ParameterParser testObject = new ParameterParser();
126126

127127
assertNull(testObject.checkSanity("* * * * *%", mockParametersDefinitionProperty));
128128
assertNull(testObject.checkSanity("* * * * *", mockParametersDefinitionProperty));
129129
}
130130

131131
@Test
132-
public void checkSanity_duplicateParamName() throws Exception {
132+
public void checkSanity_duplicateParamName() {
133133
ParameterParser testObject = new ParameterParser();
134134
assertTrue(testObject.checkSanity("* * * * *%name=value;name=value2", mockParametersDefinitionProperty).startsWith("Duplicate key"));
135135
}
136136

137137
@Test
138-
public void checkSanity_UnmatchedEquals() throws Exception {
138+
public void checkSanity_UnmatchedEquals() {
139139
ParameterParser testObject = new ParameterParser();
140140
Mockito.when(mockParametersDefinitionProperty.getParameterDefinitionNames()).thenReturn(
141141
Arrays.asList("name", "name2"));
@@ -144,7 +144,7 @@ public void checkSanity_UnmatchedEquals() throws Exception {
144144
}
145145

146146
@Test
147-
public void checkSanity_NullParameters() throws Exception {
147+
public void checkSanity_NullParameters() {
148148
ParameterParser testObject = new ParameterParser();
149149
assertEquals(Messages.ParameterizedTimerTrigger_UndefinedParameter(Collections.singletonList("name"), Collections.emptyList()),
150150
testObject.checkSanity("* * * * *%name=value", null));

‎src/test/java/org/jenkinsci/plugins/parameterizedscheduler/ParameterizedSchedulerTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package org.jenkinsci.plugins.parameterizedscheduler;
22

3+
import edu.umd.cs.findbugs.annotations.CheckForNull;
4+
import edu.umd.cs.findbugs.annotations.NonNull;
35
import hudson.model.FreeStyleProject;
46
import hudson.model.Job;
57
import hudson.model.ParameterDefinition;
@@ -18,9 +20,6 @@
1820
import org.jvnet.hudson.test.JenkinsRule;
1921
import org.kohsuke.stapler.StaplerRequest;
2022

21-
import javax.annotation.CheckForNull;
22-
import javax.annotation.Nonnull;
23-
2423
import java.util.ArrayList;
2524
import java.util.List;
2625

@@ -144,7 +143,7 @@ public void nullValueCreated() throws Exception {
144143

145144
private static class NullParameterDefinition extends ParameterDefinition {
146145

147-
public NullParameterDefinition(@Nonnull String name) {
146+
public NullParameterDefinition(@NonNull String name) {
148147
super(name, null);
149148
}
150149

0 commit comments

Comments
 (0)