Merge f18903f into 29b905e

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/catchup/CatchupCompletedEvent.java

@@ -15,7 +15,6 @@ public ZonedDateTime getCatchupCompletedAt() {
         return catchupCompletedAt;
     }
 
-
     @Override
     public boolean equals(final Object o) {
         if (this == o) return true;

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/catchup/CatchupRequestedEvent.java

@@ -4,16 +4,16 @@
 import java.util.Objects;
 
 public class CatchupRequestedEvent {
-    private final Object caller;
+    private final String initiatedBy;
     private final ZonedDateTime catchupRequestedAt;
 
-    public CatchupRequestedEvent(final Object caller, final ZonedDateTime catchupRequestedAt) {
-        this.caller = caller;
+    public CatchupRequestedEvent(final String initiatedBy, final ZonedDateTime catchupRequestedAt) {
+        this.initiatedBy = initiatedBy;
         this.catchupRequestedAt = catchupRequestedAt;
     }
 
-    public Object getCaller() {
-        return caller;
+    public String getInitiatedBy() {
+        return initiatedBy;
     }
 
     public ZonedDateTime getCatchupRequestedAt() {
@@ -25,19 +25,19 @@ public boolean equals(final Object o) {
         if (this == o) return true;
         if (!(o instanceof CatchupRequestedEvent)) return false;
         final CatchupRequestedEvent that = (CatchupRequestedEvent) o;
-        return Objects.equals(caller, that.caller) &&
+        return Objects.equals(initiatedBy, that.initiatedBy) &&
                 Objects.equals(catchupRequestedAt, that.catchupRequestedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(caller, catchupRequestedAt);
+        return Objects.hash(initiatedBy, catchupRequestedAt);
     }
 
     @Override
     public String toString() {
         return "CatchupRequestedEvent{" +
-                "caller=" + caller +
+                "initiatedBy='" + initiatedBy + '\'' +
                 ", catchupRequestedAt=" + catchupRequestedAt +
                 '}';
     }

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/shuttering/ObjectShutteredEvent.java

@@ -5,16 +5,16 @@
 
 public class ObjectShutteredEvent {
 
-    private final Shutterable shutterable;
+    private final String initiatedBy;
     private final ZonedDateTime objectShutteredAt;
 
-    public ObjectShutteredEvent(final Shutterable shutterable, final ZonedDateTime objectShutteredAt) {
-        this.shutterable = shutterable;
+    public ObjectShutteredEvent(final String initiatedBy, final ZonedDateTime objectShutteredAt) {
+        this.initiatedBy = initiatedBy;
         this.objectShutteredAt = objectShutteredAt;
     }
 
-    public Shutterable getShutterable() {
-        return shutterable;
+    public String getInitiatedBy() {
+        return initiatedBy;
     }
 
     public ZonedDateTime getObjectShutteredAt() {
@@ -26,19 +26,19 @@ public boolean equals(final Object o) {
         if (this == o) return true;
         if (!(o instanceof ObjectShutteredEvent)) return false;
         final ObjectShutteredEvent that = (ObjectShutteredEvent) o;
-        return Objects.equals(shutterable, that.shutterable) &&
+        return Objects.equals(initiatedBy, that.initiatedBy) &&
                 Objects.equals(objectShutteredAt, that.objectShutteredAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(shutterable, objectShutteredAt);
+        return Objects.hash(initiatedBy, objectShutteredAt);
     }
 
     @Override
     public String toString() {
         return "ObjectShutteredEvent{" +
-                "shutterable=" + shutterable +
+                "initiatedBy='" + initiatedBy + '\'' +
                 ", objectShutteredAt=" + objectShutteredAt +
                 '}';
     }

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/shuttering/ObjectUnshutteredEvent.java

@@ -1,21 +1,20 @@
 package uk.gov.justice.services.core.lifecycle.events.shuttering;
 
-
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
 public class ObjectUnshutteredEvent {
 
-    private final Shutterable shutterable;
+    private final String initiatedBy;
     private final ZonedDateTime objectUnshutteredAt;
 
-    public ObjectUnshutteredEvent(final Shutterable shutterable, final ZonedDateTime objectUnshutteredAt) {
-        this.shutterable = shutterable;
+    public ObjectUnshutteredEvent(final String initiatedBy, final ZonedDateTime objectUnshutteredAt) {
+        this.initiatedBy = initiatedBy;
         this.objectUnshutteredAt = objectUnshutteredAt;
     }
 
-    public Shutterable getShutterable() {
-        return shutterable;
+    public String getInitiatedBy() {
+        return initiatedBy;
     }
 
     public ZonedDateTime getObjectUnshutteredAt() {
@@ -27,19 +26,19 @@ public boolean equals(final Object o) {
         if (this == o) return true;
         if (!(o instanceof ObjectUnshutteredEvent)) return false;
         final ObjectUnshutteredEvent that = (ObjectUnshutteredEvent) o;
-        return Objects.equals(shutterable, that.shutterable) &&
+        return Objects.equals(initiatedBy, that.initiatedBy) &&
                 Objects.equals(objectUnshutteredAt, that.objectUnshutteredAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(shutterable, objectUnshutteredAt);
+        return Objects.hash(initiatedBy, objectUnshutteredAt);
     }
 
     @Override
     public String toString() {
         return "ObjectUnshutteredEvent{" +
-                "shutterable=" + shutterable +
+                "initiatedBy='" + initiatedBy + '\'' +
                 ", objectUnshutteredAt=" + objectUnshutteredAt +
                 '}';
     }

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/shuttering/ShutteringRequestedEvent.java

@@ -5,16 +5,16 @@
 
 public class ShutteringRequestedEvent {
 
-    private final Object caller;
+    private final String initiatedBy;
     private final ZonedDateTime shutteringRequestedAt;
 
-    public ShutteringRequestedEvent(final Object caller, final ZonedDateTime shutteringRequestedAt) {
-        this.caller = caller;
+    public ShutteringRequestedEvent(final String initiatedBy, final ZonedDateTime shutteringRequestedAt) {
+        this.initiatedBy = initiatedBy;
         this.shutteringRequestedAt = shutteringRequestedAt;
     }
 
-    public Object getCaller() {
-        return caller;
+    public Object getInitiatedBy() {
+        return initiatedBy;
     }
 
     public ZonedDateTime getShutteringRequestedAt() {
@@ -26,19 +26,19 @@ public boolean equals(final Object o) {
         if (this == o) return true;
         if (!(o instanceof ShutteringRequestedEvent)) return false;
         final ShutteringRequestedEvent that = (ShutteringRequestedEvent) o;
-        return Objects.equals(caller, that.caller) &&
+        return Objects.equals(initiatedBy, that.initiatedBy) &&
                 Objects.equals(shutteringRequestedAt, that.shutteringRequestedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(caller, shutteringRequestedAt);
+        return Objects.hash(initiatedBy, shutteringRequestedAt);
     }
 
     @Override
     public String toString() {
         return "ShutteringRequestedEvent{" +
-                "caller=" + caller +
+                "initiatedBy='" + initiatedBy + '\'' +
                 ", shutteringRequestedAt=" + shutteringRequestedAt +
                 '}';
     }

framework-api-core/src/main/java/uk/gov/justice/services/core/lifecycle/events/shuttering/UnshutteringRequestedEvent.java

@@ -5,16 +5,16 @@
 
 public class UnshutteringRequestedEvent {
 
-    private final Object caller;
+    private final String initiatedBy;
     private final ZonedDateTime unshutteringRequestedAt;
 
-    public UnshutteringRequestedEvent(final Object caller, final ZonedDateTime unshutteringRequestedAt) {
-        this.caller = caller;
+    public UnshutteringRequestedEvent(final String initiatedBy, final ZonedDateTime unshutteringRequestedAt) {
+        this.initiatedBy = initiatedBy;
         this.unshutteringRequestedAt = unshutteringRequestedAt;
     }
 
-    public Object getCaller() {
-        return caller;
+    public String getInitiatedBy() {
+        return initiatedBy;
     }
 
     public ZonedDateTime getUnshutteringRequestedAt() {
@@ -26,19 +26,19 @@ public boolean equals(final Object o) {
         if (this == o) return true;
         if (!(o instanceof UnshutteringRequestedEvent)) return false;
         final UnshutteringRequestedEvent that = (UnshutteringRequestedEvent) o;
-        return Objects.equals(caller, that.caller) &&
+        return Objects.equals(initiatedBy, that.initiatedBy) &&
                 Objects.equals(unshutteringRequestedAt, that.unshutteringRequestedAt);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(caller, unshutteringRequestedAt);
+        return Objects.hash(initiatedBy, unshutteringRequestedAt);
     }
 
     @Override
     public String toString() {
         return "UnshutteringRequestedEvent{" +
-                "caller=" + caller +
+                "initiatedBy='" + initiatedBy + '\'' +
                 ", unshutteringRequestedAt=" + unshutteringRequestedAt +
                 '}';
     }