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

Fix Checkstyle issues; upgrade some dependencies

Browse Source
This commit is contained in:
Artem Bilan
2020-08-07 16:40:49 -04:00
parent 3de0445aaa
commit 65ad76232e
4 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
build.gradle
View File

@@ -45,9 +45,9 @@ ext {
modifiedFiles =
files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
activeMqVersion = '5.15.13'
activeMqVersion = '5.16.0'
apacheSshdVersion = '2.5.0'
aspectjVersion = '1.9.5'
aspectjVersion = '1.9.6'
assertjVersion = '3.16.1'
assertkVersion = '0.22'
avroVersion = '1.9.2'
@@ -62,10 +62,10 @@ ext {
groovyVersion = '3.0.4'
hamcrestVersion = '2.2'
hazelcastVersion = '4.0.1'
hibernateVersion = '5.4.18.Final'
hsqldbVersion = '2.5.0'
hibernateVersion = '5.4.19.Final'
hsqldbVersion = '2.5.1'
h2Version = '1.4.200'
jacksonVersion = '2.11.0'
jacksonVersion = '2.11.2'
javaxActivationVersion = '1.2.0'
javaxAnnotationVersion= '1.3.2'
javaxMailVersion = '1.6.2'
@@ -82,10 +82,10 @@ ext {
kryoShadedVersion = '4.0.2'
lettuceVersion = '6.0.0.M1'
log4jVersion = '2.13.3'
micrometerVersion = '1.5.2'
micrometerVersion = '1.5.3'
mockitoVersion = '3.3.3'
mongoDriverVersion = '4.1.0-rc0'
mysqlVersion = '8.0.20'
mongoDriverVersion = '4.1.0'
mysqlVersion = '8.0.21'
pahoMqttClientVersion = '1.2.4'
postgresVersion = '42.2.14'
reactorVersion = '2020.0.0-SNAPSHOT'
@@ -103,7 +103,7 @@ ext {
springRetryVersion = '1.3.0'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.3.0-SNAPSHOT'
springWsVersion = '3.0.9.RELEASE'
tomcatVersion = "9.0.36"
tomcatVersion = "9.0.37"
xstreamVersion = '1.4.12'
r2dbch2Version='0.8.4.RELEASE'

2
spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/ReactiveRedisStreamMessageProducerTests.java
View File

@@ -40,12 +40,10 @@ import org.springframework.integration.redis.rules.RedisAvailableRule;
import org.springframework.integration.redis.rules.RedisAvailableTests;
import org.springframework.integration.redis.util.Address;
import org.springframework.integration.redis.util.Person;
import org.springframework.messaging.Message;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import reactor.core.publisher.BaseSubscriber;
import reactor.core.publisher.Flux;
import reactor.test.StepVerifier;

8
spring-integration-redis/src/test/java/org/springframework/integration/redis/util/Address.java
View File

@@ -41,8 +41,12 @@ public class Address implements Serializable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Address address1 = (Address) o;
return Objects.equals(this.address, address1.address);
}

8
spring-integration-redis/src/test/java/org/springframework/integration/redis/util/Person.java
View File

@@ -54,8 +54,12 @@ public class Person implements Serializable {
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
Person person = (Person) o;
return Objects.equals(this.address, person.address) &&
Objects.equals(this.name, person.name);