From 8080f56db87868488ebd602821c45baa20f69475 Mon Sep 17 00:00:00 2001 From: igor-suhorukov Date: Wed, 28 Feb 2018 23:43:36 +0300 Subject: [PATCH] Polish: "@Override" should be used on overriding and implementing methods --- .../beans/TypeMismatchException.java | 1 + .../groovy/GroovyBeanDefinitionReader.java | 4 ++++ .../groovy/GroovyBeanDefinitionWrapper.java | 3 ++- .../util/FastByteArrayOutputStream.java | 2 ++ .../org/apache/commons/logging/LogFactory.java | 17 +++++++++++++++++ .../jms/support/JmsMessageHeaderAccessor.java | 1 + .../jms/support/SimpleJmsHeaderMapper.java | 2 ++ .../test/context/TestContextManager.java | 1 + .../htmlunit/HtmlUnitRequestBuilder.java | 4 ++++ .../webdriver/WebConnectionHtmlUnitDriver.java | 1 + .../reactive/AbstractListenerReadPublisher.java | 1 + .../AbstractListenerWriteFlushProcessor.java | 2 ++ .../web/util/pattern/RegexPathElement.java | 1 + .../condition/CompositeRequestCondition.java | 1 + .../condition/ProducesRequestCondition.java | 1 + .../condition/CompositeRequestCondition.java | 1 + .../mvc/condition/ConsumesRequestCondition.java | 1 + .../mvc/condition/ProducesRequestCondition.java | 1 + .../ConcurrentWebSocketSessionDecorator.java | 2 +- .../AbstractTyrusRequestUpgradeStrategy.java | 1 + .../standard/TomcatRequestUpgradeStrategy.java | 1 + .../UndertowRequestUpgradeStrategy.java | 1 + 22 files changed, 48 insertions(+), 2 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java index 1467c11c707..95fedf4f965 100644 --- a/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java +++ b/spring-beans/src/main/java/org/springframework/beans/TypeMismatchException.java @@ -121,6 +121,7 @@ public class TypeMismatchException extends PropertyAccessException { * Return the name of the affected property, if available. */ @Nullable + @Override public String getPropertyName() { return this.propertyName; } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java index fa916e8176d..39a2383391f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java @@ -237,6 +237,7 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp } Closure beans = new Closure(this) { + @Override public Object call(Object[] args) { invokeBeanDefiningClosure((Closure) args[0]); return null; @@ -815,14 +816,17 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp return retVal; } + @Override public Object invokeMethod(String name, Object args) { return InvokerHelper.invokeMethod(this.propertyValue, name, args); } + @Override public Object getProperty(String name) { return InvokerHelper.getProperty(this.propertyValue, name); } + @Override public void setProperty(String name, Object value) { InvokerHelper.setProperty(this.propertyValue, name, value); } diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java index 5ef8059eb68..fdda11ff56f 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionWrapper.java @@ -161,7 +161,7 @@ class GroovyBeanDefinitionWrapper extends GroovyObjectSupport { return this; } - + @Override public Object getProperty(String property) { if (this.definitionWrapper.isReadableProperty(property)) { return this.definitionWrapper.getPropertyValue(property); @@ -172,6 +172,7 @@ class GroovyBeanDefinitionWrapper extends GroovyObjectSupport { return super.getProperty(property); } + @Override public void setProperty(String property, Object newValue) { if (PARENT.equals(property)) { setParent(newValue); diff --git a/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java b/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java index 429423c691b..4a355c64495 100644 --- a/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java +++ b/spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java @@ -471,6 +471,7 @@ public class FastByteArrayOutputStream extends OutputStream { * Update the message digest with the remaining bytes in this stream. * @param messageDigest The message digest to update */ + @Override public void updateMessageDigest(MessageDigest messageDigest) { updateMessageDigest(messageDigest, available()); } @@ -481,6 +482,7 @@ public class FastByteArrayOutputStream extends OutputStream { * @param messageDigest The message digest to update * @param len how many bytes to read from this stream and use to update the message digest */ + @Override public void updateMessageDigest(MessageDigest messageDigest, int len) { if (this.currentBuffer == null) { // This stream doesn't have any data in it... diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java index 527d79afc98..add48d588e1 100644 --- a/spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java +++ b/spring-jcl/src/main/java/org/apache/commons/logging/LogFactory.java @@ -431,74 +431,87 @@ public abstract class LogFactory { super(logger); } + @Override public void fatal(Object message) { error(message); } + @Override public void fatal(Object message, Throwable exception) { error(message, exception); } + @Override public void error(Object message) { if (message instanceof String || this.logger.isErrorEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, null); } } + @Override public void error(Object message, Throwable exception) { if (message instanceof String || this.logger.isErrorEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.ERROR_INT, String.valueOf(message), null, exception); } } + @Override public void warn(Object message) { if (message instanceof String || this.logger.isWarnEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, null); } } + @Override public void warn(Object message, Throwable exception) { if (message instanceof String || this.logger.isWarnEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.WARN_INT, String.valueOf(message), null, exception); } } + @Override public void info(Object message) { if (message instanceof String || this.logger.isInfoEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, null); } } + @Override public void info(Object message, Throwable exception) { if (message instanceof String || this.logger.isInfoEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.INFO_INT, String.valueOf(message), null, exception); } } + @Override public void debug(Object message) { if (message instanceof String || this.logger.isDebugEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, null); } } + @Override public void debug(Object message, Throwable exception) { if (message instanceof String || this.logger.isDebugEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.DEBUG_INT, String.valueOf(message), null, exception); } } + @Override public void trace(Object message) { if (message instanceof String || this.logger.isTraceEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, null); } } + @Override public void trace(Object message, Throwable exception) { if (message instanceof String || this.logger.isTraceEnabled()) { this.logger.log(null, FQCN, LocationAwareLogger.TRACE_INT, String.valueOf(message), null, exception); } } + @Override protected Object readResolve() { return Slf4jDelegate.createLocationAwareLog(this.name); } @@ -623,6 +636,7 @@ public abstract class LogFactory { super(level, msg); } + @Override public String getSourceClassName() { if (!this.resolved) { resolve(); @@ -630,11 +644,13 @@ public abstract class LogFactory { return super.getSourceClassName(); } + @Override public void setSourceClassName(String sourceClassName) { super.setSourceClassName(sourceClassName); this.resolved = true; } + @Override public String getSourceMethodName() { if (!this.resolved) { resolve(); @@ -642,6 +658,7 @@ public abstract class LogFactory { return super.getSourceMethodName(); } + @Override public void setSourceMethodName(String sourceMethodName) { super.setSourceMethodName(sourceMethodName); this.resolved = true; diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java index 23834093752..e5cf58464ac 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsMessageHeaderAccessor.java @@ -128,6 +128,7 @@ public class JmsMessageHeaderAccessor extends NativeMessageHeaderAccessor { * @see JmsHeaders#TIMESTAMP */ @Nullable + @Override public Long getTimestamp() { return (Long) getHeader(JmsHeaders.TIMESTAMP); } diff --git a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java index af0d3e82f0c..f38302aa3c0 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java @@ -235,6 +235,7 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme *

Convert {@link MessageHeaders#CONTENT_TYPE} to {@code content_type} for JMS compliance. * @see #CONTENT_TYPE_PROPERTY */ + @Override protected String fromHeaderName(String headerName) { if (MessageHeaders.CONTENT_TYPE.equals(headerName)) { return CONTENT_TYPE_PROPERTY; @@ -247,6 +248,7 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme *

Convert the JMS-compliant {@code content_type} to {@link MessageHeaders#CONTENT_TYPE}. * @see #CONTENT_TYPE_PROPERTY */ + @Override protected String toHeaderName(String propertyName) { if (CONTENT_TYPE_PROPERTY.equals(propertyName)) { return MessageHeaders.CONTENT_TYPE; diff --git a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java index c28982d06fb..20288d7004d 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestContextManager.java @@ -96,6 +96,7 @@ public class TestContextManager { private final ThreadLocal testContextHolder = new ThreadLocal() { + @Override protected TestContext initialValue() { return copyTestContext(TestContextManager.this.testContext); } diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java index 87eb3802376..8766a9b88de 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java @@ -446,6 +446,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { super(servletContext, method, requestURI); } + @Override public HttpSession getSession(boolean create) { HttpSession session = super.getSession(false); if (session == null && create) { @@ -462,10 +463,12 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { return session; } + @Override public HttpSession getSession() { return super.getSession(); } + @Override public void setSession(HttpSession session) { super.setSession(session); } @@ -491,6 +494,7 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable { this.request = request; } + @Override public void invalidate() { super.invalidate(); synchronized (HtmlUnitRequestBuilder.this.sessions) { diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriver.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriver.java index 42395489322..487c95e92cb 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriver.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/webdriver/WebConnectionHtmlUnitDriver.java @@ -93,6 +93,7 @@ public class WebConnectionHtmlUnitDriver extends HtmlUnitDriver { * Return the current {@link WebClient}. * @since 4.3 */ + @Override public WebClient getWebClient() { Assert.state(this.webClient != null, "No WebClient set"); return this.webClient; diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java index d26d4e35818..0389e4cf725 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java @@ -272,6 +272,7 @@ public abstract class AbstractListenerReadPublisher implements Publisher { * send onComplete and onError until we after onSubscribe. */ SUBSCRIBING { + @Override void request(AbstractListenerReadPublisher publisher, long n) { if (Operators.validate(n)) { Operators.addCap(DEMAND_FIELD_UPDATER, publisher, n); diff --git a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java index 456109b10be..9009026bbc0 100644 --- a/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java +++ b/spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerWriteFlushProcessor.java @@ -262,6 +262,7 @@ public abstract class AbstractListenerWriteFlushProcessor implements Processo }, FLUSHING { + @Override public void onFlushPossible(AbstractListenerWriteFlushProcessor processor) { try { processor.flush(); @@ -277,6 +278,7 @@ public abstract class AbstractListenerWriteFlushProcessor implements Processo processor.state.get().onComplete(processor); } } + @Override public void onNext(AbstractListenerWriteFlushProcessor proc, Publisher pub) { // ignore } diff --git a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java index 6c2857f29d1..c4211a0acf0 100644 --- a/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java +++ b/spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java @@ -186,6 +186,7 @@ class RegexPathElement extends PathElement { return (this.regex.length - varsLength - this.variableNames.size()); } + @Override public int getCaptureCount() { return this.variableNames.size(); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java index 77eada63078..af6406ec794 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/condition/CompositeRequestCondition.java @@ -70,6 +70,7 @@ public class CompositeRequestCondition extends AbstractRequestCondition 0 ? (System.currentTimeMillis() - start) : 0); } - + @Override public void sendMessage(WebSocketMessage message) throws IOException { if (shouldNotSend()) { return; diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java index d4783adcc39..8b48a583a60 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/AbstractTyrusRequestUpgradeStrategy.java @@ -114,6 +114,7 @@ public abstract class AbstractTyrusRequestUpgradeStrategy extends AbstractStanda return StringUtils.tokenizeToStringArray(Version.getSupportedWireProtocolVersions(), ","); } + @Override protected List getInstalledExtensions(WebSocketContainer container) { try { return super.getInstalledExtensions(container); diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java index cb425a5fbab..8846272bbdd 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/TomcatRequestUpgradeStrategy.java @@ -81,6 +81,7 @@ public class TomcatRequestUpgradeStrategy extends AbstractStandardUpgradeStrateg } } + @Override public WsServerContainer getContainer(HttpServletRequest request) { return (WsServerContainer) super.getContainer(request); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java index 22624eefdbf..32e372ba2eb 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/server/standard/UndertowRequestUpgradeStrategy.java @@ -86,6 +86,7 @@ public class UndertowRequestUpgradeStrategy extends AbstractStandardUpgradeStrat } } + @Override public ServerWebSocketContainer getContainer(HttpServletRequest request) { return (ServerWebSocketContainer) super.getContainer(request); }