Skip to content

Commit 1ca15e5

Browse files
committed
Migrated modules using parent-spring-5:
ethereum persistence-modules/spring-data-elasticsearch persistence-modules/spring-data-mongodb spring-dispatcher-servlet spring-mvc-forms-jsp spring-mvc-java
1 parent 39bfa04 commit 1ca15e5

File tree

43 files changed

+366
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+366
-52
lines changed

ethereum/pom.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
<name>ethereum</name>
88

99
<parent>
10-
<artifactId>parent-spring-5-1</artifactId>
10+
<artifactId>parent-spring-5</artifactId>
1111
<groupId>com.baeldung</groupId>
1212
<version>0.0.1-SNAPSHOT</version>
13-
<relativePath>../parent-spring-5-1</relativePath>
13+
<relativePath>../parent-spring-5</relativePath>
1414
</parent>
1515

1616
<dependencies>
@@ -37,17 +37,17 @@
3737
<dependency>
3838
<groupId>org.springframework</groupId>
3939
<artifactId>spring-core</artifactId>
40-
<version>${springframework.version}</version>
40+
<version>${spring.version}</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.springframework</groupId>
4444
<artifactId>spring-web</artifactId>
45-
<version>${springframework.version}</version>
45+
<version>${spring.version}</version>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.springframework</groupId>
4949
<artifactId>spring-webmvc</artifactId>
50-
<version>${springframework.version}</version>
50+
<version>${spring.version}</version>
5151
</dependency>
5252

5353
<!-- Ethereum -->
@@ -123,12 +123,12 @@
123123
<dependency>
124124
<groupId>org.springframework</groupId>
125125
<artifactId>spring-context</artifactId>
126-
<version>${springframework.version}</version>
126+
<version>${spring.version}</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>org.springframework</groupId>
130130
<artifactId>spring-test</artifactId>
131-
<version>${springframework.version}</version>
131+
<version>${spring.version}</version>
132132
<scope>test</scope>
133133
</dependency>
134134

@@ -212,7 +212,6 @@
212212
<tomcat.version>8.5.4</tomcat.version>
213213
<ethereumj-core.version>1.5.0-RELEASE</ethereumj-core.version>
214214
<web3j.core.version>3.3.1</web3j.core.version>
215-
<springframework.version>5.0.5.RELEASE</springframework.version>
216215
<spring.boot.version>1.5.6.RELEASE</spring.boot.version>
217216
<mockito.version>2.21.0</mockito.version>
218217
<jackson-databind.version>2.9.7</jackson-databind.version>

persistence-modules/spring-data-elasticsearch/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-spring-5-1</artifactId>
12+
<artifactId>parent-spring-5</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../../parent-spring-5-1</relativePath>
14+
<relativePath>../../parent-spring-5</relativePath>
1515
</parent>
1616

1717
<dependencies>

persistence-modules/spring-data-elasticsearch/src/test/java/com/baeldung/elasticsearch/ElasticSearchManualTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@
3030

3131
import com.alibaba.fastjson.JSON;
3232

