From bd8a9bb310e84ae79e6bcb4e8dda480a74a1e0d2 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 21 Sep 2016 19:54:33 +0100 Subject: [PATCH] Polish See gh-6971 and commit ce1e41d --- .../boot/actuate/endpoint/InfoEndpoint.java | 11 ----------- .../org/springframework/boot/SpringApplication.java | 2 -- 2 files changed, 13 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java index 98acc486ca..7c38b68d77 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/InfoEndpoint.java @@ -16,14 +16,11 @@ package org.springframework.boot.actuate.endpoint; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; -import org.springframework.boot.actuate.info.MapInfoContributor; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.util.Assert; @@ -49,14 +46,6 @@ public class InfoEndpoint extends AbstractEndpoint> { this.infoContributors = infoContributors; } - private static List createContributors(Map info, - InfoContributor[] infoContributors) { - List result = new ArrayList( - Arrays.asList(infoContributors)); - result.add(0, new MapInfoContributor(info)); - return result; - } - @Override public Map invoke() { Info.Builder builder = new Info.Builder(); diff --git a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java index 33886817c5..f17d6c0a49 100644 --- a/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java +++ b/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java @@ -200,8 +200,6 @@ public class SpringApplication { private Banner banner; - private boolean printedCustomBannerViaDeprecatedMethod; - private ResourceLoader resourceLoader; private BeanNameGenerator beanNameGenerator;