root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge pull request #13623 from Christoph Dreis 

* gh-13623:
  Fix deprecation warning in SpringPhysicalNamingStrategyTests
This commit is contained in:
Andy Wilkinson 2018-07-03 08:29:39 +01:00
parent fb443aa3bf d641249ca8
commit 8ef08e5c0b
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/orm/jpa/hibernate/SpringPhysicalNamingStrategyTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,14 +18,12 @@ package org.springframework.boot.orm.jpa.hibernate;
import org.hibernate.boot.Metadata; import org.hibernate.boot.Metadata;
import org.hibernate.boot.MetadataSources; import org.hibernate.boot.MetadataSources;
import org.hibernate.boot.registry.BootstrapServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistry; import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.AvailableSettings;
import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.H2Dialect;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.PersistentClass;
import org.hibernate.service.ServiceRegistry;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@ -43,20 +41,16 @@ public class SpringPhysicalNamingStrategyTests {
private MetadataSources metadataSources; private MetadataSources metadataSources;
private StandardServiceRegistry serviceRegistry;
@Before @Before
public void setup() { public void setup() {
this.metadataSources = new MetadataSources(); this.metadataSources = new MetadataSources(createServiceRegistry());
this.metadataSources.addAnnotatedClass(TelephoneNumber.class); this.metadataSources.addAnnotatedClass(TelephoneNumber.class);
this.serviceRegistry = getServiceRegistry(this.metadataSources); this.metadata = this.metadataSources.getMetadataBuilder()
this.metadata = this.metadataSources.getMetadataBuilder(this.serviceRegistry)
.applyPhysicalNamingStrategy(new SpringPhysicalNamingStrategy()).build(); .applyPhysicalNamingStrategy(new SpringPhysicalNamingStrategy()).build();
} }
private StandardServiceRegistry getServiceRegistry(MetadataSources metadataSources) { private StandardServiceRegistry createServiceRegistry() {
ServiceRegistry registry = metadataSources.getServiceRegistry(); return new StandardServiceRegistryBuilder()
return new StandardServiceRegistryBuilder((BootstrapServiceRegistry) registry)
.applySetting(AvailableSettings.DIALECT, H2Dialect.class).build(); .applySetting(AvailableSettings.DIALECT, H2Dialect.class).build();
} }
@ -69,7 +63,7 @@ public class SpringPhysicalNamingStrategyTests {
@Test @Test
public void tableNameShouldNotBeLowerCaseIfCaseSensitive() { public void tableNameShouldNotBeLowerCaseIfCaseSensitive() {
this.metadata = this.metadataSources.getMetadataBuilder(this.serviceRegistry) this.metadata = this.metadataSources.getMetadataBuilder()
.applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy()) .applyPhysicalNamingStrategy(new TestSpringPhysicalNamingStrategy())
.build(); .build();
PersistentClass binding = this.metadata PersistentClass binding = this.metadata