From 64819bbc1dda4aa31efe668e0dd84d50b196b94b Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 10 May 2019 18:00:29 +0200 Subject: [PATCH] Clean up warnings --- .../cache/jcache/interceptor/KeyGeneratorAdapter.java | 2 +- .../quartz/MethodInvokingJobDetailFactoryBean.java | 8 ++++---- .../cache/jcache/JCacheCacheManagerTests.java | 2 +- .../cache/jcache/config/JCacheJavaConfigTests.java | 1 + .../jcache/interceptor/CacheResolverAdapterTests.java | 1 + .../cache/jcache/interceptor/JCacheErrorHandlerTests.java | 1 + .../cache/jcache/interceptor/JCacheKeyGeneratorTests.java | 2 +- .../cache/jcache/support/TestableCacheResolver.java | 1 + .../validation/beanvalidation2/ValidatorFactoryTests.java | 3 +++ .../springframework/core/io/buffer/DataBufferUtils.java | 4 ---- .../beans/NoDefinitionInSpringContextTestBean.java | 1 + .../servlet/function/DefaultEntityResponseBuilder.java | 2 +- .../web/servlet/function/RouterFunctionBuilderTests.java | 4 +++- 13 files changed, 19 insertions(+), 13 deletions(-) diff --git a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java index 3fe0a7927b..77d9d6439b 100644 --- a/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java +++ b/spring-context-support/src/main/java/org/springframework/cache/jcache/interceptor/KeyGeneratorAdapter.java @@ -107,7 +107,7 @@ class KeyGeneratorAdapter implements KeyGenerator { Object value = param.getValue(); if (param.getParameterPosition() == context.getAllParameters().length - 1 && context.getMethod().isVarArgs()) { - parameters.addAll((List) CollectionUtils.arrayToList(value)); + parameters.addAll(CollectionUtils.arrayToList(value)); } else { parameters.add(value); diff --git a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java index 8acd05866a..f4658c7c92 100644 --- a/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java +++ b/spring-context-support/src/main/java/org/springframework/scheduling/quartz/MethodInvokingJobDetailFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2019 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. @@ -21,6 +21,7 @@ import java.lang.reflect.InvocationTargetException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.quartz.DisallowConcurrentExecution; +import org.quartz.Job; import org.quartz.JobDetail; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; @@ -164,7 +165,6 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod @Override - @SuppressWarnings("unchecked") public void afterPropertiesSet() throws ClassNotFoundException, NoSuchMethodException { prepare(); @@ -172,13 +172,13 @@ public class MethodInvokingJobDetailFactoryBean extends ArgumentConvertingMethod String name = (this.name != null ? this.name : this.beanName); // Consider the concurrent flag to choose between stateful and stateless job. - Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class); + Class jobClass = (this.concurrent ? MethodInvokingJob.class : StatefulMethodInvokingJob.class); // Build JobDetail instance. JobDetailImpl jdi = new JobDetailImpl(); jdi.setName(name != null ? name : toString()); jdi.setGroup(this.group); - jdi.setJobClass((Class) jobClass); + jdi.setJobClass(jobClass); jdi.setDurability(true); jdi.getJobDataMap().put("methodInvoker", this); this.jobDetail = jdi; diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java index 117a7d127a..89a3c535b5 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/JCacheCacheManagerTests.java @@ -97,7 +97,7 @@ public class JCacheCacheManagerTests extends AbstractTransactionSupportingCacheM return cacheManager; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void addCache(String name) { cacheNames.add(name); Cache cache = mock(Cache.class); diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java index 4699615193..2368818695 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/config/JCacheJavaConfigTests.java @@ -74,6 +74,7 @@ public class JCacheJavaConfigTests extends AbstractJCacheAnnotationTests { cos.getExceptionCacheResolver()); JCacheInterceptor interceptor = context.getBean(JCacheInterceptor.class); assertSame(context.getBean("errorHandler", CacheErrorHandler.class), interceptor.getErrorHandler()); + context.close(); } @Test diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java index 5680960d37..ee1e5ebd9d 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/CacheResolverAdapterTests.java @@ -59,6 +59,7 @@ public class CacheResolverAdapterTests extends AbstractJCacheTests { adapter.resolveCaches(dummyContext)); } + @SuppressWarnings({ "rawtypes", "unchecked" }) protected CacheResolver getCacheResolver(CacheInvocationContext context, String cacheName) { CacheResolver cacheResolver = mock(CacheResolver.class); javax.cache.Cache cache; diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java index 27e7c74a73..5d6373771c 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheErrorHandlerTests.java @@ -66,6 +66,7 @@ public class JCacheErrorHandlerTests { this.errorCache = context.getBean("mockErrorCache", Cache.class); this.errorHandler = context.getBean(CacheErrorHandler.class); this.simpleService = context.getBean(SimpleService.class); + context.close(); } diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java index 54b12801cc..cf2e97b043 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/interceptor/JCacheKeyGeneratorTests.java @@ -43,7 +43,6 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; /** - * * @author Stephane Nicoll */ public class JCacheKeyGeneratorTests { @@ -60,6 +59,7 @@ public class JCacheKeyGeneratorTests { this.keyGenerator = context.getBean(TestKeyGenerator.class); this.simpleService = context.getBean(SimpleService.class); this.cache = context.getBean(CacheManager.class).getCache("test"); + context.close(); } @Test diff --git a/spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheResolver.java b/spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheResolver.java index c8423165ac..106749eaf2 100644 --- a/spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheResolver.java +++ b/spring-context-support/src/test/java/org/springframework/cache/jcache/support/TestableCacheResolver.java @@ -32,6 +32,7 @@ public class TestableCacheResolver implements CacheResolver { @Override public Cache resolveCache(CacheInvocationContext cacheInvocationContext) { String cacheName = cacheInvocationContext.getCacheName(); + @SuppressWarnings("unchecked") Cache mock = mock(Cache.class); given(mock.getName()).willReturn(cacheName); return mock; diff --git a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java index d2e5b3677c..8bb478cc83 100644 --- a/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java +++ b/spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/ValidatorFactoryTests.java @@ -63,9 +63,11 @@ import static org.junit.Assert.fail; /** * @author Juergen Hoeller */ +@SuppressWarnings("resource") public class ValidatorFactoryTests { @Test + @SuppressWarnings("cast") public void testSimpleValidation() { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.afterPropertiesSet(); @@ -92,6 +94,7 @@ public class ValidatorFactoryTests { } @Test + @SuppressWarnings("cast") public void testSimpleValidationWithCustomProvider() { LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean(); validator.setProviderClass(HibernateValidator.class); diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java index 60fd351e10..9e76321bbb 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/DataBufferUtils.java @@ -873,10 +873,6 @@ public abstract class DataBufferUtils { return -1; } - public void reset() { - this.matches = 0; - } - @Override public byte[] delimiter() { return Arrays.copyOf(this.delimiter, this.delimiter.length); diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/beans/NoDefinitionInSpringContextTestBean.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/beans/NoDefinitionInSpringContextTestBean.java index 145723edf7..9dd86a66b9 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/beans/NoDefinitionInSpringContextTestBean.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/beans/NoDefinitionInSpringContextTestBean.java @@ -18,6 +18,7 @@ package org.springframework.orm.jpa.hibernate.beans; public class NoDefinitionInSpringContextTestBean extends TestBean { + @SuppressWarnings("unused") private NoDefinitionInSpringContextTestBean() { throw new AssertionError("Unexpected call to the default constructor. " + "Is Spring trying to instantiate this class by itself, even though it should delegate to the fallback producer?" diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java index 3cb493f064..f245b72dac 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/function/DefaultEntityResponseBuilder.java @@ -258,7 +258,7 @@ final class DefaultEntityResponseBuilder implements EntityResponse.Builder return null; } - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "resource" }) protected void writeEntityWithMessageConverters(Object entity, HttpServletRequest request, HttpServletResponse response, ServerResponse.Context context) throws ServletException, IOException { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java index f93dd96596..9b1aaa871f 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/function/RouterFunctionBuilderTests.java @@ -35,6 +35,8 @@ import static org.junit.Assert.fail; import static org.springframework.web.servlet.function.RequestPredicates.HEAD; /** + * Unit tests for {@link RouterFunctionBuilder}. + * * @author Arjen Poutsma */ public class RouterFunctionBuilderTests { @@ -183,7 +185,7 @@ public class RouterFunctionBuilderTests { MockHttpServletRequest servletRequest = new MockHttpServletRequest("GET", "/foo"); ServerRequest fooRequest = new DefaultServerRequest(servletRequest, emptyList()); - Optional fooResponse = route.route(fooRequest) + route.route(fooRequest) .map(handlerFunction -> handle(handlerFunction, fooRequest)); assertEquals(4, filterCount.get());