diff --git a/build.gradle b/build.gradle index 2cba31f9..f875d425 100644 --- a/build.gradle +++ b/build.gradle @@ -169,6 +169,7 @@ subprojects { subproject -> // suppress all console output during testing unless running `gradle -i` logging.captureStandardOutput(LogLevel.INFO) maxHeapSize = '1536m' +// jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=127.0.0.1:8111' jacoco { destinationFile = file("$buildDir/jacoco.exec") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda85..62d4c053 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b44297..622ab64a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d..fbd7c515 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 9109989e..a9f778a7 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingDeserializer.java b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingDeserializer.java index e4042366..71476786 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingDeserializer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingDeserializer.java @@ -148,11 +148,11 @@ public class DelegatingDeserializer implements Deserializer { Map> delegateMap, String selector, Class clazz) { try { - Deserializer delegate = (Deserializer) clazz.newInstance(); + Deserializer delegate = (Deserializer) clazz.getDeclaredConstructor().newInstance(); delegate.configure(configs, isKey); delegateMap.put(selector.trim(), delegate); } - catch (InstantiationException | IllegalAccessException e) { + catch (Exception e) { throw new IllegalArgumentException(e); } } diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingSerializer.java b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingSerializer.java index fb19d10e..3d93e491 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingSerializer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/DelegatingSerializer.java @@ -177,11 +177,11 @@ public class DelegatingSerializer implements Serializer { Map> delegateMap, String selector, Class clazz) { try { - Serializer delegate = (Serializer) clazz.newInstance(); + Serializer delegate = (Serializer) clazz.getDeclaredConstructor().newInstance(); delegate.configure(configs, isKey); delegateMap.put(selector.trim(), delegate); } - catch (InstantiationException | IllegalAccessException e) { + catch (Exception e) { throw new IllegalArgumentException(e); } } diff --git a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/ErrorHandlingDeserializer.java b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/ErrorHandlingDeserializer.java index d6a1eea6..bd2b569e 100644 --- a/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/ErrorHandlingDeserializer.java +++ b/spring-kafka/src/main/java/org/springframework/kafka/support/serializer/ErrorHandlingDeserializer.java @@ -1,5 +1,5 @@ /* - * Copyright 2018-2019 the original author or authors. + * Copyright 2018-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. @@ -141,9 +141,9 @@ public class ErrorHandlingDeserializer implements Deserializer { try { Object value = configs.get(configKey); Class clazz = value instanceof Class ? (Class) value : ClassUtils.forName((String) value, null); - this.delegate = setupDelegate(clazz.newInstance()); + this.delegate = setupDelegate(clazz.getDeclaredConstructor().newInstance()); } - catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException e) { + catch (Exception e) { throw new IllegalStateException(e); } } @@ -163,9 +163,10 @@ public class ErrorHandlingDeserializer implements Deserializer { Class clazz = value instanceof Class ? (Class) value : ClassUtils.forName((String) value, null); Assert.isTrue(Function.class.isAssignableFrom(clazz), "'function' must be a 'Function ', not a " + clazz.getName()); - this.failedDeserializationFunction = (Function) clazz.newInstance(); + this.failedDeserializationFunction = (Function) + clazz.getDeclaredConstructor().newInstance(); } - catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException e) { + catch (Exception e) { throw new IllegalStateException(e); } } diff --git a/spring-kafka/src/test/java/org/springframework/kafka/config/RecordMessagingMessageListenerAdapterTests.java b/spring-kafka/src/test/java/org/springframework/kafka/config/RecordMessagingMessageListenerAdapterTests.java index a2f1508d..5fc5ac39 100644 --- a/spring-kafka/src/test/java/org/springframework/kafka/config/RecordMessagingMessageListenerAdapterTests.java +++ b/spring-kafka/src/test/java/org/springframework/kafka/config/RecordMessagingMessageListenerAdapterTests.java @@ -71,8 +71,11 @@ public class RecordMessagingMessageListenerAdapterTests { for (Method method : declaredMethods) { if (method.getName().equals("defListen")) { defMethod = method; + methods.add(method); + } + else if (method.getName().equals("listen")) { + methods.add(method); } - methods.add(method); } TestMultiClass bean = new TestMultiClass(); MultiMethodKafkaListenerEndpoint endpoint = new MultiMethodKafkaListenerEndpoint<>(methods,