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

Updated Spring Data based dependencies

Browse Source 
Spring Batch 4.0 will be part of the Spring Boot 2.0 release and so to
be compatible with Spring Data Kay, the dependencies have been upgraded
and tests fixed.

Resolves BATCH-2560
This commit is contained in:
Michael Minella
2016-12-13 16:23:37 -06:00
parent ee8c28d787
commit eb509dd741
2 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@@ -51,12 +51,12 @@ allprojects {
springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault
springRetryVersion = '1.1.3.RELEASE'
springAmqpVersion = '1.5.6.RELEASE'
springDataCommonsVersion = '1.11.5.RELEASE'
springDataGemfireVersion = '1.7.5.RELEASE'
springDataJpaVersion = '1.9.5.RELEASE'
springDataMongodbVersion = '1.8.5.RELEASE'
springDataCommonsVersion = '2.0.0.BUILD-SNAPSHOT'
springDataGemfireVersion = '2.0.0.BUILD-SNAPSHOT'
springDataJpaVersion = '2.0.0.BUILD-SNAPSHOT'
springDataMongodbVersion = '2.0.0.BUILD-SNAPSHOT'
springDataNeo4jVersion = '3.4.5.RELEASE'
springDataNeo4j4Version = '4.1.3.RELEASE' //?
springDataNeo4j4Version = '5.0.0.BUILD-SNAPSHOT' //?
springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT'
springLdapVersion = '2.0.4.RELEASE'

37
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java
View File

@@ -15,19 +15,20 @@
*/
package org.springframework.batch.item.data;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.core.query.Query;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
@@ -120,8 +121,8 @@ public class MongoItemReaderTests {
Query query = queryContainer.getValue();
assertEquals(50, query.getLimit());
assertEquals(0, query.getSkip());
assertEquals("{ }", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
}
@Test
@@ -137,8 +138,8 @@ public class MongoItemReaderTests {
assertEquals(50, query.getLimit());
assertEquals(100, query.getSkip());
assertEquals("{ }", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
assertNull(query.getFieldsObject());
}
@@ -154,9 +155,11 @@ public class MongoItemReaderTests {
Query query = queryContainer.getValue();
assertEquals(50, query.getLimit());
assertEquals(0, query.getSkip());
assertEquals("{ }", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ \"name\" : 1 , \"age\" : 1 , \"_id\" : 0}", query.getFieldsObject().toString());
assertEquals("{ }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
assertEquals(1, query.getFieldsObject().get("name"));
assertEquals(1, query.getFieldsObject().get("age"));
assertEquals(0, query.getFieldsObject().get("_id"));
}
@Test
@@ -171,8 +174,8 @@ public class MongoItemReaderTests {
Query query = queryContainer.getValue();
assertEquals(50, query.getLimit());
assertEquals(0, query.getSkip());
assertEquals("{ }", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
assertEquals("{ $natural : 1}", query.getHint());
}
@@ -193,8 +196,8 @@ public class MongoItemReaderTests {
Query query = queryContainer.getValue();
assertEquals(50, query.getLimit());
assertEquals(0, query.getSkip());
assertEquals("{ \"name\" : \"foo\"}", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
}
@SuppressWarnings("serial")
@@ -216,8 +219,8 @@ public class MongoItemReaderTests {
Query query = queryContainer.getValue();
assertEquals(50, query.getLimit());
assertEquals(0, query.getSkip());
assertEquals("{ \"name\" : \"foo\"}", query.getQueryObject().toString());
assertEquals("{ \"name\" : -1}", query.getSortObject().toString());
assertEquals("{ \"name\" : \"foo\" }", query.getQueryObject().toJson());
assertEquals("{ \"name\" : -1 }", query.getSortObject().toJson());
assertEquals("collection", collectionContainer.getValue());
}
}