Merge branch '1.5.x'

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java

@@ -43,7 +43,6 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration;
-import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfigurationTests.CustomNarayanaRecoveryManagerConfiguration.CustomNarayanaRecoveryManagerBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jta.XAConnectionFactoryWrapper;
 import org.springframework.boot.jta.XADataSourceWrapper;
@@ -347,14 +346,14 @@ public class JtaAutoConfigurationTests {
 			return new CustomNarayanaRecoveryManagerBean(recoveryManagerService);
 		}
 
-		static final class CustomNarayanaRecoveryManagerBean
+	}
-				extends NarayanaRecoveryManagerBean {
 
-			private CustomNarayanaRecoveryManagerBean(
+	static final class CustomNarayanaRecoveryManagerBean
-					RecoveryManagerService recoveryManagerService) {
+			extends NarayanaRecoveryManagerBean {
-				super(recoveryManagerService);
-			}
 
+		private CustomNarayanaRecoveryManagerBean(
+				RecoveryManagerService recoveryManagerService) {
+			super(recoveryManagerService);
 		}
 
 	}