From 04a8c285df4a4d0d691870a72132913437817b9e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 20 Jun 2018 17:17:28 -0700 Subject: [PATCH] Fix annotation styling issues Update all annotations so that each is on its own line and consistently use the short form (i.e. don't use `value=`) when possible. Issue: SPR-16968 --- .../factory/support/AbstractAutowireCapableBeanFactory.java | 6 +++++- .../main/java/org/springframework/jms/core/JmsTemplate.java | 4 ++-- .../java/org/springframework/test/context/jdbc/Sql.java | 4 ++-- .../web/util/ServletContextPropertyUtils.java | 2 +- .../config/annotation/WebMvcConfigurationSupport.java | 3 ++- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java index 436dc061d8..17f2e44046 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java @@ -875,7 +875,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac /** * Holder used to keep a reference to a {@code Class} value. */ - class Holder { @Nullable Class value = null; } + class Holder { + + @Nullable + Class value = null; + } final Holder objectType = new Holder(); diff --git a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java index f71f22afb1..79409c3843 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java @@ -723,8 +723,8 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations return receiveSelected(destinationName, null); } - @Override@Nullable - + @Override + @Nullable public Message receiveSelected(String messageSelector) throws JmsException { Destination defaultDestination = getDefaultDestination(); if (defaultDestination != null) { diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java index 5794dde30f..62dba38164 100644 --- a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java +++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ public @interface Sql { * local vs. global configuration, inheritance, overrides, etc. *

Defaults to an empty {@link SqlConfig @SqlConfig} instance. */ - SqlConfig config() default @SqlConfig(); + SqlConfig config() default @SqlConfig; /** diff --git a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java index 705f849bb5..677fdbcfde 100644 --- a/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java +++ b/spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java @@ -93,7 +93,7 @@ public abstract class ServletContextPropertyUtils { this.servletContext = servletContext; } - @Override + @Override @Nullable public String resolvePlaceholder(String placeholderName) { try { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java index 033d7d1403..d7b25610a8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java @@ -1039,7 +1039,8 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv protected void addCorsMappings(CorsRegistry registry) { } - @Bean @Lazy + @Bean + @Lazy public HandlerMappingIntrospector mvcHandlerMappingIntrospector() { return new HandlerMappingIntrospector(); } -- GitLab