dynamic consumer version

build.gradle

@@ -65,12 +65,12 @@ javadoc {
     title("FINT Core Infrastructure Models")
 }
 
-dependencies {
+dependencies {''
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
     implementation 'org.jetbrains:annotations:23.0.0'
 
-    implementation 'no.fint:fint-model-resource:0.4.1'
+    implementation 'no.fintlabs:fint-model-resource:0.5.0'
 
     //compileOnly 'org.projectlombok:lombok:1.18.24'
     annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'

src/main/java/no/fintlabs/adapter/models/event/EventBodyResponse.java

@@ -0,0 +1,75 @@
+package no.fintlabs.adapter.models.event;
+
+import lombok.Builder;
+import lombok.Data;
+import org.springframework.beans.factory.parsing.Problem;
+import org.springframework.util.ObjectUtils;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+
+@Data
+@Builder
+public class EventBodyResponse implements Serializable {
+
+    private static final long serialVersionUID = -1075199100920918308L;
+    /**
+     * This message should be set if something goes wrong. It should typically describe what went wrong,
+     * for example a stack trace or an error message.
+     */
+    private String message;
+
+    /**
+     * This status code should be set to some code that can be used to trace the origin of the error
+     * in the back end system.
+     */
+    private String statusCode;
+
+    /**
+     * Shows the status of the event that was processed by the adapter.
+     */
+    private ResponseStatus responseStatus;
+
+    /**
+     * Shows the problems the system has found when processing this event's request.
+     */
+    private List<Problem> problems;
+
+    public static EventBodyResponse ofResponseEvent(ResponseFintEvent responseEvent) {
+        return EventBodyResponse.builder()
+                .message(getMessage(responseEvent))
+                .statusCode(getStatusCode(responseEvent))
+                .responseStatus(ResponseStatus.byResponseEvent(responseEvent))
+                .problems(new ArrayList<>())
+                .build();
+    }
+
+    private static String getStatusCode(ResponseFintEvent responseEvent) {
+        if (responseEvent.isFailed()) {
+            return "ERROR";
+        } else if (responseEvent.isRejected()) {
+            return "REJECTED";
+        } else if (responseEvent.isConflicted()) {
+            return "CONFLICT";
+        }
+
+        return "";
+    }
+
+    private static String getMessage(ResponseFintEvent responseEvent) {
+        Function<String, String> setMessage = (message) -> ObjectUtils.isEmpty(message) ? message : "";
+
+        if (responseEvent.isFailed()) {
+            return setMessage.apply(responseEvent.getErrorMessage());
+        } else if (responseEvent.isRejected()) {
+            return setMessage.apply(responseEvent.getRejectReason());
+        } else if (responseEvent.isConflicted()) {
+            return setMessage.apply(responseEvent.getConflictReason());
+        }
+
+        return "";
+    }
+
+}

src/main/java/no/fintlabs/adapter/models/event/EventIdentifikator.java

@@ -0,0 +1,13 @@
+package no.fintlabs.adapter.models.event;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+
+@Data
+@RequiredArgsConstructor
+public class EventIdentifikator {
+
+    private final String idField;
+    private final String idValue;
+
+}

src/main/java/no/fintlabs/adapter/models/event/FintEvent.java

@@ -0,0 +1,11 @@
+package no.fintlabs.adapter.models.event;
+
+import no.fintlabs.adapter.operation.OperationType;
+
+public interface FintEvent {
+
+    public String getCorrId();
+    public String getOrgId();
+    public OperationType getOperationType();
+
+}

src/main/java/no/fintlabs/adapter/models/RequestFintEvent.java → src/main/java/no/fintlabs/adapter/models/event/RequestFintEvent.java

@@ -1,9 +1,10 @@
-package no.fintlabs.adapter.models;
+package no.fintlabs.adapter.models.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import no.fintlabs.adapter.operation.OperationType;
 
 /**
  * Represents a request to the adapter
@@ -16,7 +17,7 @@ public class RequestFintEvent implements FintEvent {
     /**
      * GUID for correlation ID. The same ID should follow the request both upstream and downstream.
      */
-    String corrId;
+    private String corrId;
 
     /**
      * OrgId for the current customer.
@@ -39,7 +40,7 @@ public class RequestFintEvent implements FintEvent {
     private String resourceName;
 
     /**
-     * The type of operation to be performed (CREATE, UPDATE)
+     * The type of operation to be performed (CREATE, UPDATE, VALIDATE)
      */
     private OperationType operationType;
 
@@ -57,4 +58,5 @@ public class RequestFintEvent implements FintEvent {
      * The object to which the event applies
      */
     private String value;
+
 }

src/main/java/no/fintlabs/adapter/models/event/ResourceEvictionPayload.java

@@ -0,0 +1,32 @@
+package no.fintlabs.adapter.models.event;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+public class ResourceEvictionPayload {
+    private final String domain;
+    private final String pkg;
+    private final String resource;
+    private final String org;
+    private final Long unixTimestamp;
+
+    @JsonCreator
+    public ResourceEvictionPayload(
+            @JsonProperty("domain") String domain,
+            @JsonProperty("pkg") String pkg,
+            @JsonProperty("resource") String resource,
+            @JsonProperty("org") String org,
+            @JsonProperty("unixTimestamp") Long unixTimestamp
+    ) {
+        this.domain = domain;
+        this.pkg = pkg;
+        this.resource = resource;
+        this.org = org;
+        this.unixTimestamp = unixTimestamp;
+    }
+}

src/main/java/no/fintlabs/adapter/models/ResponseFintEvent.java → src/main/java/no/fintlabs/adapter/models/event/ResponseFintEvent.java

@@ -1,15 +1,18 @@
-package no.fintlabs.adapter.models;
+package no.fintlabs.adapter.models.event;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import no.fintlabs.adapter.models.AdapterContract;
+import no.fintlabs.adapter.models.sync.SyncPageEntry;
+import no.fintlabs.adapter.operation.OperationType;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class ResponseFintEvent<T> implements FintEvent {
+public class ResponseFintEvent implements FintEvent {
     /**
      * GUID for correlation ID. The same ID should follow the request both upstream and downstream.
      */
@@ -33,10 +36,10 @@ public class ResponseFintEvent<T> implements FintEvent {
     /**
      * The SyncPageEntry of the object that the event produced. The object should be a FINT resource.
      */
-    private SyncPageEntry<T> value;
+    private SyncPageEntry value;
 
     /**
-     * The type of operation to be performed (CREATE, UPDATE)
+     * The type of operation to be performed (CREATE, UPDATE, VALIDATE)
      */
     private OperationType operationType;
 
@@ -59,4 +62,15 @@ public class ResponseFintEvent<T> implements FintEvent {
      * A message that explains the reason for the rejection of the event.
      */
     private String rejectReason;
+
+    /**
+     * Indicates whether the event had a conflict.
+     */
+    private boolean conflicted;
+
+    /**
+     * A message that explains the reason for the conflict of the event.
+     */
+    private String conflictReason;
+
 }

src/main/java/no/fintlabs/adapter/models/event/ResponseStatus.java

@@ -0,0 +1,44 @@
+package no.fintlabs.adapter.models.event;
+
+/**
+ * The response status indicates the result of the event from the adapter.
+ * The statuses can be:
+ * <ul>
+ * <li>{@link #ACCEPTED}</li>
+ * <li>{@link #REJECTED}</li>
+ * <li>{@link #ERROR}</li>
+ * <li>{@link #CONFLICT}</li>
+ * </ul>
+ */
+public enum ResponseStatus {
+
+    /**
+     * The event request was accepted. For example the update of the resource was successful.
+     */
+    ACCEPTED,
+    /**
+     * The event request was rejected. For example that the adapter does not allow the update of a resource.
+     */
+    REJECTED,
+    /**
+     * An error happened during processing of the event, for example that the db that the adapter connects to is down.
+     */
+    ERROR,
+    /**
+     * The requested action results in a conflict, for example that an event tries to update a value that another event has already updated.
+     */
+    CONFLICT;
+
+    public static ResponseStatus byResponseEvent(ResponseFintEvent responseEvent) {
+        if (responseEvent.isFailed()) {
+            return ResponseStatus.ERROR;
+        } else if (responseEvent.isRejected()) {
+            return ResponseStatus.REJECTED;
+        } else if (responseEvent.isConflicted()) {
+            return ResponseStatus.CONFLICT;
+        }
+
+        return ResponseStatus.ACCEPTED;
+    }
+
+}

src/main/java/no/fintlabs/adapter/models/sync/DeleteSyncPage.java

@@ -0,0 +1,9 @@
+package no.fintlabs.adapter.models.sync;
+
+import java.util.List;
+
+public class DeleteSyncPage extends SyncPage {
+    public DeleteSyncPage() {
+        super(SyncType.DELETE);
+    }
+}