touch up the activity log configuration

Signed-off-by: Jason Sherman <jsherman@parcsystems.ca>

Author: Jason Sherman

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/config/ActivityLogConfig.java

@@ -17,7 +17,7 @@
  */
 package org.hyperledger.bpa.config;
 
-import lombok.NoArgsConstructor;
+import lombok.Getter;
 import org.hyperledger.aries.api.connection.ConnectionState;
 import org.hyperledger.aries.api.present_proof.PresentationExchangeState;
 
@@ -27,7 +27,7 @@
 import java.util.List;
 
 @Singleton
-@NoArgsConstructor
+@Getter
 public class ActivityLogConfig {
     /*
      * For now, we are not sure what to do with this configuration. Will each
@@ -36,64 +36,64 @@ public class ActivityLogConfig {
      * AcaPyConfig, which flags are set to auto respond...
      */
 
-    @Inject
-    AcaPyConfig acaPyConfig;
+    private static List<ConnectionState> CONNECTION_STATES_TASKS = List.of(ConnectionState.REQUEST);
 
-    public List<ConnectionState> getConnectionStatesForActivities() {
-        List<ConnectionState> results = new ArrayList<>(getConnectionStatesCompleted());
-        results.addAll(getConnectionStatesForTasks());
-        results.add(ConnectionState.INVITATION);
-        return List.copyOf(results);
-    }
+    private static List<ConnectionState> CONNECTION_STATES_COMPLETED = List.of(ConnectionState.ACTIVE,
+            ConnectionState.RESPONSE,
+            ConnectionState.COMPLETED,
+            ConnectionState.PING_RESPONSE,
+            ConnectionState.PING_NO_RESPONSE);
 
-    public List<ConnectionState> getConnectionStatesForTasks() {
-        if (this.isConnectionRequestTask()) {
-            return connectionStates(ConnectionState.REQUEST);
-        }
-        return List.of();
-    }
+    private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_TASKS = List.of(PresentationExchangeState.REQUEST_RECEIVED);
 
-    public List<ConnectionState> getConnectionStatesCompleted() {
-        return connectionStates(ConnectionState.ACTIVE,
-                ConnectionState.RESPONSE,
-                ConnectionState.COMPLETED,
-                ConnectionState.PING_RESPONSE,
-                ConnectionState.PING_NO_RESPONSE);
-    }
+    private static List<PresentationExchangeState> PRESENTATION_EXCHANGE_STATES_COMPLETED = List.of(PresentationExchangeState.VERIFIED,
+            PresentationExchangeState.PRESENTATION_ACKED);
 
-    public boolean isConnectionRequestTask() {
-        return !acaPyConfig.getAutoAcceptRequests();
-    }
+    private List<ConnectionState> connectionStatesForActivities;
+    private List<ConnectionState> connectionStatesForCompleted;
+    private List<ConnectionState> connectionStatesForTasks;
+    private List<PresentationExchangeState> presentationExchangeStatesForActivities;
+    private List<PresentationExchangeState> presentationExchangeStatesForCompleted;
+    private List<PresentationExchangeState> presentationExchangeStatesForTasks;
 
-    public List<PresentationExchangeState> getPresentationExchangeStatesForActivities() {
-        List<PresentationExchangeState> results = new ArrayList<>(getPresentationExchangeStatesCompleted());
-        results.addAll(getPresentationExchangeStatesForTasks());
-        results.add(PresentationExchangeState.REQUEST_SENT);
-        return List.copyOf(results);
-    }
+    private AcaPyConfig acaPyConfig;
+
+    @Inject
+    ActivityLogConfig(AcaPyConfig acaPyConfig) {
+        this.acaPyConfig = acaPyConfig;
+        // 1. set the tasks lists first as they depend on aca py configuration
+        connectionStatesForTasks = this.isConnectionRequestTask() ? CONNECTION_STATES_TASKS : List.of();
+        presentationExchangeStatesForTasks = this.isPresentationExchangeTask() ? PRESENTATION_EXCHANGE_STATES_TASKS : List.of();
+
+        // 2. set the completed state lists
+        connectionStatesForCompleted = CONNECTION_STATES_COMPLETED;
+        presentationExchangeStatesForCompleted = PRESENTATION_EXCHANGE_STATES_COMPLETED;
 
-    public List<PresentationExchangeState> getPresentationExchangeStatesForTasks() {
-        if (this.isPresentationExchangeTask()) {
-            return presentationExchangeStates(PresentationExchangeState.REQUEST_RECEIVED);
-        }
-        return List.of();
+        // 3. build the activity lists based on task and completed lists
+        connectionStatesForActivities = this.buildConnectionStatesForActivities();
+        presentationExchangeStatesForActivities = this.buildPresentationExchangeStatesForActivities();
     }
 
-    public List<PresentationExchangeState> getPresentationExchangeStatesCompleted() {
-        return presentationExchangeStates(PresentationExchangeState.VERIFIED,
-                PresentationExchangeState.PRESENTATION_ACKED);
+    private List<ConnectionState> buildConnectionStatesForActivities() {
+        List<ConnectionState> results = new ArrayList<>(this.getConnectionStatesForCompleted());
+        results.addAll(this.getConnectionStatesForTasks());
+        results.add(ConnectionState.INVITATION);
+        return List.copyOf(results);
     }
 
-    public boolean isPresentationExchangeTask() {
-        return !acaPyConfig.getAutoRespondPresentationRequest();
+    private boolean isConnectionRequestTask() {
+        return !this.acaPyConfig.getAutoAcceptRequests();
     }
 
-    private List<ConnectionState> connectionStates(ConnectionState... states) {
-        return List.of(states);
+    public List<PresentationExchangeState> buildPresentationExchangeStatesForActivities() {
+        List<PresentationExchangeState> results = new ArrayList<>(this.getPresentationExchangeStatesForCompleted());
+        results.addAll(this.getPresentationExchangeStatesForTasks());
+        results.add(PresentationExchangeState.REQUEST_SENT);
+        return List.copyOf(results);
     }
 
-    private List<PresentationExchangeState> presentationExchangeStates(PresentationExchangeState... states) {
-        return List.of(states);
+    private boolean isPresentationExchangeTask() {
+        return !this.acaPyConfig.getAutoRespondPresentationRequest();
     }
 
 }

backend/business-partner-agent/src/main/java/org/hyperledger/bpa/impl/ActivityManager.java

@@ -96,7 +96,7 @@ public void addPartnerRequestReceivedTask(@NonNull Partner partner) {
         Optional<Activity> existing = activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
                 ActivityType.CONNECTION_REQUEST,
                 ActivityRole.CONNECTION_REQUEST_RECIPIENT);
-        if (!existing.isPresent()) {
+        if (existing.isEmpty()) {
             Activity a = Activity.builder()
                     .linkId(partner.getId())
                     .partner(partner)
@@ -114,23 +114,23 @@ public void completePartnerRequestTask(@NonNull Partner partner) {
         activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
                 ActivityType.CONNECTION_REQUEST,
                 ActivityRole.CONNECTION_REQUEST_RECIPIENT).ifPresentOrElse(activity -> {
-                    // set to completed and mark accepted
-                    activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
-                    activity.setCompleted(true);
-                    activityRepository.update(activity);
-                    eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
-                }, () -> {
-                    // add in a completed activity
-                    Activity a = Activity.builder()
-                            .linkId(partner.getId())
-                            .partner(partner)
-                            .type(ActivityType.CONNECTION_REQUEST)
-                            .role(ActivityRole.CONNECTION_REQUEST_RECIPIENT)
-                            .state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
-                            .completed(true)
-                            .build();
-                    activityRepository.save(a);
-                });
+            // set to completed and mark accepted
+            activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
+            activity.setCompleted(true);
+            activityRepository.update(activity);
+            eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
+        }, () -> {
+            // add in a completed activity
+            Activity a = Activity.builder()
+                    .linkId(partner.getId())
+                    .partner(partner)
+                    .type(ActivityType.CONNECTION_REQUEST)
+                    .role(ActivityRole.CONNECTION_REQUEST_RECIPIENT)
+                    .state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
+                    .completed(true)
+                    .build();
+            activityRepository.save(a);
+        });
     }
 
     public void deletePartnerActivities(@NonNull Partner partner) {
@@ -141,7 +141,7 @@ public void addPartnerAddedActivity(@NonNull Partner partner) {
         Optional<Activity> existing = activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
                 ActivityType.CONNECTION_REQUEST,
                 ActivityRole.CONNECTION_REQUEST_SENDER);
-        if (!existing.isPresent()) {
+        if (existing.isEmpty()) {
             Activity a = Activity.builder()
                     .linkId(partner.getId())
                     .partner(partner)
@@ -158,21 +158,21 @@ public void addPartnerAcceptedActivity(@NonNull Partner partner) {
         activityRepository.findByLinkIdAndTypeAndRole(partner.getId(),
                 ActivityType.CONNECTION_REQUEST,
                 ActivityRole.CONNECTION_REQUEST_SENDER).ifPresentOrElse(activity -> {
-                    activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
-                    activity.setCompleted(true);
-                    activityRepository.update(activity);
-                }, () -> {
-                    // add in a completed activity
-                    Activity a = Activity.builder()
-                            .linkId(partner.getId())
-                            .partner(partner)
-                            .type(ActivityType.CONNECTION_REQUEST)
-                            .role(ActivityRole.CONNECTION_REQUEST_SENDER)
-                            .state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
-                            .completed(true)
-                            .build();
-                    activityRepository.save(a);
-                });
+            activity.setState(ActivityState.CONNECTION_REQUEST_ACCEPTED);
+            activity.setCompleted(true);
+            activityRepository.update(activity);
+        }, () -> {
+            // add in a completed activity
+            Activity a = Activity.builder()
+                    .linkId(partner.getId())
+                    .partner(partner)
+                    .type(ActivityType.CONNECTION_REQUEST)
+                    .role(ActivityRole.CONNECTION_REQUEST_SENDER)
+                    .state(ActivityState.CONNECTION_REQUEST_ACCEPTED)
+                    .completed(true)
+                    .build();
+            activityRepository.save(a);
+        });
     }
 
     public void addPresentationExchangeTask(@NonNull PartnerProof partnerProof) {
@@ -185,7 +185,7 @@ public void addPresentationExchangeTask(@NonNull PartnerProof partnerProof) {
                     ActivityType.PRESENTATION_EXCHANGE,
                     role);
 
-            if (!existing.isPresent()) {
+            if (existing.isEmpty()) {
                 Activity a = Activity.builder()
                         .linkId(partnerProof.getId())
                         .partner(partner)
@@ -213,24 +213,24 @@ public void completePresentationExchangeTask(@NonNull PartnerProof partnerProof)
             activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
                     ActivityType.PRESENTATION_EXCHANGE,
                     role).ifPresentOrElse(activity -> {
-                        // set to completed and mark accepted
-                        activity.setState(state);
-                        activity.setCompleted(true);
-                        activityRepository.update(activity);
+                // set to completed and mark accepted
+                activity.setState(state);
+                activity.setCompleted(true);
+                activityRepository.update(activity);
 
-                        eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
-                    }, () -> {
-                        // add in a completed activity
-                        Activity a = Activity.builder()
-                                .linkId(partnerProof.getId())
-                                .partner(partner)
-                                .type(ActivityType.PRESENTATION_EXCHANGE)
-                                .role(role)
-                                .state(state)
-                                .completed(true)
-                                .build();
-                        activityRepository.save(a);
-                    });
+                eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
+            }, () -> {
+                // add in a completed activity
+                Activity a = Activity.builder()
+                        .linkId(partnerProof.getId())
+                        .partner(partner)
+                        .type(ActivityType.PRESENTATION_EXCHANGE)
+                        .role(role)
+                        .state(state)
+                        .completed(true)
+                        .build();
+                activityRepository.save(a);
+            });
         });
     }
 
@@ -242,11 +242,11 @@ public void declinePresentationExchangeTask(@NonNull PartnerProof partnerProof)
             activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
                     ActivityType.PRESENTATION_EXCHANGE,
                     role).ifPresent(activity -> {
-                        activity.setState(ActivityState.PRESENTATION_EXCHANGE_DECLINED);
-                        activity.setCompleted(true);
-                        activityRepository.update(activity);
-                        eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
-                    });
+                activity.setState(ActivityState.PRESENTATION_EXCHANGE_DECLINED);
+                activity.setCompleted(true);
+                activityRepository.update(activity);
+                eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
+            });
         });
     }
 
