Merge pull request eugenp#7798 from fanatixan/bael-16656

BAEL-16656

Author: jzheaux

core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/TimeUtilsUnitTest.java

@@ -7,15 +7,9 @@
 import com.baeldung.datetime.sql.TimeUtils;
 
 import java.text.ParseException;
-import java.util.Date;
 
 public class TimeUtilsUnitTest {
 
-    @Test
-    public void givenCurrentTime_thenNowIsReturned() {
-        assertEquals(TimeUtils.getNow(), new Date());
-    }
-
     @Test(expected = IllegalArgumentException.class)
     public void givenTimeAsString_whenPatternIsNotRespected_thenExceptionIsThrown() {
         TimeUtils.getTime("10 11 12");

persistence-modules/jnosql/pom.xml

@@ -17,8 +17,8 @@
     </parent>
 
     <modules>
-        <module>jnosql-diana</module>
         <module>jnosql-artemis</module>
+        <module>jnosql-diana</module>
    </modules>
 
     <properties>

persistence-modules/pom.xml

@@ -18,28 +18,34 @@
         <module>apache-cayenne</module>
         <module>core-java-persistence</module>
         <module>deltaspike</module>
+        <module>elasticsearch</module>
         <module>flyway</module>
         <module>hbase</module>
         <module>hibernate5</module>
-        <module>hibernate-ogm</module>
-        <module>hibernate-mapping</module>
         <module>hibernate5-2</module>
+        <module>hibernate-mapping</module> <!-- long running -->
+        <module>hibernate-ogm</module>
         <module>influxdb</module>
         <module>java-cassandra</module>
         <module>java-cockroachdb</module>
         <module>java-jdbi</module>
-        <module>java-jpa</module>
-        <module>java-jpa-2</module>
-        <module>java-mongodb</module>
-        <module>persistence-libraries</module>
-        <module>jnosql</module>
+        <module>java-jpa</module> <!-- long running -->
+        <module>java-jpa-2</module> <!-- long running -->
+        <module>java-mongodb</module> <!-- long running -->
+        <module>jnosql</module> <!-- long running -->
+        <module>jpa-hibernate-cascade-type</module>
         <module>liquibase</module>
         <module>orientdb</module>
+        <module>persistence-libraries</module>
         <module>querydsl</module>
+		<module>r2dbc</module>
         <module>redis</module>
+		<!-- <module>sirix</module> --> <!-- We haven't upgraded to java 11. Fixing in BAEL-10841 -->
         <module>solr</module>
-        <module>spring-boot-persistence-h2</module>
+        <module>spring-boot-jdbi</module>
+        <module>spring-boot-mysql</module>
         <module>spring-boot-persistence</module>
+        <module>spring-boot-persistence-h2</module>
         <module>spring-boot-persistence-mongodb</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-cassandra-reactive</module>
@@ -50,19 +56,20 @@
         <module>spring-data-gemfire</module>
         <module>spring-data-geode</module>
         <module>spring-data-jpa</module>
+        <module>spring-data-jpa-2</module>
         <module>spring-data-jpa-3</module>
+        <module>spring-data-jpa-4</module>
         <module>spring-data-keyvalue</module>
-        <module>spring-data-mongodb</module> <!-- long -->
+        <module>spring-data-mongodb</module>
         <module>spring-data-neo4j</module>
         <module>spring-data-redis</module>
         <module>spring-data-solr</module>
         <module>spring-hibernate-3</module>
-        <module>spring-hibernate-5</module>
+        <module>spring-hibernate-5</module> <!-- long running -->
         <module>spring-hibernate4</module>
         <module>spring-jpa</module>
+		<!-- <module>spring-mybatis</module> --> <!-- needs fixing in BAEL-9021 -->
         <module>spring-persistence-simple</module>
-        <module>jpa-hibernate-cascade-type</module>
-        <module>r2dbc</module>
-        <module>spring-boot-jdbi</module>
     </modules>
+    
 </project>

persistence-modules/spring-data-jpa-2/README.md

@@ -9,7 +9,3 @@
 - [JPA @Embedded And @Embeddable](https://www.baeldung.com/jpa-embedded-embeddable)
 - [Spring Data JPA Delete and Relationships](https://www.baeldung.com/spring-data-jpa-delete)
 - [Spring Data JPA and Named Entity Graphs](https://www.baeldung.com/spring-data-jpa-named-entity-graphs)
-- [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
-- [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
-- [Derived Query Methods in Spring Data JPA Repositories](https://www.baeldung.com/spring-data-derived-queries)
-- [LIKE Queries in Spring JPA Repositories](https://www.baeldung.com/spring-jpa-like-queries)

persistence-modules/spring-data-jpa-2/src/main/java/com/baeldung/repository/FruitRepository.java

@@ -23,5 +23,5 @@ public interface FruitRepository extends JpaRepository<Fruit, Long> {
 
     @Modifying
     @Query("delete from Fruit f where f.name=:name or f.color=:color")
-    List<Fruit> deleteFruits(@Param("name") String name, @Param("color") String color);
+    int deleteFruits(@Param("name") String name, @Param("color") String color);
 }

persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/repository/FruitPopulatorTest.java renamed to persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/repository/FruitPopulatorIntegrationTest.java

@@ -14,7 +14,7 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-public class FruitPopulatorTest {
+public class FruitPopulatorIntegrationTest {
 
     @Autowired
     private FruitRepository fruitRepository;

persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/repository/FruitRepositoryIntegrationTest.java

@@ -1,7 +1,6 @@
 package com.baeldung.repository;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
@@ -69,9 +68,8 @@ public void givenFruits_WhenRemovedByName_ThenDeletedFruitCountShouldReturn() {
     @Sql(scripts = { "/test-fruit-data.sql" })
     public void givenFruits_WhenDeletedByColorOrName_ThenDeletedFruitsShouldReturn() {
 
-        List<Fruit> fruits = fruitRepository.deleteFruits("apple", "green");
+        int deletedCount = fruitRepository.deleteFruits("apple", "green");
 
-        assertEquals("number of fruits are not matching", 3, fruits.size());
-        fruits.forEach(fruit -> assertTrue("Its not a green fruit or apple", ("green".equals(fruit.getColor())) || "apple".equals(fruit.getColor())));
+        assertEquals("number of fruits are not matching", 3, deletedCount);
     }
 }

persistence-modules/spring-data-jpa-2/src/test/java/com/baeldung/repository/SongRepositoryIntegrationTest.java

@@ -1,17 +1,18 @@
 package com.baeldung.repository;
 
-import com.baeldung.entity.Song;
-import org.junit.jupiter.api.Test;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.jdbc.Sql;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
+import com.baeldung.entity.Song;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest

persistence-modules/spring-data-jpa-2/src/test/resources/test-fruit-data.sql

@@ -1,4 +1,6 @@
-insert into fruit(id,name,color) values (1,'apple','red');
-insert into fruit(id,name,color) values (2,'custard apple','green');
-insert into fruit(id,name,color) values (3,'mango','yellow');
+truncate table fruit;
+
+insert into fruit(id,name,color) values (1,'apple','red');
+insert into fruit(id,name,color) values (2,'custard apple','green');
+insert into fruit(id,name,color) values (3,'mango','yellow');
 insert into fruit(id,name,color) values (4,'guava','green');

persistence-modules/spring-data-jpa-3/README.md

@@ -1,3 +1,21 @@
-### Relevant Articles:
+### Relevant Articles: 
+- [Limiting Query Results with JPA and Spring Data JPA](https://www.baeldung.com/jpa-limit-query-results)
+- [Sorting Query Results with Spring Data](https://www.baeldung.com/spring-data-sorting)
+- [INSERT Statement in JPA](https://www.baeldung.com/jpa-insert)
+- [Pagination and Sorting using Spring Data JPA](https://www.baeldung.com/spring-data-jpa-pagination-sorting)
+- [Spring Data JPA Query by Example](https://www.baeldung.com/spring-data-query-by-example)
+- [DB Integration Tests with Spring Boot and Testcontainers](https://www.baeldung.com/spring-boot-testcontainers-integration-test)
+- [Spring Data JPA @Modifying Annotation](https://www.baeldung.com/spring-data-jpa-modifying-annotation)
+- [Spring Data JPA Batch Inserts](https://www.baeldung.com/spring-data-jpa-batch-inserts)
+- [Batch Insert/Update with Hibernate/JPA](https://www.baeldung.com/jpa-hibernate-batch-insert-update)
+- [Difference Between save() and saveAndFlush() in Spring Data JPA](https://www.baeldung.com/spring-data-jpa-save-saveandflush)
 - [Programmatic Transaction Management in Spring](https://www.baeldung.com/spring-programmatic-transaction-management)
 
+### Eclipse Config 
+After importing the project into Eclipse, you may see the following error:  
+"No persistence xml file found in project"
+
+This can be ignored: 
+- Project -> Properties -> Java Persistance -> JPA -> Error/Warnings -> Select Ignore on "No persistence xml file found in project"
+Or: 
+- Eclipse -> Preferences - Validation - disable the "Build" execution of the JPA Validator