From 7e21178f6306d88dd7168149ea5edf17c8d56394 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 28 Jul 2017 10:20:47 +0200
Subject: [PATCH] Polish "Use configured schema in Liquibase endpoint"

Closes gh-9862
---
 .../boot/actuate/endpoint/LiquibaseEndpoint.java |  4 ++--
 .../actuate/endpoint/LiquibaseEndpointTests.java | 16 ++++++++--------
 .../test/resources/db/create-custom-schema.sql   |  1 +
 .../src/test/resources/db/non-default-schema.sql |  1 -
 4 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
 delete mode 100644 spring-boot-actuator/src/test/resources/db/non-default-schema.sql

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
index 773cb406f2b..11b086f6647 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpoint.java
@@ -28,11 +28,11 @@ import liquibase.database.Database;
 import liquibase.database.DatabaseFactory;
 import liquibase.database.jvm.JdbcConnection;
 import liquibase.integration.spring.SpringLiquibase;
-import liquibase.util.StringUtils;
 
 import org.springframework.boot.actuate.endpoint.LiquibaseEndpoint.LiquibaseReport;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link Endpoint} to expose liquibase info.
@@ -69,7 +69,7 @@ public class LiquibaseEndpoint extends AbstractEndpoint<List<LiquibaseReport>> {
 					Database database = factory
 							.findCorrectDatabaseImplementation(connection);
 					String defaultSchema = entry.getValue().getDefaultSchema();
-					if (StringUtils.trimToNull(defaultSchema) != null) {
+					if (StringUtils.hasText(defaultSchema)) {
 						database.setDefaultSchemaName(defaultSchema);
 					}
 					reports.add(new LiquibaseReport(entry.getKey(),
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
index 460605ac7c4..b1d6cbc7005 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/LiquibaseEndpointTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -18,9 +18,10 @@ package org.springframework.boot.actuate.endpoint;
 
 import liquibase.integration.spring.SpringLiquibase;
 import org.junit.Test;
+
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
-import org.springframework.boot.test.util.TestPropertyValues;
+import org.springframework.boot.test.util.EnvironmentTestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -46,13 +47,12 @@ public class LiquibaseEndpointTests extends AbstractEndpointTests<LiquibaseEndpo
 	}
 
 	@Test
-	public void invokeDifferentDefaultSchema() throws Exception {
+	public void invokeWithCustomSchema() throws Exception {
 		this.context = new AnnotationConfigApplicationContext();
-		TestPropertyValues
-			.ofPair("liquibase.defaultSchema","SOMESCHEMA")
-			.and("spring.datasource.generate-unique-name","true")
-			.and("spring.datasource.schema","classpath:/db/non-default-schema.sql")
-			.applyTo(this.context);
+		EnvironmentTestUtils.addEnvironment(this.context,
+				"liquibase.default-schema=CUSTOMSCHEMA",
+				"spring.datasource.generate-unique-name=true",
+				"spring.datasource.schema=classpath:/db/create-custom-schema.sql");
 		this.context.register(Config.class);
 		this.context.refresh();
 		assertThat(getEndpointBean().invoke()).hasSize(1);
diff --git a/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql b/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
new file mode 100644
index 00000000000..469b79ad895
--- /dev/null
+++ b/spring-boot-actuator/src/test/resources/db/create-custom-schema.sql
@@ -0,0 +1 @@
+CREATE SCHEMA CUSTOMSCHEMA;
diff --git a/spring-boot-actuator/src/test/resources/db/non-default-schema.sql b/spring-boot-actuator/src/test/resources/db/non-default-schema.sql
deleted file mode 100644
index 6733360dbd9..00000000000
--- a/spring-boot-actuator/src/test/resources/db/non-default-schema.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE SCHEMA SOMESCHEMA;