Polish formatting

This commit is contained in:
Phillip Webb
2016-12-19 10:30:48 -08:00
parent e578ace7d7
commit bd74c3d327
346 changed files with 578 additions and 53 deletions

View File

@@ -58,6 +58,7 @@ public class AutoConfigurationReproTests {
@Configuration
public static class Config {
}
@Configuration

View File

@@ -37,17 +37,29 @@ import static org.assertj.core.api.Assertions.assertThat;
public class AutoConfigurationSorterTests {
private static final String LOWEST = OrderLowest.class.getName();
private static final String HIGHEST = OrderHighest.class.getName();
private static final String A = AutoConfigureA.class.getName();
private static final String B = AutoConfigureB.class.getName();
private static final String C = AutoConfigureC.class.getName();
private static final String D = AutoConfigureD.class.getName();
private static final String E = AutoConfigureE.class.getName();
private static final String W = AutoConfigureW.class.getName();
private static final String X = AutoConfigureX.class.getName();
private static final String Y = AutoConfigureY.class.getName();
private static final String Z = AutoConfigureZ.class.getName();
private static final String A2 = AutoConfigureA2.class.getName();
private static final String W2 = AutoConfigureW2.class.getName();
@Rule

View File

@@ -79,21 +79,25 @@ public class ImportAutoConfigurationTests {
@Configuration
static class ConfigA {
}
@Configuration
@AutoConfigureAfter(ConfigA.class)
static class ConfigB {
}
@Configuration
@AutoConfigureAfter(ConfigB.class)
static class ConfigC {
}
@Configuration
@AutoConfigureAfter(ConfigC.class)
static class ConfigD {
}
}

View File

@@ -55,4 +55,5 @@ public class MessageSourceAutoConfigurationIntegrationTests {
protected static class Config {
}
}

View File

@@ -204,4 +204,5 @@ public class MessageSourceAutoConfigurationTests {
}
}
}

View File

@@ -418,10 +418,12 @@ public class RabbitAutoConfigurationTests {
@Configuration
protected static class TestConfiguration2 {
@Bean
ConnectionFactory aDifferentConnectionFactory() {
return new CachingConnectionFactory("otherserver", 8001);
}
}
@Configuration
@@ -451,6 +453,7 @@ public class RabbitAutoConfigurationTests {
messagingTemplate.setDefaultDestination("fooBar");
return messagingTemplate;
}
}
@Configuration

View File