@@ -255,9 +255,9 @@ public void deletePresentationExchangeTask(@NonNull PartnerProof partnerProof) {
         activityRepository.findByLinkIdAndTypeAndRole(partnerProof.getId(),
                 ActivityType.PRESENTATION_EXCHANGE,
                 role).ifPresent(activity -> {
-                    activityRepository.delete(activity);
-                    eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
-                });
+            activityRepository.delete(activity);
+            eventPublisher.publishEventAsync(TaskCompletedEvent.builder().activity(activity).build());
+        });
     }
 
     private ActivityItem convert(Activity activity) {
@@ -275,23 +275,23 @@ private ActivityItem convert(Activity activity) {
 
     private ActivityState getPresentationExchangeState(PartnerProof partnerProof) {
         switch (partnerProof.getState()) {
-        case VERIFIED:
-        case PRESENTATION_ACKED:
-            return ActivityState.PRESENTATION_EXCHANGE_ACCEPTED;
-        case REQUEST_SENT:
-        case PRESENTATIONS_SENT:
-            return ActivityState.PRESENTATION_EXCHANGE_SENT;
-        case REQUEST_RECEIVED:
-        case PRESENTATION_RECEIVED:
-            return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
-        default:
-            switch (partnerProof.getRole()) {
-            case VERIFIER:
+            case VERIFIED:
+            case PRESENTATION_ACKED:
+                return ActivityState.PRESENTATION_EXCHANGE_ACCEPTED;
+            case REQUEST_SENT:
+            case PRESENTATIONS_SENT:
+                return ActivityState.PRESENTATION_EXCHANGE_SENT;
+            case REQUEST_RECEIVED:
+            case PRESENTATION_RECEIVED:
                 return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
-            case PROVER:
             default:
-                return ActivityState.PRESENTATION_EXCHANGE_SENT;
-            }
+                switch (partnerProof.getRole()) {
+                    case VERIFIER:
+                        return ActivityState.PRESENTATION_EXCHANGE_RECEIVED;
+                    case PROVER:
+                    default:
+                        return ActivityState.PRESENTATION_EXCHANGE_SENT;
+                }
         }
     }