From cd8bc2f82aff1d4515fbd6d2e5dce6825fa3fc95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 22 Dec 2023 11:23:11 +0100 Subject: [PATCH] Remove useless empty inheritDoc Javadoc tag --- .../context/cache/DefaultContextCache.java | 42 ------------------- .../AbstractTestContextBootstrapper.java | 3 -- .../support/DefaultBootstrapContext.java | 8 +--- .../support/InterceptingHttpAccessor.java | 5 +-- .../tags/form/AbstractHtmlElementTag.java | 3 -- .../view/json/MappingJackson2JsonView.java | 3 -- 6 files changed, 2 insertions(+), 62 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java index 161d4654aad..99342ec4964 100644 --- a/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java +++ b/spring-test/src/main/java/org/springframework/test/context/cache/DefaultContextCache.java @@ -114,18 +114,12 @@ public class DefaultContextCache implements ContextCache { } - /** - * {@inheritDoc} - */ @Override public boolean contains(MergedContextConfiguration key) { Assert.notNull(key, "Key must not be null"); return this.contextMap.containsKey(key); } - /** - * {@inheritDoc} - */ @Override @Nullable public ApplicationContext get(MergedContextConfiguration key) { @@ -140,9 +134,6 @@ public class DefaultContextCache implements ContextCache { return context; } - /** - * {@inheritDoc} - */ @Override public void put(MergedContextConfiguration key, ApplicationContext context) { Assert.notNull(key, "Key must not be null"); @@ -159,9 +150,6 @@ public class DefaultContextCache implements ContextCache { } } - /** - * {@inheritDoc} - */ @Override public void remove(MergedContextConfiguration key, @Nullable HierarchyMode hierarchyMode) { Assert.notNull(key, "Key must not be null"); @@ -218,26 +206,17 @@ public class DefaultContextCache implements ContextCache { removedContexts.add(key); } - /** - * {@inheritDoc} - */ @Override public int getFailureCount(MergedContextConfiguration key) { return this.failureCounts.getOrDefault(key, 0); } - /** - * {@inheritDoc} - */ @Override public void incrementFailureCount(MergedContextConfiguration key) { this.totalFailureCount.incrementAndGet(); this.failureCounts.merge(key, 1, Integer::sum); } - /** - * {@inheritDoc} - */ @Override public int size() { return this.contextMap.size(); @@ -250,33 +229,21 @@ public class DefaultContextCache implements ContextCache { return this.maxSize; } - /** - * {@inheritDoc} - */ @Override public int getParentContextCount() { return this.hierarchyMap.size(); } - /** - * {@inheritDoc} - */ @Override public int getHitCount() { return this.hitCount.get(); } - /** - * {@inheritDoc} - */ @Override public int getMissCount() { return this.missCount.get(); } - /** - * {@inheritDoc} - */ @Override public void reset() { synchronized (this.contextMap) { @@ -287,9 +254,6 @@ public class DefaultContextCache implements ContextCache { } } - /** - * {@inheritDoc} - */ @Override public void clear() { synchronized (this.contextMap) { @@ -298,9 +262,6 @@ public class DefaultContextCache implements ContextCache { } } - /** - * {@inheritDoc} - */ @Override public void clearStatistics() { synchronized (this.contextMap) { @@ -309,9 +270,6 @@ public class DefaultContextCache implements ContextCache { } } - /** - * {@inheritDoc} - */ @Override public void logStatistics() { if (statsLogger.isDebugEnabled()) { diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java index 4baad015def..9da77a8a70b 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java @@ -204,9 +204,6 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot return TestContextSpringFactoriesUtils.loadFactoryImplementations(TestExecutionListener.class); } - /** - * {@inheritDoc} - */ @SuppressWarnings("unchecked") @Override public final MergedContextConfiguration buildMergedContextConfiguration() { diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java b/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java index 23a8ba1c4b1..bba46dd128d 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DefaultBootstrapContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -48,17 +48,11 @@ public class DefaultBootstrapContext implements BootstrapContext { this.cacheAwareContextLoaderDelegate = cacheAwareContextLoaderDelegate; } - /** - * {@inheritDoc} - */ @Override public Class getTestClass() { return this.testClass; } - /** - * {@inheritDoc} - */ @Override public CacheAwareContextLoaderDelegate getCacheAwareContextLoaderDelegate() { return this.cacheAwareContextLoaderDelegate; diff --git a/spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java b/spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java index 86dfcf9b993..b7bd4408210 100644 --- a/spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java +++ b/spring-web/src/main/java/org/springframework/http/client/support/InterceptingHttpAccessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2023 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. @@ -82,9 +82,6 @@ public abstract class InterceptingHttpAccessor extends HttpAccessor { return this.interceptors; } - /** - * {@inheritDoc} - */ @Override public void setRequestFactory(ClientHttpRequestFactory requestFactory) { super.setRequestFactory(requestFactory); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java index 5a7764ccf5f..cbb779337a8 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementTag.java @@ -429,9 +429,6 @@ public abstract class AbstractHtmlElementTag extends AbstractDataBoundFormElemen return this.dynamicAttributes; } - /** - * {@inheritDoc} - */ @Override public void setDynamicAttribute(String uri, String localName, Object value) throws JspException { if (this.dynamicAttributes == null) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java index 3cbb86b4d20..84b1d96bc43 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/json/MappingJackson2JsonView.java @@ -106,9 +106,6 @@ public class MappingJackson2JsonView extends AbstractJackson2View { this.jsonPrefix = (prefixJson ? ")]}', " : null); } - /** - * {@inheritDoc} - */ @Override public void setModelKey(String modelKey) { this.modelKeys = Collections.singleton(modelKey);