Make feature-pooling-dmaap work without filtering

[policy/drools-pdp.git] / feature-pooling-dmaap / src / main / java / org / onap / policy / drools / pooling / state / State.java

diff --git a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/State.java b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/State.java
index f2277be..853c24d 100644 (file)
--- a/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/State.java
+++ b/feature-pooling-dmaap/src/main/java/org/onap/policy/drools/pooling/state/State.java
@@ -20,22 +20,15 @@
 
 package org.onap.policy.drools.pooling.state;
 
-import static org.onap.policy.drools.pooling.state.FilterUtils.MSG_CHANNEL;
-import static org.onap.policy.drools.pooling.state.FilterUtils.makeEquals;
-import static org.onap.policy.drools.pooling.state.FilterUtils.makeOr;
-
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import org.onap.policy.drools.pooling.CancellableScheduledTask;
 import org.onap.policy.drools.pooling.PoolingManager;
 import org.onap.policy.drools.pooling.PoolingProperties;
 import org.onap.policy.drools.pooling.message.BucketAssignments;
-import org.onap.policy.drools.pooling.message.Forward;
 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;
@@ -70,18 +63,6 @@ public abstract class State {
         this.mgr = mgr;
     }
 
-    /**
-     * Gets the server-side filter to use when polling the DMaaP internal topic. The
-     * default method returns a filter that accepts messages on the admin channel and on
-     * the host's own channel.
-     *
-     * @return the server-side filter to use.
-     */
-    @SuppressWarnings("unchecked")
-    public Map<String, Object> getFilter() {
-        return makeOr(makeEquals(MSG_CHANNEL, Message.ADMIN), makeEquals(MSG_CHANNEL, getHost()));
-    }
-
     /**
      * Cancels the timers added by this state.
      */
@@ -141,26 +122,6 @@ public abstract class State {
         return mgr.goInactive();
     }
 
-    /**
-     * Processes a message. The default method passes it to the manager to handle and
-     * returns {@code null}.
-     *
-     * @param msg message to be processed
-     * @return the new state, or {@code null} if the state is unchanged
-     */
-    public State process(Forward msg) {
-        if (getHost().equals(msg.getChannel())) {
-            logger.info("received Forward message from {} on topic {}", msg.getSource(), getTopic());
-            mgr.handle(msg);
-
-        } else {
-            logger.info("discard Forward message to {} from {} on topic {}", msg.getChannel(), msg.getSource(),
-                            getTopic());
-        }
-
-        return null;
-    }
-
     /**
      * Processes a message. The default method just returns {@code null}.
      *
@@ -287,16 +248,6 @@ public abstract class State {
         mgr.publishAdmin(msg);
     }
 
-    /**
-     * Publishes a message on the specified channel.
-     *
-     * @param channel channel
-     * @param msg message to be published
-     */
-    protected final void publish(String channel, Forward msg) {
-        mgr.publish(channel, msg);
-    }
-
     /**
      * Publishes a message on the specified channel.
      *