未验证 提交 cfb9fedb 编写于 作者: O Oleg Nenashev 提交者: GitHub

Merge pull request #4244 from res0nance/misc-cleanups

Misc cleanups
...@@ -289,7 +289,7 @@ public class ClassicPluginStrategy implements PluginStrategy { ...@@ -289,7 +289,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException { protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, Attributes atts) throws IOException {
if (atts != null) { if (atts != null) {
String usePluginFirstClassLoader = atts.getValue( "PluginFirstClassLoader" ); String usePluginFirstClassLoader = atts.getValue( "PluginFirstClassLoader" );
if (Boolean.valueOf( usePluginFirstClassLoader )) { if (Boolean.parseBoolean( usePluginFirstClassLoader )) {
PluginFirstClassLoader classLoader = new PluginFirstClassLoader(); PluginFirstClassLoader classLoader = new PluginFirstClassLoader();
classLoader.setParentFirst( false ); classLoader.setParentFirst( false );
classLoader.setParent( parent ); classLoader.setParent( parent );
......
...@@ -905,10 +905,10 @@ public class Util { ...@@ -905,10 +905,10 @@ public class Util {
} }
byte[] bytes = new String(new int[] { codePoint }, 0, 1).getBytes(StandardCharsets.UTF_8); byte[] bytes = new String(new int[] { codePoint }, 0, 1).getBytes(StandardCharsets.UTF_8);
for(int j=0;j<bytes.length;j++) { for (byte aByte : bytes) {
out.append('%'); out.append('%');
out.append(toDigit((bytes[j] >> 4) & 0xF)); out.append(toDigit((aByte >> 4) & 0xF));
out.append(toDigit(bytes[j] & 0xF)); out.append(toDigit(aByte & 0xF));
} }
if(Character.charCount(codePoint) > 1) { if(Character.charCount(codePoint) > 1) {
......
...@@ -65,7 +65,7 @@ public class BooleanParameterDefinition extends SimpleParameterDefinition { ...@@ -65,7 +65,7 @@ public class BooleanParameterDefinition extends SimpleParameterDefinition {
} }
public ParameterValue createValue(String value) { public ParameterValue createValue(String value) {
return new BooleanParameterValue(getName(),Boolean.valueOf(value),getDescription()); return new BooleanParameterValue(getName(),Boolean.parseBoolean(value),getDescription());
} }
@Override @Override
......
...@@ -181,7 +181,7 @@ public final class DirectoryBrowserSupport implements HttpResponse { ...@@ -181,7 +181,7 @@ public final class DirectoryBrowserSupport implements HttpResponse {
} }
String path = getPath(req); String path = getPath(req);
if(path.replace('\\','/').indexOf("/../")!=-1) { if(path.replace('\\', '/').contains("/../")) {
// don't serve anything other than files in the artifacts dir // don't serve anything other than files in the artifacts dir
rsp.sendError(HttpServletResponse.SC_BAD_REQUEST); rsp.sendError(HttpServletResponse.SC_BAD_REQUEST);
return; return;
......
...@@ -31,7 +31,7 @@ public class Configuration { ...@@ -31,7 +31,7 @@ public class Configuration {
public static boolean getBooleanConfigParameter(String name, boolean defaultValue) { public static boolean getBooleanConfigParameter(String name, boolean defaultValue) {
String value = getStringConfigParameter(name,null); String value = getStringConfigParameter(name,null);
return (value==null)?defaultValue:Boolean.valueOf(value); return (value==null)?defaultValue:Boolean.parseBoolean(value);
} }
public static String getStringConfigParameter(String name, String defaultValue) { public static String getStringConfigParameter(String name, String defaultValue) {
......
...@@ -15,5 +15,5 @@ import org.kohsuke.accmod.restrictions.NoExternalUse; ...@@ -15,5 +15,5 @@ import org.kohsuke.accmod.restrictions.NoExternalUse;
@Extension(ordinal = 1000) @Symbol("frameOptions") @Extension(ordinal = 1000) @Symbol("frameOptions")
public class FrameOptionsPageDecorator extends PageDecorator { public class FrameOptionsPageDecorator extends PageDecorator {
@Restricted(NoExternalUse.class) @Restricted(NoExternalUse.class)
public static boolean enabled = Boolean.valueOf(SystemProperties.getString(FrameOptionsPageDecorator.class.getName() + ".enabled", "true")); public static boolean enabled = Boolean.parseBoolean(SystemProperties.getString(FrameOptionsPageDecorator.class.getName() + ".enabled", "true"));
} }
...@@ -365,9 +365,9 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener { ...@@ -365,9 +365,9 @@ public class AntClassLoader extends ClassLoader implements SubBuildListener {
if (classpath != null) { if (classpath != null) {
Path actualClasspath = classpath.concatSystemClasspath("ignore"); Path actualClasspath = classpath.concatSystemClasspath("ignore");
String[] pathElements = actualClasspath.list(); String[] pathElements = actualClasspath.list();
for (int i = 0; i < pathElements.length; ++i) { for (String pathElement : pathElements) {
try { try {
addPathElement(pathElements[i]); addPathElement(pathElement);
} catch (BuildException e) { } catch (BuildException e) {
// ignore path elements which are invalid // ignore path elements which are invalid
// relative to the project // relative to the project
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册