From 8453a69cc219d6d1f6a7373582cf69e8f0071770 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Wed, 15 Jan 2020 17:27:18 -0500
Subject: [PATCH] Beacon implementation

---
 .../edu/internet2/tap/beacon/DefaultBeaconPublisher.java | 6 +++---
 .../configuration/BeaconPublishingConfiguration.java     | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java b/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java
index 610baf827..74e49d930 100644
--- a/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java
+++ b/beacon/core/src/main/java/edu/internet2/tap/beacon/DefaultBeaconPublisher.java
@@ -81,12 +81,12 @@ public void run() {
 
     }
 
-    //Below are package-private getters used in unit tests
-    String getEndpointUri() {
+    //getters used in unit tests and calling components for debugging purposes
+    public String getEndpointUri() {
         return enpointUrl.toString();
     }
 
-    String getJsonPayload() {
+    public String getJsonPayload() {
         return jsonPayload;
     }
 }
diff --git a/beacon/spring/src/main/java/edu/internet2/tap/beacon/configuration/BeaconPublishingConfiguration.java b/beacon/spring/src/main/java/edu/internet2/tap/beacon/configuration/BeaconPublishingConfiguration.java
index e7ea6b2ba..79e073641 100644
--- a/beacon/spring/src/main/java/edu/internet2/tap/beacon/configuration/BeaconPublishingConfiguration.java
+++ b/beacon/spring/src/main/java/edu/internet2/tap/beacon/configuration/BeaconPublishingConfiguration.java
@@ -1,6 +1,5 @@
 package edu.internet2.tap.beacon.configuration;
 
-import edu.internet2.tap.beacon.BeaconPublisher;
 import edu.internet2.tap.beacon.DefaultBeaconPublisher;
 import edu.internet2.tap.beacon.configuration.condition.ConditionalOnBeaconEnvironmentVariablesPresent;
 import org.slf4j.Logger;
@@ -43,10 +42,9 @@ public BeaconPublishingTask beaconPublisher(Environment env) {
     }
 
     public static class BeaconPublishingTask {
+        private DefaultBeaconPublisher beaconPublisher;
 
-        private BeaconPublisher beaconPublisher;
-
-        public BeaconPublishingTask(BeaconPublisher beaconPublisher) {
+        public BeaconPublishingTask(DefaultBeaconPublisher beaconPublisher) {
             this.beaconPublisher = beaconPublisher;
         }
 
@@ -54,6 +52,9 @@ public BeaconPublishingTask(BeaconPublisher beaconPublisher) {
         @Scheduled(cron = "0 ${random.int[0,59]} ${random.int[0,3]} ? * *}")
         @Async
         void publish() {
+            logger.debug("Publishing payload: {} to beacon endpoint: {}",
+                    beaconPublisher.getJsonPayload(),
+                    beaconPublisher.getEndpointUri());
             beaconPublisher.run();
         }
     }