From 04215e665144af2c365d7bbb34a256123586b09b Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 13 Aug 2018 15:59:17 +0100 Subject: [PATCH] Polish --- .../data/redis/LettuceConnectionConfiguration.java | 6 +++--- .../boot/web/servlet/ServletContextInitializerBeans.java | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java index 6cce147194..7adbc364bd 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/LettuceConnectionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2017 the original author or authors. + * Copyright 2012-2018 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. @@ -154,8 +154,8 @@ class LettuceConnectionConfiguration extends RedisConnectionConfiguration { .poolConfig(getPoolConfig(properties)); } - private GenericObjectPoolConfig getPoolConfig(Pool properties) { - GenericObjectPoolConfig config = new GenericObjectPoolConfig(); + private GenericObjectPoolConfig getPoolConfig(Pool properties) { + GenericObjectPoolConfig config = new GenericObjectPoolConfig<>(); config.setMaxTotal(properties.getMaxActive()); config.setMaxIdle(properties.getMaxIdle()); config.setMinIdle(properties.getMinIdle()); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java index 6a2bf32f56..8f4c4e6554 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/ServletContextInitializerBeans.java @@ -78,6 +78,7 @@ public class ServletContextInitializerBeans private List sortedList; + @SafeVarargs public ServletContextInitializerBeans(ListableBeanFactory beanFactory, Class... initializerTypes) { this.initializers = new LinkedMultiValueMap<>(); @@ -260,6 +261,7 @@ public class ServletContextInitializerBeans * * @param the type of the Bean to adapt */ + @FunctionalInterface protected interface RegistrationBeanAdapter { RegistrationBean createRegistrationBean(String name, T source,