33+
/**
34+
*
35+
* This Manual test requires:
36+
* * Elasticsearch instance running on host
37+
* * with cluster name = elasticsearch
38+
*
39+
*/
3340
public class ElasticSearchManualTest {
3441
private List<Person> listOfPersons = new ArrayList<>();
3542
private Client client = null;
Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,17 @@
3131
import com.baeldung.spring.data.es.config.Config;
3232
import com.vividsolutions.jts.geom.Coordinate;
3333

34+
/**
35+
*
36+
* This Manual test requires:
37+
* * Elasticsearch instance running on host
38+
* * with cluster name = elasticsearch
39+
* * and further configurations
40+
*
41+
*/
3442
@RunWith(SpringJUnit4ClassRunner.class)
3543
@ContextConfiguration(classes = Config.class)
36-
public class GeoQueriesIntegrationTest {
44+
public class GeoQueriesManualTest {
3745

3846
private static final String WONDERS_OF_WORLD = "wonders-of-world";
3947
private static final String WONDERS = "Wonders";
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,16 @@
2727
import com.baeldung.spring.data.es.model.Author;
2828
import com.baeldung.spring.data.es.service.ArticleService;
2929

30+
/**
31+
*
32+
* This Manual test requires:
33+
* * Elasticsearch instance running on host
34+
* * with cluster name = elasticsearch
35+
*
36+
*/
3037
@RunWith(SpringJUnit4ClassRunner.class)
3138
@ContextConfiguration(classes = Config.class)
32-
public class ElasticSearchIntegrationTest {
39+
public class ElasticSearchManualTest {
3340

3441
@Autowired
3542
private ElasticsearchTemplate elasticsearchTemplate;
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,16 @@
4141
import com.baeldung.spring.data.es.model.Author;
4242
import com.baeldung.spring.data.es.service.ArticleService;
4343

44+
/**
45+
*
46+
* This Manual test requires:
47+
* * Elasticsearch instance running on host
48+
* * with cluster name = elasticsearch
49+
*
50+
*/
4451
@RunWith(SpringJUnit4ClassRunner.class)
4552
@ContextConfiguration(classes = Config.class)
46-
public class ElasticSearchQueryIntegrationTest {
53+
public class ElasticSearchQueryManualTest {
4754

4855
@Autowired
4956
private ElasticsearchTemplate elasticsearchTemplate;
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@
77

88
import com.baeldung.spring.data.es.config.Config;
99

10+
/**
11+
*
12+
* This Manual test requires:
13+
* * Elasticsearch instance running on host
14+
*
15+
*/
1016
@RunWith(SpringJUnit4ClassRunner.class)
1117
@ContextConfiguration(classes = Config.class)
12-
public class SpringContextIntegrationTest {
18+
public class SpringContextManualTest {
1319

1420
@Test
1521
public void whenSpringContextIsBootstrapped_thenNoExceptions() {

persistence-modules/spring-data-mongodb/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<parent>
88
<groupId>com.baeldung</groupId>
9-
<artifactId>parent-spring-5-1</artifactId>
9+
<artifactId>parent-spring-5</artifactId>
1010
<version>0.0.1-SNAPSHOT</version>
11-
<relativePath>../../parent-spring-5-1</relativePath>
11+
<relativePath>../../parent-spring-5</relativePath>
1212
</parent>
1313

1414
<dependencies>
@@ -96,7 +96,6 @@
9696
</build>
9797

9898
<properties>
99-
<spring.version>5.1.0.RELEASE</spring.version>
10099
<org.springframework.data.version>2.1.2.RELEASE</org.springframework.data.version>
101100
<querydsl.version>4.1.4</querydsl.version>
102101
<mysema.maven.version>1.1.3</mysema.maven.version>

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/aggregation/ZipsAggregationLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@
4444
import com.mongodb.client.MongoCollection;
4545
import com.mongodb.client.MongoDatabase;
4646

47+
/**
48+
*
49+
* This test requires:
50+
* * mongodb instance running on the environment
51+
*
52+
*/
4753
@RunWith(SpringJUnit4ClassRunner.class)
4854
@ContextConfiguration(classes = MongoConfig.class)
4955
public class ZipsAggregationLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/gridfs/GridFSLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
import com.mongodb.DBObject;
3232
import com.mongodb.client.gridfs.model.GridFSFile;
3333

34+
/**
35+
*
36+
* This test requires:
37+
* * mongodb instance running on the environment
38+
*
39+
*/
3440
@ContextConfiguration("file:src/main/resources/mongoConfig.xml")
3541
@RunWith(SpringJUnit4ClassRunner.class)
3642
public class GridFSLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/DocumentQueryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
import com.baeldung.model.EmailAddress;
2525
import com.baeldung.model.User;
2626

27+
/**
28+
*
29+
* This test requires:
30+
* * mongodb instance running on the environment
31+
*
32+
*/
2733
@RunWith(SpringJUnit4ClassRunner.class)
2834
@ContextConfiguration(classes = MongoConfig.class)
2935
public class DocumentQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/MongoTemplateProjectionLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@
1616
import static org.junit.Assert.assertNull;
1717
import static org.junit.Assert.assertTrue;
1818

19+
/**
20+
*
21+
* This test requires:
22+
* * mongodb instance running on the environment
23+
*
24+
*/
1925
@RunWith(SpringJUnit4ClassRunner.class)
2026
@ContextConfiguration(classes = SimpleMongoConfig.class)
2127
public class MongoTemplateProjectionLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/mongotemplate/MongoTemplateQueryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
import com.baeldung.model.EmailAddress;
2828
import com.baeldung.model.User;
2929

30+
/**
31+
*
32+
* This test requires:
33+
* * mongodb instance running on the environment
34+
*
35+
*/
3036
@RunWith(SpringJUnit4ClassRunner.class)
3137
@ContextConfiguration(classes = MongoConfig.class)
3238
public class MongoTemplateQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/ActionRepositoryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
import java.time.ZoneOffset;
1616
import java.time.ZonedDateTime;
1717

18+
/**
19+
*
20+
* This test requires:
21+
* * mongodb instance running on the environment
22+
*
23+
*/
1824
@RunWith(SpringJUnit4ClassRunner.class)
1925
@ContextConfiguration(classes = MongoConfig.class)
2026
public class ActionRepositoryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/BaseQueryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
import org.springframework.beans.factory.annotation.Autowired;
88
import org.springframework.data.mongodb.core.MongoOperations;
99

10+
/**
11+
*
12+
* This test requires:
13+
* * mongodb instance running on the environment
14+
*
15+
*/
1016
public class BaseQueryLiveTest {
1117

1218
@Autowired

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/DSLQueryLiveTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,12 @@
1515

1616
import com.querydsl.core.types.Predicate;
1717

18-
19-
18+
/**
19+
*
20+
* This test requires:
21+
* * mongodb instance running on the environment
22+
*
23+
*/
2024
@RunWith(SpringJUnit4ClassRunner.class)
2125
@ContextConfiguration(classes = MongoConfig.class)
2226
public class DSLQueryLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/JSONQueryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
import org.springframework.test.context.ContextConfiguration;
1313
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1414

15+
/**
16+
*
17+
* This test requires:
18+
* * mongodb instance running on the environment
19+
*
20+
*/
1521
@RunWith(SpringJUnit4ClassRunner.class)
1622
@ContextConfiguration(classes = MongoConfig.class)
1723
public class JSONQueryLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/QueryMethodsLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
import org.springframework.test.context.ContextConfiguration;
1313
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1414

15+
/**
16+
*
17+
* This test requires:
18+
* * mongodb instance running on the environment
19+
*
20+
*/
1521
@RunWith(SpringJUnit4ClassRunner.class)
1622
@ContextConfiguration(classes = MongoConfig.class)
1723
public class QueryMethodsLiveTest extends BaseQueryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/UserRepositoryLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
import com.baeldung.config.MongoConfig;
2424
import com.baeldung.model.User;
2525

26+
/**
27+
*
28+
* This test requires:
29+
* * mongodb instance running on the environment
30+
*
31+
*/
2632
@RunWith(SpringJUnit4ClassRunner.class)
2733
@ContextConfiguration(classes = MongoConfig.class)
2834
public class UserRepositoryLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/repository/UserRepositoryProjectionLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
import org.springframework.test.context.ContextConfiguration;
1414
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
1515

16+
/**
17+
*
18+
* This test requires:
19+
* * mongodb instance running on the environment
20+
*
21+
*/
1622
@RunWith(SpringJUnit4ClassRunner.class)
1723
@ContextConfiguration(classes = MongoConfig.class)
1824
public class UserRepositoryProjectionLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionReactiveLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
import com.baeldung.config.MongoReactiveConfig;
1313
import com.baeldung.model.User;
1414

15+
/**
16+
*
17+
* This test requires:
18+
* * mongodb instance running on the environment
19+
*
20+
*/
1521
@RunWith(SpringJUnit4ClassRunner.class)
1622
@ContextConfiguration(classes = MongoReactiveConfig.class)
1723
public class MongoTransactionReactiveLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionTemplateLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
import com.baeldung.config.MongoConfig;
2525
import com.baeldung.model.User;
2626

27+
/**
28+
*
29+
* This test requires:
30+
* * mongodb instance running on the environment
31+
*
32+
*/
2733
@RunWith(SpringJUnit4ClassRunner.class)
2834
@ContextConfiguration(classes = MongoConfig.class)
2935
public class MongoTransactionTemplateLiveTest {

persistence-modules/spring-data-mongodb/src/test/java/com/baeldung/transaction/MongoTransactionalLiveTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
import com.baeldung.repository.UserRepository;
2525
import com.mongodb.MongoCommandException;
2626

27+
/**
28+
*
29+
* This test requires:
30+
* * mongodb instance running on the environment
31+
*
32+
*/
2733
@RunWith(SpringJUnit4ClassRunner.class)
2834
@ContextConfiguration(classes = MongoConfig.class)
2935
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

spring-4/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
### Relevant Articles:
22
- [A Guide to Flips for Spring](http://www.baeldung.com/flips-spring)
33
- [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
4+
- [Spring JSON-P with Jackson](http://www.baeldung.com/spring-jackson-jsonp)

0 commit comments

Comments
 (0)