@@ -83,6 +83,7 @@ public class AopAutoConfigurationTests {
@Configuration
protected static class TestConfiguration {
@Bean
public TestAspect aspect() {
return new TestAspect();
@@ -92,16 +93,20 @@ public class AopAutoConfigurationTests {
public TestInterface bean() {
return new TestBean();
}
}
protected static class TestBean implements TestInterface {
@Override
public void foo() {
}
}
@Aspect
protected static class TestAspect {
private boolean called;
public boolean isCalled() {
@@ -112,6 +117,7 @@ public class AopAutoConfigurationTests {
public void before() {
this.called = true;
}
}
public interface TestInterface {

View File

@@ -269,11 +269,13 @@ public class BatchAutoConfigurationTests {
@Configuration
protected static class EmptyConfiguration {
}
@EnableBatchProcessing
@TestAutoConfigurationPackage(City.class)
protected static class TestConfiguration {
}
@EnableBatchProcessing
@@ -281,6 +283,7 @@ public class BatchAutoConfigurationTests {
protected static class TestCustomConfiguration implements BatchConfigurer {
private JobRepository jobRepository;
private MapJobRepositoryFactoryBean factory = new MapJobRepositoryFactoryBean();
@Override
@@ -311,10 +314,12 @@ public class BatchAutoConfigurationTests {
explorer.afterPropertiesSet();
return explorer.getObject();
}
}
@EnableBatchProcessing
protected static class NamedJobConfigurationWithRegisteredJob {
@Autowired
private JobRegistry jobRegistry;
@@ -351,6 +356,7 @@ public class BatchAutoConfigurationTests {
job.setJobRepository(this.jobRepository);
return job;
}
}
@EnableBatchProcessing
@@ -382,10 +388,12 @@ public class BatchAutoConfigurationTests {
job.setJobRepository(this.jobRepository);
return job;
}
}
@EnableBatchProcessing
protected static class JobConfiguration {
@Autowired
private JobRepository jobRepository;
@@ -412,6 +420,7 @@ public class BatchAutoConfigurationTests {
job.setJobRepository(this.jobRepository);
return job;
}
}
}

View File

@@ -804,6 +804,7 @@ public class CacheAutoConfigurationTests {
@Import({ GenericCacheConfiguration.class,
CacheManagerCustomizersConfiguration.class })
static class GenericCacheAndCustomizersConfiguration {
}
@Configuration

View File

@@ -35,7 +35,6 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
/**
*
* @author Stephane Nicoll
*/
public class CacheManagerCustomizersTests {
@@ -92,4 +91,5 @@ public class CacheManagerCustomizersTests {
}
}
}

View File

@@ -278,6 +278,7 @@ public class ConditionEvaluationReportTests {
}
}
}
static class TestMatchCondition extends SpringBootCondition

View File

@@ -160,19 +160,23 @@ public class ConditionalOnBeanTests {
@Configuration
@ConditionalOnBean(String.class)
protected static class OnBeanClassConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnBean(type = "java.lang.String")
protected static class OnBeanClassNameConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration

View File

@@ -111,4 +111,5 @@ public class ConditionalOnClassTests {
protected static class CombinedXmlConfiguration {
}
}

View File

@@ -51,18 +51,23 @@ public class ConditionalOnExpressionTests {
@Configuration
@ConditionalOnExpression("false")
protected static class MissingConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnExpression("true")
protected static class BasicConfiguration {
@Bean
public String foo() {
return "foo";
}
}
}

View File

@@ -174,28 +174,34 @@ public class ConditionalOnJavaTests {
@Configuration
@ConditionalOnJava(JavaVersion.NINE)
static class Java9Required {
@Bean
String foo() {
return "foo";
}
}
@Configuration
@ConditionalOnJava(range = Range.OLDER_THAN, value = JavaVersion.SIX)
static class Java5Required {
@Bean
String foo() {
return "foo";
}
}
@Configuration
@ConditionalOnJava(JavaVersion.SIX)
static class Java6Required {
@Bean
String foo() {
return "foo";
}
}
}

View File

@@ -157,6 +157,7 @@ public class ConditionalOnJndiTests {
public String foo() {
return "foo";
}
}
@Configuration
@@ -167,6 +168,7 @@ public class ConditionalOnJndiTests {
public String foo() {
return "foo";
}
}
private static class MockableOnJndi extends OnJndiCondition {
@@ -193,6 +195,7 @@ public class ConditionalOnJndiTests {
public void setFoundLocation(String foundLocation) {
this.foundLocation = foundLocation;
}
}
}

View File

@@ -423,6 +423,7 @@ public class ConditionalOnMissingBeanTests {
@Configuration
@Import(FactoryBeanRegistrar.class)
protected static class RegisteredFactoryBeanConfiguration {
}
protected static class FactoryBeanRegistrar implements ImportBeanDefinitionRegistrar {
@@ -621,4 +622,5 @@ public class ConditionalOnMissingBeanTests {
}
}
}

View File

@@ -52,27 +52,33 @@ public class ConditionalOnMissingClassTests {
@Configuration
@ConditionalOnMissingClass("org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClassTests")
protected static class BasicConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnMissingClass("FOO")
protected static class MissingConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
protected static class FooConfiguration {
@Bean
public String foo() {
return "foo";
}
}
}

View File

@@ -51,18 +51,23 @@ public class ConditionalOnNotWebApplicationTests {
@Configuration
@ConditionalOnWebApplication
protected static class MissingConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnNotWebApplication
protected static class BasicConfiguration {
@Bean
public String foo() {
return "foo";
}
}
}

View File

@@ -461,4 +461,5 @@ public class ConditionalOnPropertyTests {
public @interface ConditionalOnMyFeature {
}
}

View File

@@ -61,27 +61,34 @@ public class ConditionalOnResourceTests {
@Configuration
@ConditionalOnResource(resources = "foo")
protected static class MissingConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnResource(resources = "schema.sql")
protected static class BasicConfiguration {
@Bean
public String foo() {
return "foo";
}
}
@Configuration
@ConditionalOnResource(resources = "${schema}")
protected static class PlaceholderConfiguration {
@Bean
public String foo() {
return "foo";
}
}
}

View File

@@ -240,4 +240,5 @@ public class ConditionalOnSingleCandidateTests {
}
}
}

View File

@@ -54,18 +54,23 @@ public class ConditionalOnWebApplicationTests {
@Configuration
@ConditionalOnNotWebApplication
protected static class MissingConfiguration {
@Bean
public String bar() {
return "bar";
}
}
@Configuration
@ConditionalOnWebApplication
protected static class BasicConfiguration {
@Bean
public String foo() {
return "foo";
}
}
}

View File

@@ -79,6 +79,7 @@ public class ResourceConditionTests {
public String foo() {
return "foo";
}
}
@Configuration
@@ -89,6 +90,7 @@ public class ResourceConditionTests {
public String foo() {
return "foo";
}
}
private static class DefaultLocationResourceCondition extends ResourceCondition {
@@ -96,6 +98,7 @@ public class ResourceConditionTests {
DefaultLocationResourceCondition() {
super("test", "spring.foo.test.", "config", "classpath:/logging.properties");
}
}
private static class UnknownDefaultLocationResourceCondition
@@ -107,4 +110,5 @@ public class ResourceConditionTests {
}
}
}

View File

@@ -82,6 +82,7 @@ public class ConfigurationPropertiesAutoConfigurationTests {
public void setName(String name) {
this.name = name;
}
}
}

View File

@@ -117,6 +117,7 @@ public class CouchbaseTestServer implements TestRule {
}
}
}
}
private static class SkipStatement extends Statement {

View File

@@ -99,6 +99,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests {
public TestRepository testRepository(EntityManagerFactory entityManagerFactory) {
return new TestRepository(entityManagerFactory.createEntityManager());
}
}
@Repository
@@ -113,6 +114,7 @@ public class PersistenceExceptionTranslationAutoConfigurationTests {
public void doSomething() {
this.entityManager.persist(null);
}
}
}

