From 6603033bbc2a6409c8ee9e5f9a5f9ee7ae51f0d8 Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Tue, 22 Jan 2019 13:42:01 +0900 Subject: [PATCH 1/2] Polish SessionConfigurationImportSelector.selectImports() See gh-15754 --- .../session/SessionAutoConfiguration.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index 420bed0aa48..e408f8f9450 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -60,7 +60,6 @@ import org.springframework.session.web.http.CookieHttpSessionIdResolver; import org.springframework.session.web.http.CookieSerializer; import org.springframework.session.web.http.DefaultCookieSerializer; import org.springframework.session.web.http.HttpSessionIdResolver; -import org.springframework.util.StringUtils; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Session. @@ -162,13 +161,10 @@ public class SessionAutoConfiguration { abstract static class SessionConfigurationImportSelector implements ImportSelector { protected final String[] selectImports(WebApplicationType webApplicationType) { - List imports = new ArrayList<>(); - StoreType[] types = StoreType.values(); - for (StoreType type : types) { - imports.add(SessionStoreMappings.getConfigurationClass(webApplicationType, - type)); - } - return StringUtils.toStringArray(imports); + return Arrays.stream(StoreType.values()) + .map((type) -> SessionStoreMappings + .getConfigurationClass(webApplicationType, type)) + .toArray(String[]::new); } } From 5269ea5536a2f1ded6b6161ed9b00b913f7f0ebe Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 31 Jan 2019 16:33:38 +0100 Subject: [PATCH 2/2] Polish contribution Closes gh-15754 --- .../boot/autoconfigure/session/SessionAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java index e408f8f9450..0bb8feef161 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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.