Updated aspirin library to jakarta. Finalized migration to Jakarta

Author: ophiuhus

apps/milton-mini-server/src/main/java/io/milton/mini/DataSessionManager.java

@@ -7,7 +7,7 @@
 import io.milton.vfs.db.Profile;
 import io.milton.vfs.db.Repository;
 import io.milton.vfs.db.utils.SessionManager;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.hashsplit4j.api.BlobStore;
 import org.hashsplit4j.api.HashStore;
 import org.hibernate.Session;
@@ -23,21 +23,21 @@ public class DataSessionManager {
     @Inject
     private BlobStore blobStore;
     @Inject
-    private CurrentDateService currentDateService;    
-    
+    private CurrentDateService currentDateService;
+
     public DataSession get(Request request, Repository repo) {
         return get(request, repo, false, null);
     }
-    
+
     /**
      * Get an existing data session in this request, or start a new one, for
      * the live branch of the given repository
-     * 
+     *
      * @param request
      * @param repo
      * @param autoCreateBranch
      * @param currentUser
-     * @return 
+     * @return
      */
     public DataSession get(Request request, Repository repo, boolean autoCreateBranch, Profile currentUser) {
         String sessKey = "dataSession-" + repo.getId();
@@ -48,7 +48,7 @@ public DataSession get(Request request, Repository repo, boolean autoCreateBranc
             if( trunk == null ) {
                 if( autoCreateBranch ) {
                     trunk = repo.createBranch(Branch.TRUNK, currentUser, session);
-                }                
+                }
             }
             if (trunk != null) {
                 dataSession = new DataSession(trunk, session, hashStore, blobStore, currentDateService, null);
@@ -57,5 +57,5 @@ public DataSession get(Request request, Repository repo, boolean autoCreateBranc
         }
         return dataSession;
     }
-    
+
 }

apps/milton-mini-server/src/main/java/io/milton/mini/controllers/CalendarController.java

@@ -60,7 +60,7 @@
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import javax.xml.namespace.QName;
 import net.fortuna.ical4j.data.ParserException;
 import net.fortuna.ical4j.model.TimeZone;

apps/milton-mini-server/src/main/java/io/milton/mini/controllers/MiltonMiniController.java

@@ -59,7 +59,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import org.hashsplit4j.api.BlobStore;
 import org.hashsplit4j.api.HashStore;
 import org.hibernate.Session;

apps/milton-mini-server/src/main/java/io/milton/mini/controllers/RepositoryController.java

@@ -17,7 +17,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  *
@@ -35,8 +35,8 @@ public class RepositoryController {
     public ModelAndView showRepositoryHome(MiltonMiniController.RepoHome repoHome, Request request) {
         ModelAndView mav = new ModelAndView("repositoriesHome",repoHome, "repoHome");
         return mav;
-    }    
-    
+    }
+
     @Get
     public ModelAndView showRepository(Repository repo, Request request) {
         DataSession dataSession = dataSessionManager.get(request, repo);
@@ -45,7 +45,7 @@ public ModelAndView showRepository(Repository repo, Request request) {
         mav.getModel().put("rootDir", rootNode);
         return mav;
     }
-    
+
     @ChildrenOf
     public List<DataSession.DataNode> getBranchMembers(Repository repo, Request request) {
         DataSession dataSession = dataSessionManager.get(request, repo);
@@ -88,8 +88,8 @@ public DataSession.FileNode createFile(Repository repo, String newName, InputStr
         DataSession dataSession = dataSessionManager.get(request, repo, true, user);
         return createFile(dataSession.getRootDataNode(), newName, inputStream, request, repo, user);
     }
-    
-    
+
+
     @PutChild
     public DataSession.FileNode createFile(DataSession.DirectoryNode parent, String newName, InputStream inputStream, Request request, Repository repo, @Principal Profile principal) throws IOException {
         log.trace("createNew: set content");
@@ -98,7 +98,7 @@ public DataSession.FileNode createFile(DataSession.DirectoryNode parent, String
         dataSessionManager.get(request, repo).save(principal);
         return newFileNode;
     }
-    
+
     @PutChild
     public DataSession.FileNode updateFile(DataSession.FileNode file, InputStream in) throws IOException {
         file.setContent(in);

apps/milton-mini-server/src/main/java/io/milton/mini/controllers/SchedulingController.java

@@ -41,7 +41,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 @ResourceController
 public class SchedulingController {
@@ -50,14 +50,14 @@ public class SchedulingController {
 
     @Inject
     private ICalFormatter formatter;
-    
+
     @Inject
     private CalendarService calendarService;
 
     public SchedulingController() {
     }
 
-    
+
     @FreeBusyQuery
     public List<SchedulingResponseItem> freeBusyQuery(Profile profile, String icalQuery) throws NotAuthorizedException {
         ICalFormatter.FreeBusyRequest r = formatter.parseFreeBusyRequest(icalQuery);
@@ -88,34 +88,34 @@ public List<SchedulingResponseItem> freeBusyQuery(Profile profile, String icalQu
     }
 
     @CalendarInvitations
-    public List<AttendeeRequest> getAttendeeRequests(Profile user) {  
+    public List<AttendeeRequest> getAttendeeRequests(Profile user) {
         log.info("getAttendeeRequests: " + user.getName());
         return calendarService.getAttendeeRequests(user, false);
     }
-    
-    @CalendarInvitationsCTag    
+
+    @CalendarInvitationsCTag
     public String getCalendarInvitationsCTag(Profile user) {
         return calendarService.getCalendarInvitationsCTag(user);
-    }    
-    
+    }
+
     @Delete
     public void deleteAttendeeRequest(AttendeeRequest ar) {
         log.info("deleteAttendeeRequest");
         ar.setAcknowledged(true); // dont delete, just mark as acknowledged so will be hidden
         SessionManager.session().save(ar);
     }
-    
+
 
     @ModifiedDate
     public Date getAttendeeRequestModDate(AttendeeRequest ar) {
         return ar.getOrganiserEvent().getModifiedDate();
     }
-    
+
     @UniqueId
     public String getAttendeeRequestUniqueId(AttendeeRequest ar) {
         return ar.getId().toString();
     }
-    
+
     /**
      *
      *
@@ -154,7 +154,7 @@ private String buildFreeBusyAttendeeResponse(Profile attendee, ICalFormatter.Fre
         return formatter.buildFreeBusyAttendeeResponse(list, request, domain, attendeeMailto);
 
     }
-    
+
     private boolean outsideDates(CalEvent event, Date start, Date end) {
         if (start != null) {
             if (event.getStartDate().before(start)) {
@@ -171,5 +171,5 @@ private boolean outsideDates(CalEvent event, Date start, Date end) {
         }
 
         return false;
-    }    
+    }
 }

examples/milton-anno-bandstand/pom.xml

@@ -124,9 +124,9 @@
 
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>persistence-api</artifactId>
-            <version>1.0</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.2.0</version>
         </dependency>
 
 <!--        <dependency>-->

examples/milton-anno-bandstand/src/main/java/com/bandstand/domain/Band.java

@@ -18,7 +18,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.annotations.Cache;
@@ -29,22 +29,22 @@
  *
  * @author brad
  */
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @DiscriminatorValue("B")
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class Band extends BaseEntity {
     private List<Gig> gigs;
-    
+
     public static List<Band> findAll(Session session) {
         Criteria crit = session.createCriteria(Band.class);
         crit.addOrder(Order.asc("name"));
         return DbUtils.toList(crit, Band.class);
-    }       
-        
+    }
+
     private List<Song> songs;
     private List<BandMember> bandMembers;
-    
-    
+
+
     @OneToMany(mappedBy = "band")
     public List<BandMember> getBandMembers() {
         return bandMembers;
@@ -98,5 +98,5 @@ public Gig addGig(String title, Date dt) {
         getGigs().add(g);
         return g;
     }
-    
+
 }

examples/milton-anno-bandstand/src/main/java/com/bandstand/domain/BandMember.java

@@ -17,25 +17,25 @@
 package com.bandstand.domain;
 
 import java.io.Serializable;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 public class BandMember implements Serializable{
-    
 
-    
+
+
     private Long id;
     private Band band;
     private Musician musician;
 
     public BandMember() {
     }
-    
-    
-    
+
+
+
     @Id
     @GeneratedValue
     public Long getId() {
@@ -64,8 +64,8 @@ public void setMusician(Musician musician) {
         this.musician = musician;
     }
 
-    
-    
-    
-    
+
+
+
+
 }

examples/milton-anno-bandstand/src/main/java/com/bandstand/domain/BaseEntity.java

@@ -16,30 +16,30 @@
 
 import java.util.Date;
 import java.util.List;
-import javax.persistence.*;
+import jakarta.persistence.*;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 /**
  *
  * @author brad
  */
-@javax.persistence.Entity
+@jakarta.persistence.Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 @Inheritance(strategy = InheritanceType.JOINED)
 @DiscriminatorColumn(name = "TYPE", discriminatorType = DiscriminatorType.STRING, length = 20)
 @DiscriminatorValue("E")
 public class BaseEntity {
-      
-    
+
+
     private long id;
     private String name;
     private String description;
     private Date createdDate;
     private Date modifiedDate;
-    
+
     private List<Image> images;
-    
+
     @Id
     @GeneratedValue
     public long getId() {
@@ -48,11 +48,11 @@ public long getId() {
 
     public void setId(long id) {
         this.id = id;
-    }    
-    
+    }
+
 
     @Column(nullable = false)
-    @Temporal(javax.persistence.TemporalType.TIMESTAMP)
+    @Temporal(jakarta.persistence.TemporalType.TIMESTAMP)
     public Date getCreatedDate() {
         return createdDate;
     }
@@ -62,15 +62,15 @@ public void setCreatedDate(Date createdDate) {
     }
 
     @Column(nullable = false)
-    @Temporal(javax.persistence.TemporalType.TIMESTAMP)
+    @Temporal(jakarta.persistence.TemporalType.TIMESTAMP)
     public Date getModifiedDate() {
         return modifiedDate;
     }
 
     public void setModifiedDate(Date modifiedDate) {
         this.modifiedDate = modifiedDate;
     }
-    
+
     @Column(nullable = false)
     public String getName() {
         return name;
@@ -86,8 +86,8 @@ public String getDescription() {
 
     public void setDescription(String description) {
         this.description = description;
-    }    
-    
+    }
+
     @OneToMany(mappedBy = "baseEntity")
     public List<Image> getImages() {
         return images;
@@ -97,6 +97,6 @@ public void setImages(List<Image> image) {
         this.images = image;
     }
 
-    
-    
+
+
 }