JAVA-20166 Migrating spring-date-eclipselink (eugenp#13959)

* JAVA-20166 Migrating spring-date-eclipselink

* JAVA-20166 Fix failed tests address already bind

* JAVA-20166 Migrating spring-date-couchbase-2

* JAVA-20166 Replace with optional instead of returning null

---------

Co-authored-by: timis1 <[email protected]>

Author: timis1

persistence-modules/pom.xml

@@ -71,9 +71,9 @@
         <module>spring-data-cassandra-test</module>
         <!-- <module>spring-data-cassandra-reactive</module> FAILED -->
         <module>spring-data-cosmosdb</module>
-        <!-- <module>spring-data-couchbase-2</module> FAILED -->
+        <module>spring-data-couchbase-2</module>
         <module>spring-data-dynamodb</module>
-        <!-- <module>spring-data-eclipselink</module> FAILED -->
+        <module>spring-data-eclipselink</module>
         <module>spring-data-elasticsearch</module>
         <!-- <module>spring-data-gemfire</module> Won't Fix in JAVA-14499, The dependencies used are -->
         <!-- no longer available or maintained. Ref: https://spring.io/projects/spring-data-gemfire#overview -->

persistence-modules/spring-data-couchbase-2/pom.xml

@@ -57,23 +57,22 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>${javax.el.version}</version>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+            <version>5.0.0</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.el</artifactId>
-            <version>${javax.el.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <spring-framework.version>4.3.4.RELEASE</spring-framework.version>
-        <spring-data-couchbase.version>2.1.5.RELEASE</spring-data-couchbase.version>
-        <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
-        <joda-time.version>2.9.6</joda-time.version>
-        <javax.el.version>3.0.0</javax.el.version>
+        <spring-framework.version>6.0.6</spring-framework.version>
+        <spring-data-couchbase.version>5.0.3</spring-data-couchbase.version>
+        <hibernate-validator.version>8.0.0.Final</hibernate-validator.version>
+        <joda-time.version>2.12.2</joda-time.version>
     </properties>
 
 </project>

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Campus.java

@@ -1,13 +1,12 @@
 package com.baeldung.spring.data.couchbase.model;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
+import org.springframework.data.couchbase.core.mapping.Field;
 import org.springframework.data.geo.Point;
 
-import com.couchbase.client.java.repository.annotation.Field;
-
 @Document
 public class Campus {
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Person.java

@@ -1,12 +1,11 @@
 package com.baeldung.spring.data.couchbase.model;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 import org.joda.time.DateTime;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.couchbase.core.mapping.Document;
-
-import com.couchbase.client.java.repository.annotation.Field;
+import org.springframework.data.couchbase.core.mapping.Field;
 
 @Document
 public class Person {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/model/Student.java

@@ -1,16 +1,15 @@
 package com.baeldung.spring.data.couchbase.model;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Past;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Past;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 
 import org.joda.time.DateTime;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.couchbase.core.mapping.Document;
-
-import com.couchbase.client.java.repository.annotation.Field;
+import org.springframework.data.couchbase.core.mapping.Field;
 
 @Document
 public class Student {

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/repos/CustomStudentRepositoryImpl.java

@@ -5,9 +5,7 @@
 import com.baeldung.spring.data.couchbase.model.Student;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
-
-import com.couchbase.client.java.view.Stale;
-import com.couchbase.client.java.view.ViewQuery;
+import org.springframework.data.couchbase.core.query.QueryCriteria;
 
 public class CustomStudentRepositoryImpl implements CustomStudentRepository {
 
@@ -17,6 +15,6 @@ public class CustomStudentRepositoryImpl implements CustomStudentRepository {
     private CouchbaseTemplate template;
 
     public List<Student> findByFirstNameStartsWith(String s) {
-        return template.findByView(ViewQuery.from(DESIGN_DOC, "byFirstName").startKey(s).stale(Stale.FALSE), Student.class);
+        return template.findByQuery(Student.class).matching(QueryCriteria.where("firstName").startingWith(s)).all();
     }
 }

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonRepositoryService.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 import com.baeldung.spring.data.couchbase.model.Person;
 import com.baeldung.spring.data.couchbase.repos.PersonRepository;
@@ -22,12 +23,12 @@ public void setPersonRepository(PersonRepository repo) {
         this.repo = repo;
     }
 
-    public Person findOne(String id) {
-        return repo.findOne(id);
+    public Optional<Person> findOne(String id) {
+        return repo.findById(id);
     }
 
     public List<Person> findAll() {
-        List<Person> people = new ArrayList<Person>();
+        List<Person> people = new ArrayList<>();
         Iterator<Person> it = repo.findAll().iterator();
         while (it.hasNext()) {
             people.add(it.next());

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonService.java

@@ -1,12 +1,13 @@
 package com.baeldung.spring.data.couchbase.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.baeldung.spring.data.couchbase.model.Person;
 
 public interface PersonService {
 
-    Person findOne(String id);
+    Optional<Person> findOne(String id);
 
     List<Person> findAll();
 

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/PersonTemplateService.java

@@ -1,6 +1,9 @@
 package com.baeldung.spring.data.couchbase.service;
 
+import static org.springframework.data.couchbase.core.query.QueryCriteria.where;
+
 import java.util.List;
+import java.util.Optional;
 
 import com.baeldung.spring.data.couchbase.model.Person;
 import org.joda.time.DateTime;
@@ -9,8 +12,6 @@
 import org.springframework.data.couchbase.core.CouchbaseTemplate;
 import org.springframework.stereotype.Service;
 
-import com.couchbase.client.java.view.ViewQuery;
-
 @Service
 @Qualifier("PersonTemplateService")
 public class PersonTemplateService implements PersonService {
@@ -24,33 +25,33 @@ public void setCouchbaseTemplate(CouchbaseTemplate template) {
         this.template = template;
     }
 
-    public Person findOne(String id) {
-        return template.findById(id, Person.class);
+    public Optional<Person> findOne(String id) {
+        return Optional.of(template.findById(Person.class).one(id));
     }
 
     public List<Person> findAll() {
-        return template.findByView(ViewQuery.from(DESIGN_DOC, "all"), Person.class);
+        return template.findByQuery(Person.class).all();
     }
 
     public List<Person> findByFirstName(String firstName) {
-        return template.findByView(ViewQuery.from(DESIGN_DOC, "byFirstName"), Person.class);
+        return template.findByQuery(Person.class).matching(where("firstName").is(firstName)).all();
     }
 
     public List<Person> findByLastName(String lastName) {
-        return template.findByView(ViewQuery.from(DESIGN_DOC, "byLastName"), Person.class);
+        return template.findByQuery(Person.class).matching(where("lastName").is(lastName)).all();
     }
 
     public void create(Person person) {
         person.setCreated(DateTime.now());
-        template.insert(person);
+        template.insertById(Person.class).one(person);
     }
 
     public void update(Person person) {
         person.setUpdated(DateTime.now());
-        template.update(person);
+        template.removeById(Person.class).oneEntity(person);
     }
 
     public void delete(Person person) {
-        template.remove(person);
+        template.removeById(Person.class).oneEntity(person);
     }
 }

persistence-modules/spring-data-couchbase-2/src/main/java/com/baeldung/spring/data/couchbase/service/StudentRepositoryService.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 
 import com.baeldung.spring.data.couchbase.model.Student;
 import com.baeldung.spring.data.couchbase.repos.StudentRepository;
@@ -22,12 +23,12 @@ public void setStudentRepository(StudentRepository repo) {
         this.repo = repo;
     }
 
-    public Student findOne(String id) {
-        return repo.findOne(id);
+    public Optional<Student> findOne(String id) {
+        return repo.findById(id);
     }
 
     public List<Student> findAll() {
-        List<Student> people = new ArrayList<Student>();
+        List<Student> people = new ArrayList<>();
         Iterator<Student> it = repo.findAll().iterator();
         while (it.hasNext()) {
             people.add(it.next());