Clean up warnings in Gradle build, polishing, etc.

Author: sbrannen

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -198,8 +198,8 @@ public void testMatchWithArgs() throws Exception {
 		// not currently testable in a reliable fashion
 		//assertDoesNotMatchStringClass(classFilter);
 
-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, new Double(12))).as("Should match with setSomeNumber with Double input").isTrue();
-		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, new Integer(11))).as("Should not match setSomeNumber with Integer input").isFalse();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 12D)).as("Should match with setSomeNumber with Double input").isTrue();
+		assertThat(methodMatcher.matches(setSomeNumber, TestBean.class, 11)).as("Should not match setSomeNumber with Integer input").isFalse();
 		assertThat(methodMatcher.matches(getAge, TestBean.class)).as("Should not match getAge").isFalse();
 		assertThat(methodMatcher.isRuntime()).as("Should be a runtime match").isTrue();
 	}
@@ -224,10 +224,10 @@ public void testDynamicMatchingProxy() {
 		TestBean testBean = getAdvisedProxy(expression, interceptor);
 
 		assertThat(interceptor.getCount()).as("Calls should be 0").isEqualTo(0);
-		testBean.setSomeNumber(new Double(30));
+		testBean.setSomeNumber(30D);
 		assertThat(interceptor.getCount()).as("Calls should be 1").isEqualTo(1);
 
-		testBean.setSomeNumber(new Integer(90));
+		testBean.setSomeNumber(90);
 		assertThat(interceptor.getCount()).as("Calls should be 1").isEqualTo(1);
 	}
 

spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -91,9 +91,8 @@ public void testManualProxyJavaWithStaticPointcutAndTwoClassLoaders() throws Exc
 		// Make sure the interface is loaded from the  parent class loader
 		loader.excludeClass(TestService.class.getName());
 		loader.excludeClass(TestException.class.getName());
-		TestService other = (TestService) loader.loadClass(TestServiceImpl.class.getName()).newInstance();
+		TestService other = (TestService) loader.loadClass(TestServiceImpl.class.getName()).getDeclaredConstructor().newInstance();
 		testAdvice(new DefaultPointcutAdvisor(pointcut, logAdvice), logAdvice, other, "TestServiceImpl");
-
 	}
 
 	private void testAdvice(Advisor advisor, LogUserAdvice logAdvice, TestService target, String message)
@@ -127,7 +126,6 @@ public static class SimpleThrowawayClassLoader extends OverridingClassLoader {
 		public SimpleThrowawayClassLoader(ClassLoader parent) {
 			super(parent);
 		}
-
 	}
 
 

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java

