chore: Rename Event hibernate object to TrackerEvent [DHIS2-19865]

Author: enricocolasante

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Objects.java

@@ -49,8 +49,8 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.program.Enrollment;
-import org.hisp.dhis.program.Event;
 import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.TrackerEvent;
 import org.hisp.dhis.report.Report;
 import org.hisp.dhis.trackedentity.TrackedEntity;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
@@ -90,7 +90,7 @@ public enum Objects {
   PROGRAM("program", Program.class),
   TRACKEDENTITY("trackedEntity", TrackedEntity.class),
   ENROLLMENT("enrollment", Enrollment.class),
-  EVENT("event", Event.class),
+  EVENT("event", TrackerEvent.class),
   TRACKEDENTITYATTRIBUTE("trackedEntityAttribute", TrackedEntityAttribute.class),
   EXPRESSIONDIMENSIONITEM("expressionDimensionItem", ExpressionDimensionItem.class);
 

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Enrollment.java

@@ -83,7 +83,7 @@ public class Enrollment extends SoftDeletableObject {
 
   @AuditAttribute private Program program;
 
-  private Set<Event> events = new HashSet<>();
+  private Set<TrackerEvent> events = new HashSet<>();
 
   private Set<RelationshipItem> relationshipItems = new HashSet<>();
 
@@ -303,11 +303,11 @@ public void setProgram(Program program) {
   @JsonProperty
   @JacksonXmlElementWrapper(localName = "events", namespace = DxfNamespaces.DXF_2_0)
   @JacksonXmlProperty(localName = "event", namespace = DxfNamespaces.DXF_2_0)
-  public Set<Event> getEvents() {
+  public Set<TrackerEvent> getEvents() {
     return events;
   }
 
-  public void setEvents(Set<Event> events) {
+  public void setEvents(Set<TrackerEvent> events) {
     this.events = events;
   }
 

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/EventStore.java

@@ -39,7 +39,7 @@
 /**
  * @author Abyot Asalefew
  */
-public interface EventStore extends IdentifiableObjectStore<Event> {
+public interface EventStore extends IdentifiableObjectStore<TrackerEvent> {
 
   /**
    * Merges all eventDataValues which have one of the source dataElements. The lastUpdated value is
@@ -60,8 +60,8 @@ void mergeEventDataValuesWithDataElement(
   void deleteEventDataValuesWithDataElement(@Nonnull Collection<UID> sourceDataElements);
 
   /**
-   * Updates all {@link Event}s with references to {@link CategoryOptionCombo}s, to use the coc
-   * reference.
+   * Updates all {@link TrackerEvent}s with references to {@link CategoryOptionCombo}s, to use the
+   * coc reference.
    *
    * @param cocs {@link CategoryOptionCombo}s to update
    * @param coc {@link CategoryOptionCombo} to use as the new value

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramService.java

@@ -58,8 +58,8 @@ public interface ProgramService {
   void updateProgram(Program program);
 
   /**
-   * Deletes a {@link Program}. All {@link ProgramStage}, {@link Enrollment} and {@link Event}
-   * belong to this program are removed
+   * Deletes a {@link Program}. All {@link ProgramStage}, {@link Enrollment} and {@link
+   * TrackerEvent} belong to this program are removed
    *
    * @param program the Program to delete.
    */

dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/SingleEvent.java

@@ -37,7 +37,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.hisp.dhis.audit.AuditAttribute;
@@ -57,7 +56,6 @@
 @Auditable(scope = AuditScope.TRACKER)
 @Setter
 @NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
 public class SingleEvent extends SoftDeletableObject {
   private Date createdAtClient;