View File

@@ -23,4 +23,5 @@ import org.springframework.data.repository.Repository;
* @author Eddú Meléndez
*/
public interface CityCouchbaseRepository extends Repository<City, Long> {
}

View File

@@ -81,4 +81,5 @@ public class City {
public void setMap(String map) {
this.map = map;
}
}

View File

@@ -110,4 +110,5 @@ public class ElasticsearchRepositoriesAutoConfigurationTests {
protected static class CustomizedConfiguration {
}
}

View File

@@ -66,4 +66,5 @@ public class City implements Serializable {
public String toString() {
return getName() + "," + getState() + "," + getCountry();
}
}

View File

@@ -112,4 +112,5 @@ public class JpaRepositoriesAutoConfigurationTests {
protected static class SortOfInvalidCustomConfiguration {
}
}

View File

@@ -73,4 +73,5 @@ public class City implements Serializable {
public String toString() {
return getName() + "," + getState() + "," + getCountry();
}
}

View File

@@ -210,6 +210,7 @@ public class MixedMongoRepositoriesAutoConfigurationTests {
}
return names.toArray(new String[0]);
}
}
}

View File

@@ -201,6 +201,7 @@ public class MongoDataAutoConfigurationTests {
public CustomConversions customConversions() {
return new CustomConversions(Arrays.asList(new MyConverter()));
}
}
@Configuration
@@ -223,4 +224,5 @@ public class MongoDataAutoConfigurationTests {
LocalDateTime date;
}
}