@@ -83,6 +83,7 @@ public void testWithInstanceWithNonAspect() throws Exception {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void testSerializable() throws Exception {
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
 		proxyFactory.addAspect(LoggingAspectOnVarargs.class);
@@ -114,11 +115,11 @@ public void testWithInstance() throws Exception {
 	@Test
 	public void testWithNonSingletonAspectInstance() throws Exception {
 		AspectJProxyFactory pf = new AspectJProxyFactory();
-		assertThatIllegalArgumentException().isThrownBy(() ->
-				pf.addAspect(new PerThisAspect()));
+		assertThatIllegalArgumentException().isThrownBy(() -> pf.addAspect(new PerThisAspect()));
 	}
 
 	@Test  // SPR-13328
+	@SuppressWarnings("unchecked")
 	public void testProxiedVarargsWithEnumArray() throws Exception {
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
 		proxyFactory.addAspect(LoggingAspectOnVarargs.class);
@@ -127,6 +128,7 @@ public void testProxiedVarargsWithEnumArray() throws Exception {
 	}
 
 	@Test  // SPR-13328
+	@SuppressWarnings("unchecked")
 	public void testUnproxiedVarargsWithEnumArray() throws Exception {
 		AspectJProxyFactory proxyFactory = new AspectJProxyFactory(new TestBean());
 		proxyFactory.addAspect(LoggingAspectOnSetter.class);

spring-aop/src/test/java/org/springframework/aop/interceptor/CustomizableTraceInterceptorTests.java

@@ -136,7 +136,7 @@ public void testSunnyDayPathLogsCorrectlyWithPrettyMuchAllPlaceholdersMatching()
 
 		given(methodInvocation.getMethod()).willReturn(String.class.getMethod("toString", new Class[0]));
 		given(methodInvocation.getThis()).willReturn(this);
-		given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", new Long(2)});
+		given(methodInvocation.getArguments()).willReturn(new Object[]{"$ One \\$", 2L});
 		given(methodInvocation.proceed()).willReturn("Hello!");
 
 		Log log = mock(Log.class);

spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/SqlParameterSourceUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -44,7 +44,6 @@ public abstract class SqlParameterSourceUtils {
 	 * @see BeanPropertySqlParameterSource
 	 * @see NamedParameterJdbcTemplate#batchUpdate(String, SqlParameterSource[])
 	 */
-	@SuppressWarnings("unchecked")
 	public static SqlParameterSource[] createBatch(Object... candidates) {
 		return createBatch(Arrays.asList(candidates));
 	}

spring-messaging/src/main/java/org/springframework/messaging/rsocket/annotation/support/RSocketMessageHandler.java

@@ -71,10 +71,9 @@
  * {@link SocketAcceptor} adapter to register with the
  * {@link io.rsocket.core.RSocketServer}.
  *
- * <p>For a client, possibly in the same process as a server, consider
- * consider using the static factory method
- * {@link #responder(RSocketStrategies, Object...)} to obtain a client
- * responder to be registered via
+ * <p>For a client, possibly in the same process as a server, consider using the
+ * static factory method {@link #responder(RSocketStrategies, Object...)} to
+ * obtain a client responder to be registered via
  * {@link org.springframework.messaging.rsocket.RSocketRequester.Builder#rsocketConnector
  * RSocketRequester.Builder}.
  *
@@ -500,24 +499,25 @@ public static SocketAcceptor responder(RSocketStrategies strategies, Object... c
 	 * annotated handler methods. This is intended to be passed into
 	 * {@link org.springframework.messaging.rsocket.RSocketRequester.Builder#rsocketFactory}.
 	 * <p>In effect a shortcut to create and initialize
-	 * {@code RSocketMessageHandler} with the given strategies and handlers,
-	 * use {@link #responder()} to obtain the responder, and plug that into
+	 * {@code RSocketMessageHandler} with the given strategies and handlers.
+	 * Use {@link #responder()} to obtain the responder and plug that into
 	 * {@link io.rsocket.RSocketFactory.ClientRSocketFactory ClientRSocketFactory}.
 	 * For more advanced scenarios, e.g. discovering handlers through a custom
 	 * stereotype annotation, consider declaring {@code RSocketMessageHandler}
 	 * as a bean, and then obtain the responder from it.
 	 * @param strategies the strategies to set on the created
 	 * {@code RSocketMessageHandler}
 	 * @param candidateHandlers a list of Objects and/or Classes with annotated
-	 * handler methods; used to call {@link #setHandlers(List)} with
-	 * on the created {@code RSocketMessageHandler}
+	 * handler methods; used to call {@link #setHandlers(List)} on the created
+	 * {@code RSocketMessageHandler}
 	 * @return a configurer that may be passed into
 	 * {@link org.springframework.messaging.rsocket.RSocketRequester.Builder#rsocketFactory}
-	 * @deprecated as of 5.2.6  following the deprecation of
+	 * @deprecated as of 5.2.6 following the deprecation of
 	 * {@link io.rsocket.RSocketFactory.ClientRSocketFactory RSocketFactory.ClientRSocketFactory}
-	 * in RSocket 1.0 RC7.
+	 * in RSocket 1.0 RC7
 	 */
 	@Deprecated
+	@SuppressWarnings("deprecation")
 	public static org.springframework.messaging.rsocket.ClientRSocketFactoryConfigurer clientResponder(
 			RSocketStrategies strategies, Object... candidateHandlers) {
 
@@ -536,5 +536,3 @@ public static org.springframework.messaging.rsocket.ClientRSocketFactoryConfigur
 		};
 	}
 }
-
-