Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade to the released Milestones

Browse Source 
* SF-5.0 RC3
* AMQP2.0 M5
* Security 5.0 M3
* Spring Twitter 2.0 M4
* Gradle 4.0.1
* Checkstyle 8.0
* JsonPath 2.3
* Fix deprecations and Checkstyle violations
This commit is contained in:
Artem Bilan
2017-07-24 13:42:12 -04:00
parent 5a66854c67
commit c26cac4c17
6 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build.gradle
View File

@@ -91,7 +91,6 @@ subprojects { subproject ->
aspectjVersion = '1.8.10'
apacheSshdVersion = '1.4.0'
boonVersion = '0.34'
chronicleVersion = '3.5.3'
commonsDbcp2Version = '2.1.1'
commonsIoVersion = '2.4'
commonsNetVersion = '3.5'
@@ -115,7 +114,7 @@ subprojects { subproject ->
jpaApiVersion = '2.1.1'
jrubyVersion = '9.1.5.0'
jschVersion = '0.1.54'
jsonpathVersion = '2.2.0'
jsonpathVersion = '2.3.0'
junitVersion = '4.12'
jythonVersion = '2.5.3'
kryoShadedVersion = '3.0.3'
@@ -130,17 +129,17 @@ subprojects { subproject ->
servletApiVersion = '3.1.0'
slf4jVersion = "1.7.25"
smackVersion = '4.1.9'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M4'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.0.M5'
springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT'
springDataMongoVersion = '2.0.0.BUILD-SNAPSHOT'
springDataRedisVersion = '2.0.0.BUILD-SNAPSHOT'
springGemfireVersion = '2.0.0.BUILD-SNAPSHOT'
springSecurityVersion = '5.0.0.BUILD-SNAPSHOT'
springSocialTwitterVersion = '2.0.0.M2'
springSecurityVersion = '5.0.0.M3'
springSocialTwitterVersion = '2.0.0.M4'
springRetryVersion = '1.2.0.RELEASE'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.BUILD-SNAPSHOT'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.0.0.RC3'
springWsVersion = '2.4.0.RELEASE'
tomcatVersion = "8.5.14"
tomcatVersion = "8.5.16"
xmlUnitVersion = '1.6'
xstreamVersion = '1.4.7'
}
@@ -237,7 +236,7 @@ subprojects { subproject ->
checkstyle {
configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
toolVersion = "6.16.1"
toolVersion = "8.0"
}
artifacts {

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Fri Jun 23 15:29:14 EDT 2017
#Mon Jul 24 12:58:44 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-bin.zip

11
spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 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.
@@ -46,6 +46,8 @@ import org.springframework.util.Assert;
*
* @author Mark Fisher
* @author Gary Russell
* @author Artem Bilan
*
* @since 2.0
*/
@SuppressWarnings("serial")
@@ -55,9 +57,9 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
private final MessagePublishingInterceptor interceptor;
@SuppressWarnings("unchecked") //For JDK7
public PublisherAnnotationAdvisor(Class<? extends Annotation> ... publisherAnnotationTypes) {
this.publisherAnnotationTypes = new HashSet<Class<? extends Annotation>>(Arrays.asList(publisherAnnotationTypes));
@SuppressWarnings("unchecked")
public PublisherAnnotationAdvisor(Class<? extends Annotation>... publisherAnnotationTypes) {
this.publisherAnnotationTypes = new HashSet<>(Arrays.asList(publisherAnnotationTypes));
PublisherMetadataSource metadataSource = new MethodAnnotationPublisherMetadataSource(this.publisherAnnotationTypes);
this.interceptor = new MessagePublishingInterceptor(metadataSource);
}
@@ -69,6 +71,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen
/**
* A channel bean name to be used as default for publishing.
* @param defaultChannelName the default channel name.
* @since 4.0.3
*/

5
spring-integration-core/src/main/java/org/springframework/integration/json/JsonPathUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2013-2015 the original author or authors.
* Copyright 2013-2017 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.
@@ -29,6 +29,7 @@ import com.jayway.jsonpath.Predicate;
* Note {@link #evaluate} is used as {@code #jsonPath()} SpEL function.
*
* @author Artem Bilan
*
* @since 3.0
*/
public final class JsonPathUtils {
@@ -41,7 +42,7 @@ public final class JsonPathUtils {
return JsonPath.read((File) json, jsonPath, predicates);
}
else if (json instanceof URL) {
return JsonPath.read((URL) json, jsonPath, predicates);
return JsonPath.read(((URL) json).openStream(), jsonPath, predicates);
}
else if (json instanceof InputStream) {
return JsonPath.read((InputStream) json, jsonPath, predicates);

10
spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
View File

@@ -759,13 +759,13 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
}
}, method12 -> method12.getName().equals(methodName));
}
Method method = targetMethod.get();
if (method != null) {
method = org.springframework.util.ClassUtils.getMostSpecificMethod(method, targetObject.getClass());
Method theMethod = targetMethod.get();
if (theMethod != null) {
theMethod = org.springframework.util.ClassUtils.getMostSpecificMethod(theMethod, targetObject.getClass());
InvocableHandlerMethod invocableHandlerMethod =
this.messageHandlerMethodFactory.createInvocableHandlerMethod(targetObject, method);
this.messageHandlerMethodFactory.createInvocableHandlerMethod(targetObject, theMethod);
HandlerMethod handlerMethod = new HandlerMethod(invocableHandlerMethod, this.canProcessMessageList);
checkSpelInvokerRequired(targetClass.get(), method, handlerMethod);
checkSpelInvokerRequired(targetClass.get(), theMethod, handlerMethod);
Class<?> targetParameterType = handlerMethod.getTargetParameterType();
if (handlerMethod.isMessageMethod()) {
if (candidateMessageMethods.containsKey(targetParameterType)) {