View File

@@ -127,4 +127,5 @@ public class MongoRepositoriesAutoConfigurationTests {
protected static class SortOfInvalidCustomConfiguration {
}
}

View File

@@ -74,4 +74,5 @@ public class City implements Serializable {
public String toString() {
return getName() + "," + getState() + "," + getCountry();
}
}

View File

@@ -52,4 +52,5 @@ public class Country implements Serializable {
public String toString() {
return getName();
}
}

View File

@@ -165,6 +165,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests {
}
return names.toArray(new String[names.size()]);
}
}
}

View File

@@ -111,5 +111,7 @@ public class SolrRepositoriesAutoConfigurationTests {
// To not find any repositories
@EnableSolrRepositories("foo.bar")
protected static class SortOfInvalidCustomConfiguration {
}
}

View File

@@ -26,4 +26,5 @@ import org.springframework.data.repository.Repository;
public interface CityRepository extends Repository<City, String> {
Page<City> findByNameStartingWith(String name, Pageable page);
}

View File

@@ -269,6 +269,7 @@ public class FlywayAutoConfigurationTests {
initializer.setOrder(Ordered.HIGHEST_PRECEDENCE);
return initializer;
}
}
@Configuration
@@ -310,6 +311,7 @@ public class FlywayAutoConfigurationTests {
public void assertCalled() {
assertThat(this.called).isTrue();
}
}
}

View File

@@ -456,6 +456,7 @@ public class JacksonAutoConfigurationTests {
public MyDateFormat() {
super("yyyy-MM-dd HH:mm:ss");
}
}
@Configuration
@@ -568,6 +569,7 @@ public class JacksonAutoConfigurationTests {
public void setPropertyName(String propertyName) {
this.propertyName = propertyName;
}
}
@JsonComponent

View File

@@ -76,6 +76,7 @@ public class DataSourceJsonSerializationTests {
@JsonSerialize(using = TomcatDataSourceSerializer.class)
protected interface DataSourceJson {
}
protected static class TomcatDataSourceSerializer extends JsonSerializer<DataSource> {

View File

@@ -148,6 +148,7 @@ public class JndiDataSourceAutoConfigurationTests {
MBeanExporter mbeanExporter() {
return new MBeanExporter();
}
}
}

View File

@@ -57,4 +57,5 @@ public class HikariDataSourcePoolMetadataTests
dataSource.setMaximumPoolSize(maxSize);
return dataSource;
}
}

View File

@@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomFilterContextPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -99,6 +99,7 @@ public class JerseyAutoConfigurationCustomFilterPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -43,6 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link JerseyAutoConfiguration} when using custom load on startup.
*
* @author Stephane Nicoll
*/
@RunWith(SpringRunner.class)
@@ -77,6 +78,7 @@ public class JerseyAutoConfigurationCustomLoadOnStartupTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletContextPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -100,6 +100,7 @@ public class JerseyAutoConfigurationCustomServletPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -97,6 +97,7 @@ public class JerseyAutoConfigurationDefaultFilterPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -98,6 +98,7 @@ public class JerseyAutoConfigurationDefaultServletPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -97,6 +97,7 @@ public class JerseyAutoConfigurationWithoutApplicationPathTests {
ServerPropertiesAutoConfiguration.class, JerseyAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -382,6 +382,7 @@ public class JmsAutoConfigurationTests {
@Configuration
protected static class TestConfiguration {
}
@Configuration
@@ -506,6 +507,7 @@ public class JmsAutoConfigurationTests {
return factory;
}
}
@Configuration

View File

@@ -359,6 +359,7 @@ public class ArtemisAutoConfigurationTests {
}
});
}
}
@Configuration
@@ -386,6 +387,7 @@ public class ArtemisAutoConfigurationTests {
topicConfiguration.setBindings("/topic/1");
return topicConfiguration;
}
}
@Configuration
@@ -400,6 +402,7 @@ public class ArtemisAutoConfigurationTests {
config.getQueueConfigurations().add(jmsQueueConfiguration);
return config;
}
}
@Configuration

