Skip to content

Commit 0d1db00

Browse files
amit2103amit2103
committed
Merge branch 'master' of https://github.com/eugenp/tutorials into BAEL-14088
2 parents 6b0a962 + fd3e1fb commit 0d1db00

File tree

11 files changed

+21
-20
lines changed

11 files changed

+21
-20
lines changed

‎core-groovy/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
- [Types of Strings in Groovy](https://www.baeldung.com/groovy-strings)
99
- [A Quick Guide to Iterating a Map in Groovy](https://www.baeldung.com/groovy-map-iterating)
1010
- [An Introduction to Traits in Groovy](https://www.baeldung.com/groovy-traits)
11+
- [Closures in Groovy](https://www.baeldung.com/groovy-closures)
12+
- [Finding Elements in Collections in Groovy](https://www.baeldung.com/groovy-collections-find-elements)
1113
- [Lists in Groovy](https://www.baeldung.com/groovy-lists)
1214
- [Converting a String to a Date in Groovy](https://www.baeldung.com/groovy-string-to-date)
13-
- [Guide to I/O in Groovy](https://www.baeldung.com/groovy-io)
14-
- [Finding Elements in Collections in Groovy](https://www.baeldung.com/groovy-collections-find-elements)
15-
- [Closures in Groovy](https://www.baeldung.com/groovy-closures)
15+
- [Guide to I/O in Groovy](https://www.baeldung.com/groovy-io)

‎core-kotlin-2/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
- [Void Type in Kotlin](https://www.baeldung.com/kotlin-void-type)
44
- [How to use Kotlin Range Expressions](https://www.baeldung.com/kotlin-ranges)
5-
- [Split a List into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
6-
- [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)
7-
- [Kotlin Annotations](https://www.baeldung.com/kotlin-annotations)
8-
- [Kotlin Scope Functions](https://www.baeldung.com/kotlin-scope-functions)
95
- [Creating a Kotlin Range Iterator on a Custom Object](https://www.baeldung.com/kotlin-custom-range-iterator)
6+
- [Kotlin Scope Functions](https://www.baeldung.com/kotlin-scope-functions)
7+
- [Kotlin Annotations](https://www.baeldung.com/kotlin-annotations)
8+
- [Split a List into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
9+
- [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)

‎kotlin-libraries/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
- [Kotlin with Ktor](https://www.baeldung.com/kotlin-ktor)
1212
- [REST API With Kotlin and Kovert](https://www.baeldung.com/kotlin-kovert)
1313
- [MockK: A Mocking Library for Kotlin](https://www.baeldung.com/kotlin-mockk)
14-
- [Kotlin Immutable Collections](https://www.baeldung.com/kotlin-immutable-collections)
14+
- [Kotlin Immutable Collections](https://www.baeldung.com/kotlin-immutable-collections)

‎patterns/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
- [Introduction to Intercepting Filter Pattern in Java](http://www.baeldung.com/intercepting-filter-pattern-in-java)
44
- [Introduction to the Null Object Pattern](https://www.baeldung.com/java-null-object-pattern)
55
- [The Dependency Inversion Principle in Java](https://www.baeldung.com/java-dependency-inversion-principle)
6+
- [Avoid Check for Null Statement in Java](https://www.baeldung.com/java-avoid-null-check)

‎persistence-modules/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,5 @@
1111
- [Pessimistic Locking in JPA](http://www.baeldung.com/jpa-pessimistic-locking)
1212
- [Get All Data from a Table with Hibernate](https://www.baeldung.com/hibernate-select-all)
1313
- [Spring Data with Reactive Cassandra](https://www.baeldung.com/spring-data-cassandra-reactive)
14+
- [Spring Data JPA – Derived Delete Methods](https://www.baeldung.com/spring-data-jpa-deleteby)
15+
- [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)

‎pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,7 @@
586586

587587
<module>spring-5</module>
588588
<module>spring-5-webflux</module>
589+
<module>spring-5-data-reactive</module>
589590
<module>spring-5-mvc</module>
590591
<module>spring-5-reactive</module>
591592
<module>spring-5-reactive-client</module>
@@ -598,6 +599,7 @@
598599
<module>spring-akka</module>
599600
<module>spring-all</module>
600601
<module>spring-amqp</module>
602+
<module>spring-amqp-simple</module>
601603
<module>spring-aop</module>
602604
<module>spring-apache-camel</module>
603605
<module>spring-batch</module>
@@ -958,9 +960,6 @@
958960
<module>persistence-modules/java-mongodb</module>
959961
<module>persistence-modules/jnosql</module>
960962

961-
<module>spring-5-data-reactive</module> <!-- very long running. Fixing in BAEL-10891 -->
962-
<module>spring-amqp-simple</module> <!-- very long running. Fixing in BAEL-10891 -->
963-
964963
<module>vaadin</module>
965964
</modules>
966965
</profile>
@@ -1231,6 +1230,7 @@
12311230
<module>spring-4</module>
12321231

12331232
<module>spring-5</module>
1233+
<module>spring-5-data-reactive</module>
12341234
<module>spring-5-mvc</module>
12351235
<module>spring-5-reactive</module>
12361236
<module>spring-5-reactive-client</module>
@@ -1243,6 +1243,7 @@
12431243
<module>spring-akka</module>
12441244
<module>spring-all</module>
12451245
<module>spring-amqp</module>
1246+
<module>spring-amqp-simple</module>
12461247
<module>spring-aop</module>
12471248
<module>spring-apache-camel</module>
12481249
<module>spring-batch</module>
@@ -1455,9 +1456,6 @@
14551456
<module>persistence-modules/java-mongodb</module>
14561457
<module>persistence-modules/jnosql</module>
14571458

1458-
<module>spring-5-data-reactive</module> <!-- very long running. Fixing in BAEL-10891 -->
1459-
<module>spring-amqp-simple</module> <!-- very long running. Fixing in BAEL-10891 -->
1460-
14611459
<module>vaadin</module>
14621460
</modules>
14631461

spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryIntegrationTest.java renamed to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountCrudRepositoryManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
@RunWith(SpringRunner.class)
1919
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Spring5ReactiveApplication.class)
20-
public class AccountCrudRepositoryIntegrationTest {
20+
public class AccountCrudRepositoryManualTest {
2121

2222
@Autowired
2323
AccountCrudRepository repository;

spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryIntegrationTest.java renamed to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountMongoRepositoryManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@RunWith(SpringRunner.class)
2121
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Spring5ReactiveApplication.class)
22-
public class AccountMongoRepositoryIntegrationTest {
22+
public class AccountMongoRepositoryManualTest {
2323

2424
@Autowired
2525
AccountMongoRepository repository;

spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryIntegrationTest.java renamed to spring-5-data-reactive/src/test/java/com/baeldung/reactive/repository/AccountRxJavaRepositoryManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
@RunWith(SpringRunner.class)
1717
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Spring5ReactiveApplication.class)
18-
public class AccountRxJavaRepositoryIntegrationTest {
18+
public class AccountRxJavaRepositoryManualTest {
1919

2020
@Autowired
2121
AccountRxJavaRepository repository;

spring-5-data-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsIntegrationTest.java renamed to spring-5-data-reactive/src/test/java/com/baeldung/reactive/template/AccountTemplateOperationsManualTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
@RunWith(SpringRunner.class)
1818
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Spring5ReactiveApplication.class)
19-
public class AccountTemplateOperationsIntegrationTest {
19+
public class AccountTemplateOperationsManualTest {
2020

2121
@Autowired
2222
AccountTemplateOperations accountTemplate;

0 commit comments

Comments
 (0)