Polishing

spring-projects · Sep 14, 2020 · 7056dd5 · 7056dd5
1 parent bb5b12a
commit 7056dd5
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 18 deletions.
diff --git a/...core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java b/...core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@
  */
 final class StringToBooleanConverter implements Converter<String, Boolean> {
 
-	private static final Set<String> trueValues = new HashSet<String>(4);
+	private static final Set<String> trueValues = new HashSet<String>(8);
 
-	private static final Set<String> falseValues = new HashSet<String>(4);
+	private static final Set<String> falseValues = new HashSet<String>(8);
 
 	static {
 		trueValues.add("true");
@@ -46,10 +46,11 @@ final class StringToBooleanConverter implements Converter<String, Boolean> {
 		falseValues.add("0");
 	}
 
+
 	@Override
 	public Boolean convert(String source) {
 		String value = source.trim();
-		if ("".equals(value)) {
+		if (value.isEmpty()) {
 			return null;
 		}
 		value = value.toLowerCase();

diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -715,8 +715,8 @@ public void setContentDispositionFormData(String name, String filename, Charset
 			return;
 		}
 		Assert.notNull(name, "'name' must not be null");
-		String encodedFileName = encodeHeaderFieldParam(filename, charset);
-		set(CONTENT_DISPOSITION, "form-data; name=\"" + name + '\"' + "; filename*=" + encodedFileName);
+		String encodedFilename = encodeHeaderFieldParam(filename, charset);
+		set(CONTENT_DISPOSITION, "form-data; name=\"" + name + '\"' + "; filename*=" + encodedFilename);
 	}
 
 	/**