View File

@@ -383,10 +383,12 @@ public class HornetQAutoConfigurationTests {
}
});
}
}
@Configuration
protected static class EmptyConfiguration {
}
@Configuration
@@ -402,6 +404,7 @@ public class HornetQAutoConfigurationTests {
TopicConfiguration sampleTopicConfiguration() {
return new TopicConfigurationImpl("sampleTopic", "/topic/1");
}
}
@Configuration
@@ -414,6 +417,7 @@ public class HornetQAutoConfigurationTests {
.add(new JMSQueueConfigurationImpl("custom", null, false));
return config;
}
}
@Configuration
@@ -430,6 +434,7 @@ public class HornetQAutoConfigurationTests {
}
};
}
}
}

View File

@@ -177,4 +177,5 @@ public class JmxAutoConfigurationTests {
}
}
}

View File

@@ -220,10 +220,12 @@ public class AutoConfigurationReportLoggingInitializerTests {
@Configuration
@Import(WebMvcAutoConfiguration.class)
static class ErrorConfig {
@Bean
public String iBreak() {
throw new RuntimeException();
}
}
}

View File

@@ -60,6 +60,7 @@ public class MustacheAutoConfigurationIntegrationTests {
@Autowired
private EmbeddedWebApplicationContext context;
private int port;
@Before
@@ -117,6 +118,7 @@ public class MustacheAutoConfigurationIntegrationTests {
DispatcherServletAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -66,6 +66,7 @@ public class MustacheWebIntegrationTests {
@Autowired
private EmbeddedWebApplicationContext context;
private int port;
@Before
@@ -143,6 +144,7 @@ public class MustacheWebIntegrationTests {
DispatcherServletAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
}

View File

@@ -308,6 +308,7 @@ public abstract class AbstractJpaAutoConfigurationTests {
@SuppressWarnings("serial")
static class CustomJpaTransactionManager extends JpaTransactionManager {
}
}

View File

@@ -106,4 +106,5 @@ public class CustomHibernateJpaAutoConfigurationTests {
protected static class TestConfiguration {
}
}

View File

@@ -75,4 +75,5 @@ public class City implements Serializable {
public String toString() {
return getName() + "," + getState() + "," + getCountry();
}
}

View File

@@ -68,6 +68,7 @@ public class ReactorAutoConfigurationTests {
public EventBus customEventBus() {
return EventBus.create(dispatcher());
}
}
}

View File

@@ -410,6 +410,7 @@ public class SecurityAutoConfigurationTests {
public void onApplicationEvent(AbstractAuthenticationEvent event) {
this.event = event;
}
}
@Configuration

View File

@@ -268,6 +268,7 @@ public class SpringBootWebSecurityConfigurationTests {
@MinimalWebConfiguration
@Import(SecurityAutoConfiguration.class)
protected static class VanillaWebConfiguration {
}
@MinimalWebConfiguration

View File

@@ -59,6 +59,7 @@ public class JpaUserDetailsTests {
PropertyPlaceholderAutoConfiguration.class, SecurityAutoConfiguration.class })
@ComponentScan(basePackageClasses = SecurityConfig.class)
public static class Main {
}
}

View File

@@ -425,6 +425,7 @@ public class OAuth2AutoConfigurationTests {
@Configuration
@EnableOAuth2Client
protected static class ClientConfiguration extends TestSecurityConfiguration {
}
@Configuration

View File

@@ -54,4 +54,5 @@ public class FacebookAutoConfigurationTests extends AbstractSocialAutoConfigurat
assertNoConnectionFrameworkBeans();
assertMissingBean(Facebook.class);
}
}

View File

