From 798522d890717c6ef6daa5c9c2af6b193bddaa4f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 8 Feb 2018 15:46:49 -0800 Subject: [PATCH] Format with Eclipse Oxygen SR2 --- .../autoconfigure/CrshAutoConfiguration.java | 2 +- .../actuate/autoconfigure/MetricsFilter.java | 2 +- .../PublicMetricsAutoConfiguration.java | 7 +++---- ...CloudFoundryActuatorAutoConfiguration.java | 5 ++--- .../endpoint/mvc/HeapdumpMvcEndpoint.java | 4 ++-- .../actuate/trace/WebRequestTraceFilter.java | 2 +- .../MetricFilterAutoConfigurationTests.java | 4 ++-- .../jmx/EndpointMBeanExporterTests.java | 2 +- .../mvc/AuditEventsMvcEndpointTests.java | 4 ++-- .../batch/BatchAutoConfiguration.java | 2 +- .../boot/autoconfigure/cache/CacheType.java | 3 ++- .../cache/CouchbaseCacheConfiguration.java | 5 ++--- .../condition/BeanTypeRegistry.java | 2 +- .../condition/OnBeanCondition.java | 2 +- .../condition/OnPropertyCondition.java | 2 +- .../condition/SearchStrategy.java | 3 ++- .../data/redis/RedisAutoConfiguration.java | 4 ++-- .../flyway/FlywayAutoConfiguration.java | 5 ++--- .../ActiveMQConnectionFactoryFactory.java | 2 +- ...temisXAConnectionFactoryConfiguration.java | 2 +- .../client/EnableOAuth2SsoCondition.java | 4 ++-- .../web/WebMvcAutoConfiguration.java | 9 ++++----- ...uchBeanDefinitionFailureAnalyzerTests.java | 14 +++++++------ .../JacksonAutoConfigurationTests.java | 2 +- .../jdbc/DataSourceInitializerTests.java | 19 +++++++++--------- .../SecurityAutoConfigurationTests.java | 12 +++++++---- .../BasicErrorControllerIntegrationTests.java | 2 +- .../web/BasicErrorControllerMockMvcTests.java | 2 +- .../web/WebMvcAutoConfigurationTests.java | 2 +- .../cli/command/archive/ArchiveCommand.java | 2 +- .../compiler/CompilerAutoConfiguration.java | 2 +- ...ringSecurityCompilerAutoConfiguration.java | 5 ++--- .../SpringTestCompilerAutoConfiguration.java | 2 +- ...ingWebsocketCompilerAutoConfiguration.java | 5 ++--- .../cli/compiler/grape/AetherGrapeEngine.java | 5 ++--- .../grape/DependencyResolutionContext.java | 5 ++--- .../boot/groovy/GroovyTemplate.java | 4 ++-- .../TomcatLegacyCookieProcessorExample.java | 11 +++++----- ...RestTemplateProxyCustomizationExample.java | 2 +- .../rest/SampleDataRestApplicationTests.java | 8 ++++---- ...notationCustomizableTypeExcludeFilter.java | 2 +- .../json/app/ExampleJsonComponent.java | 2 +- .../mock/mockito/MockitoPostProcessor.java | 2 +- .../test/web/client/TestRestTemplate.java | 12 +++++------ .../web/client/TestRestTemplateTests.java | 4 ++-- .../json/JSONStringer.java | 4 ++-- .../json/JSONTokener.java | 4 ++-- ...ationMetadataAnnotationProcessorTests.java | 20 ++++++++----------- .../metadata/JsonMarshallerTests.java | 2 +- .../gradle/SpringBootPluginExtension.java | 3 ++- .../boot/loader/tools/Repackager.java | 2 +- .../loader/data/RandomAccessDataFile.java | 4 ++-- .../boot/loader/jar/JarFile.java | 2 +- .../loader/archive/JarFileArchiveTests.java | 8 +++----- .../boot/maven/RepackageMojo.java | 3 ++- .../boot/jackson/JsonObjectDeserializer.java | 2 +- .../ApplicationContextHeaderFilter.java | 2 +- .../boot/web/support/ErrorPageFilter.java | 8 ++++---- ...tEmbeddedServletContainerFactoryTests.java | 6 +++--- .../jackson/JsonObjectDeserializerTests.java | 2 +- .../boot/jackson/NameAndAgeJsonComponent.java | 2 +- .../servlet/testcomponents/TestServlet.java | 5 ++--- 62 files changed, 138 insertions(+), 144 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java index 133c51d6a2c..822dd0d1dde 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java @@ -377,7 +377,7 @@ public class CrshAutoConfiguration { BeanFactoryFilteringPluginDiscovery(ClassLoader classLoader, ListableBeanFactory beanFactory, String[] disabledPlugins) - throws NullPointerException { + throws NullPointerException { super(classLoader); this.beanFactory = beanFactory; this.disabledPlugins = disabledPlugins; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java index abfb791b09c..51c2b1fd972 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricsFilter.java @@ -98,7 +98,7 @@ final class MetricsFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { + throws ServletException, IOException { StopWatch stopWatch = createStopWatchIfNecessary(request); String path = new UrlPathHelper().getPathWithinApplication(request); int status = HttpStatus.INTERNAL_SERVER_ERROR.value(); diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java index f3353a73979..6e9f6b41201 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/PublicMetricsAutoConfiguration.java @@ -89,10 +89,9 @@ public class PublicMetricsAutoConfiguration { @Bean public MetricReaderPublicMetrics metricReaderPublicMetrics() { - return new MetricReaderPublicMetrics( - new CompositeMetricReader(this.metricReaders == null ? new MetricReader[0] - : this.metricReaders - .toArray(new MetricReader[this.metricReaders.size()]))); + return new MetricReaderPublicMetrics(new CompositeMetricReader( + this.metricReaders == null ? new MetricReader[0] : this.metricReaders + .toArray(new MetricReader[this.metricReaders.size()]))); } @Bean diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index d96d4401bd0..015c8f5be7f 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -89,9 +89,8 @@ public class CloudFoundryActuatorAutoConfiguration { String cloudControllerUrl = environment.getProperty("vcap.application.cf_api"); boolean skipSslValidation = cloudFoundryProperties .getProperty("skip-ssl-validation", Boolean.class, false); - return cloudControllerUrl == null ? null - : new CloudFoundrySecurityService(restTemplateBuilder, cloudControllerUrl, - skipSslValidation); + return cloudControllerUrl == null ? null : new CloudFoundrySecurityService( + restTemplateBuilder, cloudControllerUrl, skipSslValidation); } private CorsConfiguration getCorsConfiguration() { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java index c2cdc69c05d..1563cf42bd7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java @@ -76,7 +76,7 @@ public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint { @RequestMapping(method = RequestMethod.GET, produces = MediaType.APPLICATION_OCTET_STREAM_VALUE) public void invoke(@RequestParam(defaultValue = "true") boolean live, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws IOException, ServletException { if (!isEnabled()) { response.setStatus(HttpStatus.NOT_FOUND.value()); return; @@ -100,7 +100,7 @@ public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint { private void dumpHeap(boolean live, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException, InterruptedException { + throws IOException, ServletException, InterruptedException { if (this.heapDumper == null) { this.heapDumper = createHeapDumper(); } diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java index 522a7d7a97f..17b488fbab7 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/trace/WebRequestTraceFilter.java @@ -101,7 +101,7 @@ public class WebRequestTraceFilter extends OncePerRequestFilter implements Order @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) - throws ServletException, IOException { + throws ServletException, IOException { long startTime = System.nanoTime(); Map trace = getTrace(request); logTrace(request, trace); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index d45b16cafd0..c9bec62374c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -548,7 +548,7 @@ public class MetricFilterAutoConfigurationTests { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { + throws ServletException, IOException { // send redirect before filter chain is executed, like Spring Security sending // us back to a login page response.sendRedirect("http://example.com"); @@ -563,7 +563,7 @@ public class MetricFilterAutoConfigurationTests { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { + throws ServletException, IOException { response.sendError(HttpStatus.SERVICE_UNAVAILABLE.value()); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java index 09ecc318bdc..7c06947e9f7 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/jmx/EndpointMBeanExporterTests.java @@ -306,7 +306,7 @@ public class EndpointMBeanExporterTests { private ObjectName getObjectName(String domain, String beanKey, boolean includeIdentity, ApplicationContext applicationContext) - throws MalformedObjectNameException { + throws MalformedObjectNameException { if (includeIdentity) { return ObjectNameManager.getInstance(String.format( "%s:type=Endpoint,name=%s,identity=%s", domain, beanKey, ObjectUtils diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpointTests.java index f2a47e0008d..32d15067a77 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/AuditEventsMvcEndpointTests.java @@ -104,8 +104,8 @@ public class AuditEventsMvcEndpointTests { @Test public void invokeFilterByPrincipalAndDateAfter() throws Exception { - this.mvc.perform(get("/auditevents").param("principal", "user").param("after", - "2016-11-01T10:00:00+0000")) + this.mvc.perform(get("/auditevents") + .param("principal", "user").param("after", "2016-11-01T10:00:00+0000")) .andExpect(status().isOk()) .andExpect(content().string( containsString("\"principal\":\"user\",\"type\":\"login\""))) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java index daf4b467ebf..e6522b5c330 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java @@ -124,7 +124,7 @@ public class BatchAutoConfiguration { @ConditionalOnMissingBean(JobOperator.class) public SimpleJobOperator jobOperator(JobExplorer jobExplorer, JobLauncher jobLauncher, ListableJobLocator jobRegistry, JobRepository jobRepository) - throws Exception { + throws Exception { SimpleJobOperator factory = new SimpleJobOperator(); factory.setJobExplorer(jobExplorer); factory.setJobLauncher(jobLauncher); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java index 52e23438013..b5cfe8a254a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CacheType.java @@ -69,7 +69,8 @@ public enum CacheType { /** * Guava backed caching. */ - @Deprecated GUAVA, + @Deprecated + GUAVA, /** * Simple in-memory caching. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java index 302f1419d8f..3813a40a61e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cache/CouchbaseCacheConfiguration.java @@ -60,9 +60,8 @@ public class CouchbaseCacheConfiguration { public CouchbaseCacheManager cacheManager() { List cacheNames = this.cacheProperties.getCacheNames(); CouchbaseCacheManager cacheManager = new CouchbaseCacheManager( - CacheBuilder.newInstance(this.bucket) - .withExpiration(this.cacheProperties.getCouchbase() - .getExpirationSeconds()), + CacheBuilder.newInstance(this.bucket).withExpiration( + this.cacheProperties.getCouchbase().getExpirationSeconds()), cacheNames.toArray(new String[cacheNames.size()])); return this.customizers.customize(cacheManager); } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java index 5dcecbe977a..e0122041ab9 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/BeanTypeRegistry.java @@ -231,7 +231,7 @@ final class BeanTypeRegistry implements SmartInitializingSingleton { private Class doGetFactoryBeanGeneric(ConfigurableListableBeanFactory beanFactory, BeanDefinition definition, String name) - throws Exception, ClassNotFoundException, LinkageError { + throws Exception, ClassNotFoundException, LinkageError { if (StringUtils.hasLength(definition.getFactoryBeanName()) && StringUtils.hasLength(definition.getFactoryMethodName())) { return getConfigurationClassFactoryBeanGeneric(beanFactory, definition, name); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java index 738b1961a24..4ef91899ab8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnBeanCondition.java @@ -165,7 +165,7 @@ class OnBeanCondition extends SpringBootCondition implements ConfigurationCondit private Collection getBeanNamesForType(ListableBeanFactory beanFactory, String type, ClassLoader classLoader, boolean considerHierarchy) - throws LinkageError { + throws LinkageError { try { Set result = new LinkedHashSet(); collectBeanNamesForType(result, beanFactory, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java index e2d5176334f..220ccb7e500 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/OnPropertyCondition.java @@ -108,7 +108,7 @@ class OnPropertyCondition extends SpringBootCondition { ConditionMessage.forCondition(ConditionalOnProperty.class, spec) .found("different value in property", "different value in properties") - .items(Style.QUOTE, nonMatchingProperties)); + .items(Style.QUOTE, nonMatchingProperties)); } return ConditionOutcome.match(ConditionMessage .forCondition(ConditionalOnProperty.class, spec).because("matched")); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java index 1f541e80550..a125351ed4e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/SearchStrategy.java @@ -32,7 +32,8 @@ public enum SearchStrategy { * Search all parents and ancestors, but not the current context. * @deprecated as of 1.5 in favor of {@link SearchStrategy#ANCESTORS} */ - @Deprecated PARENTS, + @Deprecated + PARENTS, /** * Search all ancestors, but not the current context. diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java index a4916e8143c..daefc1b6412 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfiguration.java @@ -229,7 +229,7 @@ public class RedisAutoConfiguration { @ConditionalOnMissingBean(name = "redisTemplate") public RedisTemplate redisTemplate( RedisConnectionFactory redisConnectionFactory) - throws UnknownHostException { + throws UnknownHostException { RedisTemplate template = new RedisTemplate(); template.setConnectionFactory(redisConnectionFactory); return template; @@ -239,7 +239,7 @@ public class RedisAutoConfiguration { @ConditionalOnMissingBean(StringRedisTemplate.class) public StringRedisTemplate stringRedisTemplate( RedisConnectionFactory redisConnectionFactory) - throws UnknownHostException { + throws UnknownHostException { StringRedisTemplate template = new StringRedisTemplate(); template.setConnectionFactory(redisConnectionFactory); return template; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index 8c474f81ffa..37a14ec31ce 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -109,9 +109,8 @@ public class FlywayAutoConfiguration { Assert.state(!this.properties.getLocations().isEmpty(), "Migration script locations not configured"); boolean exists = hasAtLeastOneLocation(); - Assert.state(exists, - "Cannot find migrations location in: " + this.properties - .getLocations() + Assert.state(exists, "Cannot find migrations location in: " + + this.properties.getLocations() + " (please add migrations or check your Flyway configuration)"); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java index e5edb78f749..4be9e454db8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryFactory.java @@ -82,7 +82,7 @@ class ActiveMQConnectionFactoryFactory { private T createConnectionFactoryInstance( Class factoryClass) throws InstantiationException, IllegalAccessException, - InvocationTargetException, NoSuchMethodException { + InvocationTargetException, NoSuchMethodException { String brokerUrl = determineBrokerUrl(); String user = this.properties.getUser(); String password = this.properties.getPassword(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java index 1fda65de358..b5119c67bee 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisXAConnectionFactoryConfiguration.java @@ -47,7 +47,7 @@ class ArtemisXAConnectionFactoryConfiguration { @Bean(name = { "jmsConnectionFactory", "xaJmsConnectionFactory" }) public ConnectionFactory jmsConnectionFactory(ListableBeanFactory beanFactory, ArtemisProperties properties, XAConnectionFactoryWrapper wrapper) - throws Exception { + throws Exception { return wrapper.wrapConnectionFactory( new ArtemisConnectionFactoryFactory(beanFactory, properties) .createConnectionFactory(ActiveMQXAConnectionFactory.class)); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/EnableOAuth2SsoCondition.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/EnableOAuth2SsoCondition.java index 2ccc4feaeb1..bb3e282b2bf 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/EnableOAuth2SsoCondition.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/EnableOAuth2SsoCondition.java @@ -41,8 +41,8 @@ class EnableOAuth2SsoCondition extends SpringBootCondition { for (String name : enablers) { if (context.getBeanFactory().isTypeMatch(name, WebSecurityConfigurerAdapter.class)) { - return ConditionOutcome.match(message - .found("@EnableOAuth2Sso annotation on WebSecurityConfigurerAdapter") + return ConditionOutcome.match(message.found( + "@EnableOAuth2Sso annotation on WebSecurityConfigurerAdapter") .items(name)); } } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java index cdd704cde6f..1e181ac4884 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfiguration.java @@ -288,10 +288,9 @@ public class WebMvcAutoConfiguration { } Integer cachePeriod = this.resourceProperties.getCachePeriod(); if (!registry.hasMappingForPattern("/webjars/**")) { - customizeResourceHandlerRegistration( - registry.addResourceHandler("/webjars/**") - .addResourceLocations( - "classpath:/META-INF/resources/webjars/") + customizeResourceHandlerRegistration(registry + .addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/") .setCachePeriod(cachePeriod)); } String staticPathPattern = this.mvcProperties.getStaticPathPattern(); @@ -300,7 +299,7 @@ public class WebMvcAutoConfiguration { registry.addResourceHandler(staticPathPattern) .addResourceLocations( this.resourceProperties.getStaticLocations()) - .setCachePeriod(cachePeriod)); + .setCachePeriod(cachePeriod)); } } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index a3cd952e905..80d05d0d832 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -194,15 +194,17 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { } private void assertActionMissingType(FailureAnalysis analysis, Class type) { - assertThat(analysis.getAction()).startsWith(String - .format("Consider revisiting the conditions above or defining a bean of type '%s' " - + "in your configuration.", type.getName())); + assertThat(analysis.getAction()).startsWith(String.format( + "Consider revisiting the conditions above or defining a bean of type '%s' " + + "in your configuration.", + type.getName())); } private void assertActionMissingName(FailureAnalysis analysis, String name) { - assertThat(analysis.getAction()).startsWith(String - .format("Consider revisiting the conditions above or defining a bean named '%s' " - + "in your configuration.", name)); + assertThat(analysis.getAction()).startsWith(String.format( + "Consider revisiting the conditions above or defining a bean named '%s' " + + "in your configuration.", + name)); } private void assertBeanMethodDisabled(FailureAnalysis analysis, String description, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index b608a98e975..95d8b79d99a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -492,7 +492,7 @@ public class JacksonAutoConfigurationTests { @Override public void serialize(Foo value, JsonGenerator jgen, SerializerProvider provider) - throws IOException, JsonProcessingException { + throws IOException, JsonProcessingException { jgen.writeStartObject(); jgen.writeStringField("foo", "bar"); jgen.writeEndObject(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java index 28e43544840..7afcf9de585 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java @@ -140,16 +140,15 @@ public class DataSourceInitializerTests { @Test public void testDataSourceInitializedWithMultipleScripts() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:true", - "spring.datasource.schema:" - + ClassUtils.addResourcePathToPackagePath(getClass(), - "schema.sql") - + "," - + ClassUtils.addResourcePathToPackagePath(getClass(), - "another.sql"), - "spring.datasource.data:" + ClassUtils - .addResourcePathToPackagePath(getClass(), "data.sql")); + EnvironmentTestUtils + .addEnvironment(this.context, "spring.datasource.initialize:true", + "spring.datasource.schema:" + ClassUtils + .addResourcePathToPackagePath(getClass(), "schema.sql") + + "," + + ClassUtils.addResourcePathToPackagePath(getClass(), + "another.sql"), + "spring.datasource.data:" + ClassUtils + .addResourcePathToPackagePath(getClass(), "data.sql")); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index 45472bd5823..48ff9d7e10f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -104,8 +104,10 @@ public class SecurityAutoConfigurationTests { ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); - assertThat(this.context.getBean("securityFilterChainRegistration", - DelegatingFilterProxyRegistrationBean.class).getOrder()).isEqualTo( + assertThat(this.context + .getBean("securityFilterChainRegistration", + DelegatingFilterProxyRegistrationBean.class) + .getOrder()).isEqualTo( FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER - 100); } @@ -134,8 +136,10 @@ public class SecurityAutoConfigurationTests { ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); - assertThat(this.context.getBean("securityFilterChainRegistration", - DelegatingFilterProxyRegistrationBean.class).getOrder()).isEqualTo( + assertThat(this.context + .getBean("securityFilterChainRegistration", + DelegatingFilterProxyRegistrationBean.class) + .getOrder()).isEqualTo( FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER - 100); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java index f2c3b4f58e8..932d174c86b 100755 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java @@ -220,7 +220,7 @@ public class BasicErrorControllerIntegrationTests { @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) - throws Exception { + throws Exception { response.getWriter().write("ERROR_BEAN"); } }; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java index 3ed4e8a9a0c..c56f00c3f67 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java @@ -150,7 +150,7 @@ public class BasicErrorControllerMockMvcTests { @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) - throws Exception { + throws Exception { response.getWriter().write("ERROR_BEAN"); } }; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java index aa89133a829..bf6cf8dfb39 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -803,7 +803,7 @@ public class WebMvcAutoConfigurationTests { @Override protected void renderMergedOutputModel(Map model, HttpServletRequest request, HttpServletResponse response) - throws Exception { + throws Exception { response.getOutputStream().write("Hello World".getBytes()); } }; diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java index be7086f776e..1862157c8ec 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/archive/ArchiveCommand.java @@ -185,7 +185,7 @@ abstract class ArchiveCommand extends OptionParsingCommand { private void writeJar(File file, Class[] compiledClasses, List classpathEntries, List dependencies) - throws FileNotFoundException, IOException, URISyntaxException { + throws FileNotFoundException, IOException, URISyntaxException { final List libraries; JarWriter writer = new JarWriter(file); try { diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java index 9a15eee5a8c..8f3553ff518 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/CompilerAutoConfiguration.java @@ -89,7 +89,7 @@ public abstract class CompilerAutoConfiguration { */ public void apply(GroovyClassLoader loader, GroovyCompilerConfiguration configuration, GeneratorContext generatorContext, SourceUnit source, ClassNode classNode) - throws CompilationFailedException { + throws CompilationFailedException { } } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java index 2f8d10dee59..6d90f12c4a0 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringSecurityCompilerAutoConfiguration.java @@ -38,9 +38,8 @@ public class SpringSecurityCompilerAutoConfiguration extends CompilerAutoConfigu @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies - .ifAnyMissingClasses( - "org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity") + dependencies.ifAnyMissingClasses( + "org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity") .add("spring-boot-starter-security"); } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java index 3fe62888852..55bce1c2ca8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringTestCompilerAutoConfiguration.java @@ -53,7 +53,7 @@ public class SpringTestCompilerAutoConfiguration extends CompilerAutoConfigurati @Override public void apply(GroovyClassLoader loader, GroovyCompilerConfiguration configuration, GeneratorContext generatorContext, SourceUnit source, ClassNode classNode) - throws CompilationFailedException { + throws CompilationFailedException { if (!AstUtils.hasAtLeastOneAnnotation(classNode, "RunWith")) { AnnotationNode runWith = new AnnotationNode(ClassHelper.make("RunWith")); runWith.addMember("value", diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringWebsocketCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringWebsocketCompilerAutoConfiguration.java index 6c5057f1aaa..61dc79209bd 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringWebsocketCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/SpringWebsocketCompilerAutoConfiguration.java @@ -38,9 +38,8 @@ public class SpringWebsocketCompilerAutoConfiguration extends CompilerAutoConfig @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies - .ifAnyMissingClasses( - "org.springframework.web.socket.config.annotation.EnableWebSocket") + dependencies.ifAnyMissingClasses( + "org.springframework.web.socket.config.annotation.EnableWebSocket") .add("spring-boot-starter-websocket").add("spring-messaging"); } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java index 58224a5e307..e41cee8fb5c 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/AetherGrapeEngine.java @@ -94,9 +94,8 @@ public class AetherGrapeEngine implements GrapeEngine { private ProgressReporter getProgressReporter(DefaultRepositorySystemSession session, boolean quiet) { - String progressReporter = (quiet ? "none" - : System.getProperty( - "org.springframework.boot.cli.compiler.grape.ProgressReporter")); + String progressReporter = (quiet ? "none" : System.getProperty( + "org.springframework.boot.cli.compiler.grape.ProgressReporter")); if ("detail".equals(progressReporter) || Boolean.getBoolean("groovy.grape.report.downloads")) { return new DetailedProgressReporter(session, System.out); diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java index 94ecf81de9a..7dc0e383bf4 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/grape/DependencyResolutionContext.java @@ -105,9 +105,8 @@ public class DependencyResolutionContext { aetherDependency); } this.dependencyManagement = this.dependencyManagement == null - ? dependencyManagement - : new CompositeDependencyManagement(dependencyManagement, - this.dependencyManagement); + ? dependencyManagement : new CompositeDependencyManagement( + dependencyManagement, this.dependencyManagement); this.artifactCoordinatesResolver = new DependencyManagementArtifactCoordinatesResolver( this.dependencyManagement); } diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java index be5aca978b4..9a7bfd24978 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/GroovyTemplate.java @@ -47,8 +47,8 @@ public abstract class GroovyTemplate { } public static String template(TemplateEngine engine, String name, - Map model) throws IOException, CompilationFailedException, - ClassNotFoundException { + Map model) + throws IOException, CompilationFailedException, ClassNotFoundException { Writable writable = getTemplate(engine, name).make(model); StringWriter result = new StringWriter(); writable.writeTo(result); diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/context/embedded/TomcatLegacyCookieProcessorExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/context/embedded/TomcatLegacyCookieProcessorExample.java index 150f356f3e6..7681d01ef35 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/context/embedded/TomcatLegacyCookieProcessorExample.java +++ b/spring-boot-docs/src/main/java/org/springframework/boot/context/embedded/TomcatLegacyCookieProcessorExample.java @@ -49,12 +49,13 @@ public class TomcatLegacyCookieProcessorExample { ((TomcatEmbeddedServletContainerFactory) container) .addContextCustomizers(new TomcatContextCustomizer() { - @Override - public void customize(Context context) { - context.setCookieProcessor(new LegacyCookieProcessor()); - } + @Override + public void customize(Context context) { + context.setCookieProcessor( + new LegacyCookieProcessor()); + } - }); + }); } } diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java index 49bebf3256b..07807f5a16a 100644 --- a/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java +++ b/spring-boot-docs/src/main/java/org/springframework/boot/web/client/RestTemplateProxyCustomizationExample.java @@ -50,7 +50,7 @@ public class RestTemplateProxyCustomizationExample { @Override public HttpHost determineProxy(HttpHost target, HttpRequest request, HttpContext context) - throws HttpException { + throws HttpException { if (target.getHostName().equals("192.168.0.5")) { return null; } diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java index 81b77b5d890..712ac71a6ee 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java @@ -68,8 +68,8 @@ public class SampleDataRestApplicationTests { @Test public void findByNameAndCountry() throws Exception { - this.mvc.perform( - get("/api/cities/search/findByNameAndCountryAllIgnoringCase?name=Melbourne&country=Australia")) + this.mvc.perform(get( + "/api/cities/search/findByNameAndCountryAllIgnoringCase?name=Melbourne&country=Australia")) .andExpect(status().isOk()) .andExpect(jsonPath("state", equalTo("Victoria"))) .andExpect(jsonPath("name", equalTo("Melbourne"))); @@ -78,8 +78,8 @@ public class SampleDataRestApplicationTests { @Test public void findByContaining() throws Exception { - this.mvc.perform( - get("/api/cities/search/findByNameContainingAndCountryContainingAllIgnoringCase?name=&country=UK")) + this.mvc.perform(get( + "/api/cities/search/findByNameContainingAndCountryContainingAllIgnoringCase?name=&country=UK")) .andExpect(status().isOk()) .andExpect(jsonPath("_embedded.cities", hasSize(3))); } diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java index aaf77de6586..bcf9890d453 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/filter/AnnotationCustomizableTypeExcludeFilter.java @@ -93,7 +93,7 @@ public abstract class AnnotationCustomizableTypeExcludeFilter extends TypeExclud @SuppressWarnings("unchecked") protected final boolean isTypeOrAnnotated(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory, Class type) - throws IOException { + throws IOException { AnnotationTypeFilter annotationFilter = new AnnotationTypeFilter( (Class) type); AssignableTypeFilter typeFilter = new AssignableTypeFilter(type); diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleJsonComponent.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleJsonComponent.java index a3e28a1bd52..e2d785c6647 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleJsonComponent.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/json/app/ExampleJsonComponent.java @@ -53,7 +53,7 @@ public class ExampleJsonComponent { @Override protected ExampleCustomObject deserializeObject(JsonParser jsonParser, DeserializationContext context, ObjectCodec codec, JsonNode tree) - throws IOException { + throws IOException { return new ExampleCustomObject( nullSafeValue(tree.get("value"), String.class)); } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java index bcfee98d191..ca12f934700 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockitoPostProcessor.java @@ -370,7 +370,7 @@ public class MockitoPostProcessor extends InstantiationAwareBeanPostProcessorAda @Override public PropertyValues postProcessPropertyValues(PropertyValues pvs, PropertyDescriptor[] pds, final Object bean, String beanName) - throws BeansException { + throws BeansException { ReflectionUtils.doWithFields(bean.getClass(), new FieldCallback() { @Override diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java index 3e2f27fd709..390d0a4ea67 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java @@ -492,7 +492,7 @@ public class TestRestTemplate { */ public ResponseEntity postForEntity(String url, Object request, Class responseType, Map urlVariables) - throws RestClientException { + throws RestClientException { return this.restTemplate.postForEntity(url, request, responseType, urlVariables); } @@ -735,7 +735,7 @@ public class TestRestTemplate { */ public ResponseEntity exchange(String url, HttpMethod method, HttpEntity requestEntity, Class responseType, Object... urlVariables) - throws RestClientException { + throws RestClientException { return this.restTemplate.exchange(url, method, requestEntity, responseType, urlVariables); } @@ -780,7 +780,7 @@ public class TestRestTemplate { */ public ResponseEntity exchange(URI url, HttpMethod method, HttpEntity requestEntity, Class responseType) - throws RestClientException { + throws RestClientException { return this.restTemplate.exchange(applyRootUriIfNecessary(url), method, requestEntity, responseType); } @@ -863,7 +863,7 @@ public class TestRestTemplate { */ public ResponseEntity exchange(URI url, HttpMethod method, HttpEntity requestEntity, ParameterizedTypeReference responseType) - throws RestClientException { + throws RestClientException { return this.restTemplate.exchange(applyRootUriIfNecessary(url), method, requestEntity, responseType); } @@ -931,7 +931,7 @@ public class TestRestTemplate { */ public T execute(String url, HttpMethod method, RequestCallback requestCallback, ResponseExtractor responseExtractor, Object... urlVariables) - throws RestClientException { + throws RestClientException { return this.restTemplate.execute(url, method, requestCallback, responseExtractor, urlVariables); } @@ -955,7 +955,7 @@ public class TestRestTemplate { */ public T execute(String url, HttpMethod method, RequestCallback requestCallback, ResponseExtractor responseExtractor, Map urlVariables) - throws RestClientException { + throws RestClientException { return this.restTemplate.execute(url, method, requestCallback, responseExtractor, urlVariables); } diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java index 030f93a4939..ca0a32b7a79 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java @@ -255,7 +255,7 @@ public class TestRestTemplateTests { testRestTemplate.exchange( new RequestEntity(HttpMethod.GET, relativeUri), new ParameterizedTypeReference() { - }); + }); } }); @@ -286,7 +286,7 @@ public class TestRestTemplateTests { testRestTemplate.exchange(relativeUri, HttpMethod.GET, new HttpEntity(new byte[0]), new ParameterizedTypeReference() { - }); + }); } }); diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java index 69ccc6d8fbc..8d823eb9e29 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONStringer.java @@ -52,8 +52,8 @@ import java.util.List; * Each stringer may be used to encode a single top level value. Instances of this class * are not thread safe. Although this class is nonfinal, it was not designed for * inheritance and should not be subclassed. In particular, self-use by overrideable - * methods is not specified. See Effective Java Item 17, - * "Design and Document or inheritance or else prohibit it" for further information. + * methods is not specified. See Effective Java Item 17, "Design and Document or + * inheritance or else prohibit it" for further information. */ public class JSONStringer { diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java index ea98a4e0fbf..b6dd2ae3999 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/json-shade/java/org/springframework/boot/configurationprocessor/json/JSONTokener.java @@ -54,8 +54,8 @@ package org.springframework.boot.configurationprocessor.json; * Each tokener may be used to parse a single JSON string. Instances of this class are not * thread safe. Although this class is nonfinal, it was not designed for inheritance and * should not be subclassed. In particular, self-use by overrideable methods is not - * specified. See Effective Java Item 17, - * "Design and Document or inheritance or else prohibit it" for further information. + * specified. See Effective Java Item 17, "Design and Document or inheritance or + * else prohibit it" for further information. */ public class JSONTokener { diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index edbaaef161e..1ada0d4809e 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -380,18 +380,14 @@ public class ConfigurationMetadataAnnotationProcessorTests { ConfigurationMetadata metadata = compile(ClassWithNestedProperties.class); assertThat(metadata).has(Metadata.withGroup("nestedChildProps") .fromSource(ClassWithNestedProperties.NestedChildClass.class)); - assertThat(metadata) - .has(Metadata - .withProperty("nestedChildProps.child-class-property", - Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class) - .withDefaultValue(20)); - assertThat(metadata) - .has(Metadata - .withProperty("nestedChildProps.parent-class-property", - Integer.class) - .fromSource(ClassWithNestedProperties.NestedChildClass.class) - .withDefaultValue(10)); + assertThat(metadata).has(Metadata + .withProperty("nestedChildProps.child-class-property", Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(20)); + assertThat(metadata).has(Metadata + .withProperty("nestedChildProps.parent-class-property", Integer.class) + .fromSource(ClassWithNestedProperties.NestedChildClass.class) + .withDefaultValue(10)); } @Test diff --git a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java index 74b8af0d2f3..fafb48182dd 100644 --- a/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java +++ b/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/metadata/JsonMarshallerTests.java @@ -61,7 +61,7 @@ public class JsonMarshallerTests { new ItemHint.ValueProvider("first", Collections.singletonMap("target", "foo")), - new ItemHint.ValueProvider("second", null)))); + new ItemHint.ValueProvider("second", null)))); ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); JsonMarshaller marshaller = new JsonMarshaller(); marshaller.write(metadata, outputStream); diff --git a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java index 490b046e61c..c2eb3792f6a 100644 --- a/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java +++ b/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/SpringBootPluginExtension.java @@ -320,7 +320,8 @@ public class SpringBootPluginExtension { * Module Layout. * @deprecated as of 1.5 in favor of a custom {@link LayoutFactory} */ - @Deprecated MODULE(new Layouts.Module()), + @Deprecated + MODULE(new Layouts.Module()), /** * No layout. diff --git a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java index 0051ca6f44c..26bd7c0e9d4 100644 --- a/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java +++ b/spring-boot-tools/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/Repackager.java @@ -273,7 +273,7 @@ public class Repackager { private void repackage(JarFile sourceJar, JarWriter writer, final List unpackLibraries, final List standardLibraries) - throws IOException { + throws IOException { writer.writeManifest(buildManifest(sourceJar)); Set seen = new HashSet(); writeNestedLibraries(unpackLibraries, seen, writer); diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java index fc52bbdaaad..9e76b2cd20b 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/data/RandomAccessDataFile.java @@ -64,8 +64,8 @@ public class RandomAccessDataFile implements RandomAccessData { throw new IllegalArgumentException("File must not be null"); } if (!file.exists()) { - throw new IllegalArgumentException(String.format( - "File %s must exist", file.getAbsolutePath())); + throw new IllegalArgumentException( + String.format("File %s must exist", file.getAbsolutePath())); } this.file = file; this.filePool = new FilePool(file, concurrentReads); diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java index f6e17269846..2361ba7d03e 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java @@ -108,7 +108,7 @@ public class JarFile extends java.util.jar.JarFile { private JarFile(RandomAccessDataFile rootFile, String pathFromRoot, RandomAccessData data, JarEntryFilter filter, JarFileType type) - throws IOException { + throws IOException { super(rootFile.getFile()); this.rootFile = rootFile; this.pathFromRoot = pathFromRoot; diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java index 7474965874b..359819a23bc 100755 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/archive/JarFileArchiveTests.java @@ -125,11 +125,9 @@ public class JarFileArchiveTests { File nested = new File(this.archive .getNestedArchive(getEntriesMap(this.archive).get("nested.jar")).getUrl() .toURI()); - File anotherNested = new File( - this.archive - .getNestedArchive( - getEntriesMap(this.archive).get("another-nested.jar")) - .getUrl().toURI()); + File anotherNested = new File(this.archive + .getNestedArchive(getEntriesMap(this.archive).get("another-nested.jar")) + .getUrl().toURI()); assertThat(nested.getParent()).isEqualTo(anotherNested.getParent()); } diff --git a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java index ced1f32b164..2a37a4dc3fe 100644 --- a/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java +++ b/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java @@ -355,7 +355,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo { * Module Layout. * @deprecated as of 1.5 in favor of a custom {@link LayoutFactory} */ - @Deprecated MODULE(new Layouts.Module()), + @Deprecated + MODULE(new Layouts.Module()), /** * No Layout. diff --git a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java index 65904a12ee6..5ff326ec9bb 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java +++ b/spring-boot/src/main/java/org/springframework/boot/jackson/JsonObjectDeserializer.java @@ -73,7 +73,7 @@ public abstract class JsonObjectDeserializer */ protected abstract T deserializeObject(JsonParser jsonParser, DeserializationContext context, ObjectCodec codec, JsonNode tree) - throws IOException; + throws IOException; /** * Helper method to extract a value from the given {@code jsonNode} or return diff --git a/spring-boot/src/main/java/org/springframework/boot/web/filter/ApplicationContextHeaderFilter.java b/spring-boot/src/main/java/org/springframework/boot/web/filter/ApplicationContextHeaderFilter.java index 56b06180b4e..78fcc01ef5b 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/filter/ApplicationContextHeaderFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/filter/ApplicationContextHeaderFilter.java @@ -50,7 +50,7 @@ public class ApplicationContextHeaderFilter extends OncePerRequestFilter { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) - throws ServletException, IOException { + throws ServletException, IOException { response.addHeader(HEADER_NAME, this.applicationContext.getId()); filterChain.doFilter(request, response); } diff --git a/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java b/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java index 682c166f2a2..53c1ac3d33c 100644 --- a/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java +++ b/spring-boot/src/main/java/org/springframework/boot/web/support/ErrorPageFilter.java @@ -86,7 +86,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry { @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) - throws ServletException, IOException { + throws ServletException, IOException { ErrorPageFilter.this.doFilter(request, response, chain); } @@ -134,7 +134,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry { private void handleErrorStatus(HttpServletRequest request, HttpServletResponse response, int status, String message) - throws ServletException, IOException { + throws ServletException, IOException { if (response.isCommitted()) { handleCommittedResponse(request, null); return; @@ -151,7 +151,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry { private void handleException(HttpServletRequest request, HttpServletResponse response, ErrorWrapperResponse wrapped, Throwable ex) - throws IOException, ServletException { + throws IOException, ServletException { Class type = ex.getClass(); String errorPath = getErrorPath(type); if (errorPath == null) { @@ -168,7 +168,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry { private void forwardToErrorPage(String path, HttpServletRequest request, HttpServletResponse response, Throwable ex) - throws ServletException, IOException { + throws ServletException, IOException { if (logger.isErrorEnabled()) { String message = "Forwarding to error page from request " + getDescription(request) + " due to exception [" + ex.getMessage() diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index 26bccff1690..72f04946ebf 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -1124,13 +1124,13 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { protected String getResponse(String url, HttpComponentsClientHttpRequestFactory requestFactory, String... headers) - throws IOException, URISyntaxException { + throws IOException, URISyntaxException { return getResponse(url, HttpMethod.GET, requestFactory, headers); } protected String getResponse(String url, HttpMethod method, HttpComponentsClientHttpRequestFactory requestFactory, String... headers) - throws IOException, URISyntaxException { + throws IOException, URISyntaxException { ClientHttpResponse response = getClientResponse(url, method, requestFactory, headers); try { @@ -1162,7 +1162,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { protected ClientHttpResponse getClientResponse(String url, HttpMethod method, HttpComponentsClientHttpRequestFactory requestFactory, String... headers) - throws IOException, URISyntaxException { + throws IOException, URISyntaxException { ClientHttpRequest request = requestFactory.createRequest(new URI(url), method); request.getHeaders().add("Cookie", "JSESSIONID=" + "123"); for (String header : headers) { diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java index 1b6bf6e4cc1..717e27ce565 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/jackson/JsonObjectDeserializerTests.java @@ -199,7 +199,7 @@ public class JsonObjectDeserializerTests { @Override protected T deserializeObject(JsonParser jsonParser, DeserializationContext context, ObjectCodec codec, JsonNode tree) - throws IOException { + throws IOException { return null; } diff --git a/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java b/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java index 0bba846da9d..66c7ae85d82 100644 --- a/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java +++ b/spring-boot/src/test/java/org/springframework/boot/jackson/NameAndAgeJsonComponent.java @@ -49,7 +49,7 @@ public class NameAndAgeJsonComponent { @Override protected NameAndAge deserializeObject(JsonParser jsonParser, DeserializationContext context, ObjectCodec codec, JsonNode tree) - throws IOException { + throws IOException { String name = nullSafeValue(tree.get("name"), String.class); Integer age = nullSafeValue(tree.get("age"), Integer.class); return new NameAndAge(name, age); diff --git a/spring-boot/src/test/java/org/springframework/boot/web/servlet/testcomponents/TestServlet.java b/spring-boot/src/test/java/org/springframework/boot/web/servlet/testcomponents/TestServlet.java index b9adfb54adc..72b63f32c07 100644 --- a/spring-boot/src/test/java/org/springframework/boot/web/servlet/testcomponents/TestServlet.java +++ b/spring-boot/src/test/java/org/springframework/boot/web/servlet/testcomponents/TestServlet.java @@ -30,9 +30,8 @@ public class TestServlet extends HttpServlet { @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - resp.getWriter() - .print(((String) req.getServletContext() - .getAttribute("listenerAttribute")) + " " + resp.getWriter().print( + ((String) req.getServletContext().getAttribute("listenerAttribute")) + " " + req.getAttribute("filterAttribute")); resp.getWriter().flush(); }