Merge pull request #74 from OpenLiberty/RC1-Updates

Updates for RC1

Author: mswatosh

.gitignore

@@ -1,4 +1,5 @@
 /.vscode
+.libertyls
 /target
 .project
 .classpath

README.md

@@ -39,7 +39,7 @@ The **CrewMembers** repository is injected into the REST application using CDI
 
 ```java
 public class CrewService {
-//...
+//[...]
 @Inject
 CrewMembers crewMembers;
 ```
@@ -51,7 +51,6 @@ public String add(CrewMember crewMember) {
     crewMembers.save(crewMember);
 
     //Jakarta Validation[...]
-
 ```
 
 To remove an individual **CrewMember** from the database based on the ID, you can use `crewMembers.deleteByCrewID`
@@ -69,6 +68,7 @@ In the `CrewMembers.java` file we can see that these will be returned sorted alp
 ```java
 public interface CrewMembers {
 //[...]
+@Find
 @OrderBy("name")
 Stream<CrewMember> findAll();
 ```

pom.xml

@@ -17,7 +17,7 @@
         <version.liberty-maven-plugin>3.10.3</version.liberty-maven-plugin>
         <!-- OpenLiberty runtime -->
         <version.openliberty-group>io.openliberty.beta</version.openliberty-group>
-        <version.openliberty-runtime>23.0.0.12-beta</version.openliberty-runtime>
+        <version.openliberty-runtime>24.0.0.5-beta</version.openliberty-runtime>
         <http.port>9080</http.port>
         <https.port>9443</https.port>
         <liberty.var.app.context.root>/</liberty.var.app.context.root>
@@ -26,8 +26,8 @@
     <dependencies>
         <dependency>
             <groupId>jakarta.data</groupId>
-            <artifactId>jakarta-data-api</artifactId>
-            <version>1.0.0-M1</version>
+            <artifactId>jakarta.data-api</artifactId>
+            <version>1.0.0-RC1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/io/openliberty/sample/application/CrewMembers.java

@@ -13,9 +13,12 @@
 import java.util.List;
 import java.util.stream.Stream;
 
+import jakarta.data.Sort;
 import jakarta.data.page.Page;
-import jakarta.data.page.Pageable;
+import jakarta.data.page.PageRequest;
 import jakarta.data.repository.DataRepository;
+import jakarta.data.repository.Delete;
+import jakarta.data.repository.Find;
 import jakarta.data.repository.OrderBy;
 import jakarta.data.repository.Repository;
 import jakarta.data.repository.Save;
@@ -28,14 +31,16 @@ public interface CrewMembers extends DataRepository<CrewMember, Integer> {
 
     List<CrewMember> findByRank(Rank rank);
 
-    Page<CrewMember> findByRank(Rank rank, Pageable pageRequest);
+    Page<CrewMember> findByRank(Rank rank, PageRequest pageRequest, Sort<?>... sorts);
 
     List<CrewMember> findByShipSizeAndRank(Ship.Size size, Rank rank);
 
+    @Find
     @OrderBy("name")
     Stream<CrewMember> findAll();
 
     void deleteByCrewID(int crewID);
 
+    @Delete
     void deleteAll();
 }

src/main/java/io/openliberty/sample/application/CrewService.java

@@ -14,7 +14,7 @@
 
 import jakarta.data.Sort;
 import jakarta.data.page.Page;
-import jakarta.data.page.Pageable;
+import jakarta.data.page.PageRequest;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.json.Json;
@@ -88,11 +88,12 @@ public String retrieveByRank(@PathParam("rank") String rank) {
 	public String retrieveByRank(@PathParam("rank") String rank,
 								 @PathParam("pageNum") long pageNum) {
 
-		Pageable pageRequest = Pageable.ofSize(5)
-									   .page(pageNum)
-									   .sortBy(Sort.asc("name"), Sort.asc("id"));
+		PageRequest pageRequest = PageRequest.ofPage(pageNum).size(5);
 
-		Page<CrewMember> page = crewMembers.findByRank(Rank.fromString(rank), pageRequest);
+		Page<CrewMember> page = crewMembers.findByRank(Rank.fromString(rank), 
+                                                       pageRequest, 
+                                                       Sort.asc("name"), 
+                                                       Sort.asc("id"));
 
 		return crewMembersToJsonArray(page);
 	}

src/main/liberty/config/server.xml

@@ -1,5 +1,6 @@
 <server description="Sample Liberty server">
 	<featureManager>
+        <!-- Using EE10 features until EE11 features are all in beta-->
 		<feature>beanValidation-3.0</feature>	   
 		<feature>passwordUtilities-1.0</feature>
 		<feature>restfulWS-3.1</feature>