@@ -94,6 +94,7 @@ public class TransactionAutoConfigurationTests {
@Configuration
static class EmptyConfiguration {
}
@Configuration
@@ -108,6 +109,7 @@ public class TransactionAutoConfigurationTests {
public PlatformTransactionManager transactionManagerTwo() {
return mock(PlatformTransactionManager.class);
}
}
@Configuration

View File

@@ -284,6 +284,7 @@ public class JtaAutoConfigurationTests {
XADataSource dataSource = mock(XADataSource.class);
return wrapper.wrapDataSource(dataSource);
}
}
}

View File

@@ -72,4 +72,5 @@ public class VelocityTemplateAvailabilityProviderTests {
assertThat(this.provider.isTemplateAvailable("suffixed", this.environment,
getClass().getClassLoader(), this.resourceLoader)).isTrue();
}
}

View File

@@ -130,6 +130,7 @@ public class BasicErrorControllerDirectMockMvcTests {
HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -132,6 +132,7 @@ public class BasicErrorControllerMockMvcTests {
HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -114,6 +114,7 @@ public class DefaultErrorViewIntegrationTests {
HttpMessageConvertersAutoConfiguration.class, ErrorMvcAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class })
protected @interface MinimalWebConfiguration {
}
@Configuration

View File

@@ -243,6 +243,7 @@ public class DispatcherServletAutoConfigurationTests {
public String dispatcherServlet() {
return "spring";
}
}
@Configuration

View File

@@ -247,10 +247,12 @@ public class EmbeddedServletContainerAutoConfigurationTests {
@Component
public static class CallbackEmbeddedContainerCustomizer
implements EmbeddedServletContainerCustomizer {
@Override
public void customize(ConfigurableEmbeddedServletContainer container) {
container.setPort(9000);
}
}
}

View File

@@ -240,10 +240,12 @@ public class HttpMessageConvertersAutoConfigurationTests {
@Configuration
protected static class JacksonObjectMapperConfig {
@Bean
public ObjectMapper objectMapper() {
return new ObjectMapper();
}
}
@Configuration
@@ -258,6 +260,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
public Jackson2ObjectMapperBuilder builder() {
return new Jackson2ObjectMapperBuilder();
}
}
@Configuration
@@ -270,6 +273,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
converter.setObjectMapper(objectMapper);
return converter;
}
}
@Configuration
@@ -281,6 +285,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
converter.setGson(gson);
return converter;
}
}
@Configuration
@@ -290,6 +295,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
public StringHttpMessageConverter customStringMessageConverter() {
return new StringHttpMessageConverter();
}
}
@Configuration
@@ -300,6 +306,7 @@ public class HttpMessageConvertersAutoConfigurationTests {
return new TypeConstrainedMappingJackson2HttpMessageConverter(
ResourceSupport.class);
}
}
}

View File

@@ -223,10 +223,12 @@ public class MultipartAutoConfigurationTests {
@Configuration
public static class ContainerWithNothing {
}
@Configuration
public static class ContainerWithNoMultipartJetty {
@Bean
JettyEmbeddedServletContainerFactory containerFactory() {
return new JettyEmbeddedServletContainerFactory();
@@ -236,10 +238,12 @@ public class MultipartAutoConfigurationTests {
WebController controller() {
return new WebController();
}
}
@Configuration
public static class ContainerWithNoMultipartUndertow {
@Bean
UndertowEmbeddedServletContainerFactory containerFactory() {
return new UndertowEmbeddedServletContainerFactory();
@@ -249,6 +253,7 @@ public class MultipartAutoConfigurationTests {
WebController controller() {
return new WebController();
}
}
@Configuration

View File

@@ -754,6 +754,7 @@ public class WebMvcAutoConfigurationTests {
private static class CustomWebBindingInitializer
extends ConfigurableWebBindingInitializer {
}
@Configuration
@@ -780,6 +781,7 @@ public class WebMvcAutoConfigurationTests {
};
}
}
private static class MyRequestMappingHandlerMapping
@@ -801,6 +803,7 @@ public class WebMvcAutoConfigurationTests {
};
}
}
private static class MyRequestMappingHandlerAdapter