From a6e59b357f51e5b3fbd2dcbffa68808f7dd54266 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Fri, 30 Apr 2021 13:29:23 +0200
Subject: [PATCH] Polish "Improve failure analysis with a single bean cycle"

See gh-26292
---
 .../analyzer/BeanCurrentlyInCreationFailureAnalyzer.java   | 7 ++++---
 .../BeanCurrentlyInCreationFailureAnalyzerTests.java       | 6 +-----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
index a67ac2bb2dc..a9c58a50397 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -70,11 +70,12 @@ class BeanCurrentlyInCreationFailureAnalyzer extends AbstractFailureAnalyzer<Bea
 		message.append(
 				String.format("The dependencies of some of the beans in the application context form a cycle:%n%n"));
 		List<BeanInCycle> beansInCycle = dependencyCycle.getBeansInCycle();
+		boolean singleBean = beansInCycle.size() == 1;
 		int cycleStart = dependencyCycle.getCycleStart();
 		for (int i = 0; i < beansInCycle.size(); i++) {
 			BeanInCycle beanInCycle = beansInCycle.get(i);
 			if (i == cycleStart) {
-				message.append(String.format((beansInCycle.size() == 1) ? "┌──->──┐%n" : "┌─────┐%n"));
+				message.append(String.format(singleBean ? "┌──->──┐%n" : "┌─────┐%n"));
 			}
 			else if (i > 0) {
 				String leftSide = (i < cycleStart) ? " " : "↑";
@@ -83,7 +84,7 @@ class BeanCurrentlyInCreationFailureAnalyzer extends AbstractFailureAnalyzer<Bea
 			String leftSide = (i < cycleStart) ? " " : "|";
 			message.append(String.format("%s  %s%n", leftSide, beanInCycle));
 		}
-		message.append(String.format((beansInCycle.size() == 1) ? "└──<-──┘%n" : "└─────┘%n"));
+		message.append(String.format(singleBean ? "└──<-──┘%n" : "└─────┘%n"));
 		return message.toString();
 	}
 
diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
index 4b6636b5d66..7a828feadcf 100644
--- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
+++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/diagnostics/analyzer/BeanCurrentlyInCreationFailureAnalyzerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -150,7 +150,6 @@ class BeanCurrentlyInCreationFailureAnalyzerTests {
 	}
 
 	@org.springframework.context.annotation.Configuration(proxyBeanMethods = false)
-	@SuppressWarnings("unused")
 	static class CyclicBeanMethodsConfiguration {
 
 		@Bean
@@ -181,7 +180,6 @@ class BeanCurrentlyInCreationFailureAnalyzerTests {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@SuppressWarnings("unused")
 	static class CycleReferencedViaOtherBeansConfiguration {
 
 		@Bean
@@ -246,7 +244,6 @@ class BeanCurrentlyInCreationFailureAnalyzerTests {
 		@org.springframework.context.annotation.Configuration(proxyBeanMethods = false)
 		static class BeanThreeConfiguration {
 
-			@SuppressWarnings("unused")
 			@Bean
 			BeanThree three(BeanOne one) {
 				return new BeanThree();
@@ -259,7 +256,6 @@ class BeanCurrentlyInCreationFailureAnalyzerTests {
 	@Configuration(proxyBeanMethods = false)
 	static class SelfReferenceBeanConfiguration {
 
-		@SuppressWarnings("unused")
 		@Bean
 		SelfReferenceBean bean(SelfReferenceBean bean) {
 			return new SelfReferenceBean();