1 files changed, 17 insertions, 43 deletions

diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StartState.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StartState.java
index decbdfda..a978e245 100644
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StartState.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/StartState.java
@@ -28,19 +28,19 @@ import static org.onap.policy.drools.pooling.state.FilterUtils.makeOr;
 import java.util.Map;
 import org.onap.policy.drools.pooling.PoolingManager;
 import org.onap.policy.drools.pooling.message.Heartbeat;
-import org.onap.policy.drools.pooling.message.Identification;
-import org.onap.policy.drools.pooling.message.Leader;
 import org.onap.policy.drools.pooling.message.Message;
-import org.onap.policy.drools.pooling.message.Offline;
-import org.onap.policy.drools.pooling.message.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
- * The start state. Upon entry, a heart beat is generated and the event filter
- * is changed to look for just that particular message. Once the message is
- * seen, it goes into the {@link QueryState}.
+ * The start state. Upon entry, a heart beat is generated and the event filter is changed
+ * to look for just that particular message. Once the message is seen, it goes into the
+ * {@link QueryState}.
  */
 public class StartState extends State {
 
+    private static final Logger logger = LoggerFactory.getLogger(StartState.class);
+
     /**
      * Time stamp inserted into the heart beat message.
      */
@@ -69,54 +69,28 @@ public class StartState extends State {
 
         publish(getHost(), makeHeartbeat(hbTimestampMs));
 
-        schedule(getProperties().getStartHeartbeatMs(), xxx -> internalTopicFailed());
+        schedule(getProperties().getStartHeartbeatMs(), () -> {
+            logger.error("missed heartbeat on topic {}", getTopic());
+            return internalTopicFailed();
+        });
     }
 
     /**
-     * Transitions to the query state if the heart beat originated from this
-     * host and its time stamp matches.
+     * Transitions to the query state if the heart beat originated from this host and its
+     * time stamp matches.
      */
     @Override
     public State process(Heartbeat msg) {
         if (msg.getTimestampMs() == hbTimestampMs && getHost().equals(msg.getSource())) {
             // saw our own heart beat - transition to query state
+            logger.info("saw our own heartbeat on topic {}", getTopic());
             publish(makeQuery());
             return goQuery();
-        }
-
-        return null;
-    }
-
-    /**
-     * Discards the message.
-     */
-    @Override
-    public State process(Identification msg) {
-        return null;
-    }
-
-    /**
-     * Processes the assignments, but remains in the current state.
-     */
-    @Override
-    public State process(Leader msg) {
-        super.process(msg);
-        return null;
-    }
 
-    /**
-     * Discards the message.
-     */
-    @Override
-    public State process(Offline msg) {
-        return null;
-    }
+        } else {
+            logger.info("ignored old heartbeat message from {} on topic {}", msg.getSource(), getTopic());
+        }
 
-    /**
-     * Discards the message.
-     */
-    @Override
-    public State process(Query msg) {
         return null;
     }