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
master
Phillip Webb 6 years ago committed by Juergen Hoeller
parent e9d1b39aff
commit 04a8c285df
  1. 6
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
  2. 4
      spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
  3. 4
      spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java
  4. 2
      spring-web/src/main/java/org/springframework/web/util/ServletContextPropertyUtils.java
  5. 3
      spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java

@ -875,7 +875,11 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
/** /**
* Holder used to keep a reference to a {@code Class} value. * 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(); final Holder objectType = new Holder();

@ -723,8 +723,8 @@ public class JmsTemplate extends JmsDestinationAccessor implements JmsOperations
return receiveSelected(destinationName, null); return receiveSelected(destinationName, null);
} }
@Override@Nullable @Override
@Nullable
public Message receiveSelected(String messageSelector) throws JmsException { public Message receiveSelected(String messageSelector) throws JmsException {
Destination defaultDestination = getDefaultDestination(); Destination defaultDestination = getDefaultDestination();
if (defaultDestination != null) { if (defaultDestination != null) {

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -144,7 +144,7 @@ public @interface Sql {
* local vs. global configuration, inheritance, overrides, etc. * local vs. global configuration, inheritance, overrides, etc.
* <p>Defaults to an empty {@link SqlConfig @SqlConfig} instance. * <p>Defaults to an empty {@link SqlConfig @SqlConfig} instance.
*/ */
SqlConfig config() default @SqlConfig(); SqlConfig config() default @SqlConfig;
/** /**

@ -93,7 +93,7 @@ public abstract class ServletContextPropertyUtils {
this.servletContext = servletContext; this.servletContext = servletContext;
} }
@Override @Override
@Nullable @Nullable
public String resolvePlaceholder(String placeholderName) { public String resolvePlaceholder(String placeholderName) {
try { try {

@ -1039,7 +1039,8 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
protected void addCorsMappings(CorsRegistry registry) { protected void addCorsMappings(CorsRegistry registry) {
} }
@Bean @Lazy @Bean
@Lazy
public HandlerMappingIntrospector mvcHandlerMappingIntrospector() { public HandlerMappingIntrospector mvcHandlerMappingIntrospector() {
return new HandlerMappingIntrospector(); return new HandlerMappingIntrospector();
} }

Loading…
Cancel
Save