Closes gh-6234
pull/6018/merge
Johnny Lim 9 years ago committed by Stephane Nicoll
parent 3151df624a
commit 301574de09

@ -51,7 +51,7 @@ public class BackgroundPreinitializer
runSafely(new MBeanFactoryInitializer()); runSafely(new MBeanFactoryInitializer());
runSafely(new ValidationInitializer()); runSafely(new ValidationInitializer());
runSafely(new JacksonInitializer()); runSafely(new JacksonInitializer());
runSafely(new ConverstionServiceInitializer()); runSafely(new ConversionServiceInitializer());
} }
public void runSafely(Runnable runnable) { public void runSafely(Runnable runnable) {
@ -122,9 +122,9 @@ public class BackgroundPreinitializer
} }
/** /**
* Early initializer for Spring's ConverstionService. * Early initializer for Spring's ConversionService.
*/ */
private static class ConverstionServiceInitializer implements Runnable { private static class ConversionServiceInitializer implements Runnable {
@Override @Override
public void run() { public void run() {

@ -77,7 +77,7 @@ public class SessionAutoConfiguration {
/** /**
* Bean used to validate that a {@link SessionRepository} exists and provide a * Bean used to validate that a {@link SessionRepository} exists and provide a
* meaningful if that's not the case. * meaningful message if that's not the case.
*/ */
static class SessionRepositoryValidator { static class SessionRepositoryValidator {

@ -47,7 +47,7 @@ public class TemplateAvailabilityProviders {
private static final TemplateAvailabilityProvider NONE = new NoTemplateAvailabilityProvider(); private static final TemplateAvailabilityProvider NONE = new NoTemplateAvailabilityProvider();
/** /**
* resolved template views, returning already cached instances without a global lock. * Resolved template views, returning already cached instances without a global lock.
*/ */
private final Map<String, TemplateAvailabilityProvider> resolved = new ConcurrentHashMap<String, TemplateAvailabilityProvider>( private final Map<String, TemplateAvailabilityProvider> resolved = new ConcurrentHashMap<String, TemplateAvailabilityProvider>(
CACHE_LIMIT); CACHE_LIMIT);

@ -46,7 +46,7 @@ public class SilentExitExceptionHandlerTests {
} }
@Test @Test
public void doesntInterferWithOtherExceptions() throws Exception { public void doesntInterfereWithOtherExceptions() throws Exception {
TestThread testThread = new TestThread() { TestThread testThread = new TestThread() {
@Override @Override
public void run() { public void run() {

@ -4666,7 +4666,7 @@ automatically whenever you don't explicitly define one.
The search algorithm works up from the package that contains the test until it finds a The search algorithm works up from the package that contains the test until it finds a
`@SpringBootApplication` or `@SpringBootConfiguration` annotated class. As long as you've `@SpringBootApplication` or `@SpringBootConfiguration` annotated class. As long as you've
<<using-boot-structuring-your-code, structure your code>> in a sensible way your main <<using-boot-structuring-your-code, structured your code>> in a sensible way your main
configuration is usually found. configuration is usually found.
If you want to customize the primary configuration, you can use a nested If you want to customize the primary configuration, you can use a nested
@ -4981,11 +4981,12 @@ disable transaction management for a test or for the whole class as follows:
[source,java,indent=0] [source,java,indent=0]
---- ----
import org.junit.*; import org.junit.Test;
import org.junit.runner.*; import org.junit.runner.RunWith;
import org.springframework.boot.test.autoconfigure.orm.jpa.*; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.test.context.transaction.TestTransaction; import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@RunWith(SpringRunner.class) @RunWith(SpringRunner.class)
@DataJpaTest @DataJpaTest

Loading…
Cancel
Save