Skip to content

Commit 45ba8af

Browse files
committed
Remove warnings
1 parent 26f3522 commit 45ba8af

File tree

2 files changed

+22
-7
lines changed

2 files changed

+22
-7
lines changed

src/main/java/alex/jenkins/plugins/FileSystemListParameterDefinition.java

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import java.io.IOException;
88
import java.nio.file.Path;
99
import java.util.ArrayList;
10-
import java.util.Collection;
1110
import java.util.Collections;
1211
import java.util.List;
1312
import java.util.Map;
@@ -18,14 +17,13 @@
1817

1918
import org.apache.commons.lang3.StringUtils;
2019
import org.jenkinsci.Symbol;
21-
import org.jenkinsci.remoting.RoleChecker;
2220
import org.kohsuke.stapler.DataBoundConstructor;
2321
import org.kohsuke.stapler.QueryParameter;
22+
import org.kohsuke.stapler.StaplerRequest;
2423
import org.kohsuke.stapler.StaplerRequest2;
2524

2625
import hudson.Extension;
2726
import hudson.FilePath;
28-
import hudson.FilePath.FileCallable;
2927
import hudson.Util;
3028
import hudson.cli.CLICommand;
3129
import hudson.model.Computer;
@@ -223,6 +221,24 @@ private ParameterValue checkParameterValue(StringParameterValue parameterValue)
223221
}
224222

225223
@Override
224+
public ParameterValue createValue(StaplerRequest req) {
225+
return createValue(requireRequest2(req));
226+
}
227+
228+
@Override
229+
public ParameterValue createValue(StaplerRequest req, JSONObject jo) {
230+
return createValue(requireRequest2(req), jo);
231+
}
232+
233+
private StaplerRequest2 requireRequest2(StaplerRequest req) {
234+
if (req instanceof StaplerRequest2) {
235+
return (StaplerRequest2) req;
236+
}
237+
throw new IllegalStateException(
238+
"StaplerRequest2 expected but got " + req.getClass()
239+
);
240+
}
241+
226242
public ParameterValue createValue(StaplerRequest2 request) {
227243
String parameterValues[] = request.getParameterValues(getName());
228244
if (parameterValues == null || parameterValues.length == 0) {
@@ -235,7 +251,6 @@ public ParameterValue createValue(StaplerRequest2 request) {
235251
return checkParameterValue(stringParameterValue);
236252
}
237253

238-
@Override
239254
public ParameterValue createValue(StaplerRequest2 request, JSONObject jO) {
240255
Object value = jO.get("value");
241256
String strValue = "";
@@ -254,7 +269,7 @@ public ParameterValue createValue(StaplerRequest2 request, JSONObject jO) {
254269
return new FileSystemListParameterValue(getName(), strValue);
255270
}
256271

257-
@Override
272+
258273
public ParameterValue getDefaultParameterValue() {
259274
String localDefaultValue = "";
260275

src/test/java/alex/jenkins/plugins/NotAllowedBaseDirTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class NotAllowedBaseDirTest {
2020
private JenkinsRule j;
2121

2222
private String allowedPath;
23-
private String allowedFile;
23+
//private String allowedFile;
2424
private String allowedSimilarFile;
2525
private String notAllowedPath;
2626
private String notAllowedFile;
@@ -33,7 +33,7 @@ class NotAllowedBaseDirTest {
3333
void setUp(JenkinsRule rule) {
3434
j = rule;
3535
allowedPath = getAbsolutePath("/1");
36-
allowedFile = allowedPath + File.separator + "test1.txt";
36+
//allowedFile = allowedPath + File.separator + "test1.txt";
3737
allowedSimilarFile = allowedPath + "test1.txt";
3838
notAllowedPath = getAbsolutePath("/2");
3939
notAllowedFile = notAllowedPath + File.separator + "notAllowed.txt";

0 commit comments

Comments
 (0)