[FIX] etc

Author: heowc

SpringBootExcel/src/main/java/com/example/component/ExcelWriter.java

@@ -107,23 +107,21 @@ private void createRow(Sheet sheet, List<String> cellList, int rowNum) {
 	}
 
 	private enum FileNameEncoder {
-		IE(Browser.IE, (it) -> {
+		IE(Browser.IE, it -> {
 			try {
 				return URLEncoder.encode(it, StandardCharsets.UTF_8.name()).replaceAll("\\+", "%20");
 			} catch (UnsupportedEncodingException e) {
 				return it;
 			}
 		}),
-		FIREFOX(Browser.FIREFOX, FileNameEncoder.simpleEncodeFunction),
-		OPERA(Browser.OPERA, FileNameEncoder.simpleEncodeFunction),
-		CHROME(Browser.CHROME, FileNameEncoder.simpleEncodeFunction),
+		FIREFOX(Browser.FIREFOX, getDefaultEncodeOperator()),
+		OPERA(Browser.OPERA, getDefaultEncodeOperator()),
+		CHROME(Browser.CHROME, getDefaultEncodeOperator()),
 		UNKNOWN(Browser.UNKNOWN, UnaryOperator.identity());
 
 		private final Browser browser;
 		private UnaryOperator<String> encodeOperator;
 
-		private static final UnaryOperator<String> simpleEncodeFunction = it -> new String(it.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
-
 		private static final Map<Browser, Function<String, String>> FILE_NAME_ENCODER_MAP;
 
 		static {
@@ -144,6 +142,10 @@ protected UnaryOperator<String> getEncodeOperator() {
 			return encodeOperator;
 		}
 
+		private static UnaryOperator<String> getDefaultEncodeOperator() {
+			return it -> new String(it.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
+		}
+
 		public static String encode(Browser browser, String fileName) {
 			return FILE_NAME_ENCODER_MAP.get(browser).apply(fileName);
 		}

SpringBootGracefulShutdown/src/main/java/com/example/SpringBootGracefulShutdownApplication.java

@@ -2,6 +2,8 @@
 
 import lombok.extern.log4j.Log4j2;
 import org.apache.catalina.connector.Connector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -20,7 +22,6 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-@Log4j2
 @SpringBootApplication
 public class SpringBootGracefulShutdownApplication {
 
@@ -54,6 +55,8 @@ public ConfigurableServletWebServerFactory webServerFactory(GracefulShutdown gra
     @Component
     public static class GracefulShutdown implements TomcatConnectorCustomizer, ApplicationListener<ContextClosedEvent> {
 
+        private static final Logger log = LoggerFactory.getLogger(GracefulShutdown.class);
+
         private static final long TIMEOUT = 300_000L;
 
         private volatile Connector connector;