Polish

Author: snicoll

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java

@@ -441,7 +441,7 @@ public void hazelcastCacheExplicit() {
 		cacheManager.getCache("defaultCache");
 		assertThat(cacheManager.getCacheNames()).containsOnly("defaultCache");
 		assertThat(this.context.getBean(HazelcastInstance.class))
-				.isEqualTo(getHazelcastInstance(cacheManager));
+				.isEqualTo(cacheManager.getHazelcastInstance());
 	}
 
 	@Test
@@ -458,7 +458,7 @@ public void hazelcastCacheWithConfig() throws IOException {
 				.getBean(HazelcastInstance.class);
 		HazelcastCacheManager cacheManager = validateCacheManager(
 				HazelcastCacheManager.class);
-		HazelcastInstance actual = getHazelcastInstance(cacheManager);
+		HazelcastInstance actual = cacheManager.getHazelcastInstance();
 		assertThat(actual).isSameAs(hazelcastInstance);
 		assertThat(actual.getConfig().getConfigurationUrl())
 				.isEqualTo(new ClassPathResource(
@@ -481,7 +481,7 @@ public void hazelcastCacheWithExistingHazelcastInstance() {
 		load(HazelcastCustomHazelcastInstance.class, "spring.cache.type=hazelcast");
 		HazelcastCacheManager cacheManager = validateCacheManager(
 				HazelcastCacheManager.class);
-		assertThat(getHazelcastInstance(cacheManager))
+		assertThat(cacheManager.getHazelcastInstance())
 				.isEqualTo(this.context.getBean("customHazelcastInstance"));
 	}
 
@@ -499,7 +499,7 @@ public void hazelcastCacheWithMainHazelcastAutoConfiguration() throws IOExceptio
 				HazelcastCacheManager.class);
 		HazelcastInstance hazelcastInstance = this.context
 				.getBean(HazelcastInstance.class);
-		assertThat(getHazelcastInstance(cacheManager)).isEqualTo(hazelcastInstance);
+		assertThat(cacheManager.getHazelcastInstance()).isEqualTo(hazelcastInstance);
 		assertThat(hazelcastInstance.getConfig().getConfigurationFile())
 				.isEqualTo(new ClassPathResource(mainConfig).getFile());
 	}
@@ -522,8 +522,7 @@ public void hazelcastCacheWithMainHazelcastAutoConfigurationAndSeparateCacheConf
 				.getBean(HazelcastInstance.class);
 		HazelcastCacheManager cacheManager = validateCacheManager(
 				HazelcastCacheManager.class);
-		HazelcastInstance cacheHazelcastInstance = (HazelcastInstance) new DirectFieldAccessor(
-				cacheManager).getPropertyValue("hazelcastInstance");
+		HazelcastInstance cacheHazelcastInstance = cacheManager.getHazelcastInstance();
 		assertThat(cacheHazelcastInstance).isNotEqualTo(hazelcastInstance); // Our custom
 		assertThat(hazelcastInstance.getConfig().getConfigurationFile())
 				.isEqualTo(new ClassPathResource(mainConfig).getFile());
@@ -760,12 +759,6 @@ private void load(Class<?> config, String... environment) {
 		this.context = applicationContext;
 	}
 
-	private static HazelcastInstance getHazelcastInstance(
-			HazelcastCacheManager cacheManager) {
-		return (HazelcastInstance) new DirectFieldAccessor(cacheManager)
-				.getPropertyValue("hazelcastInstance");
-	}
-
 	@Configuration
 	static class EmptyConfiguration {