back to Java 17

Author: Oli B

addressbook/pom.xml

@@ -81,14 +81,9 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>eclipselink</artifactId>
-			<version>2.6.9</version>
+			<version>2.7.15</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>persistence-api</artifactId>
-			<version>[1.0,1.1)</version>		
-		</dependency>		
 		<dependency>
 			<groupId>org.jugs.webdav</groupId>
 			<artifactId>webdav-jaxrs</artifactId>

addressbook/src/main/java/org/jugs/webdav/addressbook/AddressBook.java

@@ -19,18 +19,17 @@
 
 package org.jugs.webdav.addressbook;
 
-import org.jugs.webdav.jaxrs.methods.*;
-import org.jugs.webdav.jaxrs.xml.elements.*;
-import org.jugs.webdav.jaxrs.xml.properties.*;
-
-import javax.persistence.*;
-import jakarta.ws.rs.OPTIONS;
 import jakarta.ws.rs.*;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.HttpHeaders;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.UriInfo;
 import jakarta.ws.rs.ext.Providers;
+import org.jugs.webdav.jaxrs.methods.*;
+import org.jugs.webdav.jaxrs.xml.elements.*;
+import org.jugs.webdav.jaxrs.xml.properties.*;
+
+import javax.persistence.*;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.annotation.Annotation;
@@ -70,7 +69,8 @@ public final MultiStatus propfind(@Context final UriInfo uriInfo, @DefaultValue(
 			return new MultiStatus(folder);
 
 		final Collection<Response> responses = new LinkedList<Response>(Collections.singletonList(folder));
-		for (final Contact c : (List<Contact>) this.em().createNamedQuery("ListContacts").getResultList())
+		TypedQuery<Contact> listContacts = this.em().createNamedQuery("ListContacts", Contact.class);
+		for (final Contact c : listContacts.getResultList())
 			responses.add(new Response(new HRef(uriInfo.getAbsolutePathBuilder().path(String.format("%s.adr", c.getMatchCode())).build()), null, null, null,
 					new PropStat(new Prop(new MicrosoftRedirectorPatch2(), new DisplayName(String.format("%s %s", c.getLastName(), c.getFirstName())),
 							new CreationDate(c.getCreationDate()), new GetLastModified(c.getLastModified()), new GetContentLength(0), new GetContentType(

pom.xml

@@ -52,8 +52,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
         <jersey.version>3.1.9</jersey.version>
         <hamcrest.version>3.0</hamcrest.version>
         <junit.version>5.11.3</junit.version>