You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by ds...@apache.org on 2013/11/18 23:25:29 UTC
svn commit: r1543200 - in
/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components:
activitysubscriber/ activitysubscriber/impl/ service/impl/
Author: dsullivan
Date: Mon Nov 18 22:25:29 2013
New Revision: 1543200
URL: http://svn.apache.org/r1543200
Log:
removing filters now removes activity
Modified:
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriber.java
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/StreamsFiltersServiceImpl.java
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriber.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriber.java?rev=1543200&r1=1543199&r2=1543200&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriber.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/ActivityStreamsSubscriber.java Mon Nov 18 22:25:29 2013
@@ -10,4 +10,5 @@ public interface ActivityStreamsSubscrib
String getStream() throws Exception;
Date getLastUpdated();
void setLastUpdated(Date lastUpdated);
+ void reset();
}
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java?rev=1543200&r1=1543199&r2=1543200&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/activitysubscriber/impl/ActivityStreamsSubscriberDelegate.java Mon Nov 18 22:25:29 2013
@@ -52,4 +52,9 @@ public class ActivityStreamsSubscriberDe
public void receive(List<ActivityStreamsEntry> activities) {
stream.addAll(activities);
}
+
+ public void reset(){
+ this.lastUpdated = new Date(0);
+ this.stream.clear();
+ }
}
Modified: incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/StreamsFiltersServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/StreamsFiltersServiceImpl.java?rev=1543200&r1=1543199&r2=1543200&view=diff
==============================================================================
--- incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/StreamsFiltersServiceImpl.java (original)
+++ incubator/streams/branches/webservice/streams-components/src/main/java/org/apache/streams/components/service/impl/StreamsFiltersServiceImpl.java Mon Nov 18 22:25:29 2013
@@ -44,7 +44,7 @@ public class StreamsFiltersServiceImpl i
Map<String, List> updateFilters = (Map<String, List>) mapper.readValue(tagsJson, Map.class);
subscriptionRepository.updateFilters(subscriberId, new HashSet<String>(updateFilters.get("add")), new HashSet<String>(updateFilters.get("remove")));
- subscriberWarehouse.getSubscriber(subscriberId).setLastUpdated(new Date(0));
+ subscriberWarehouse.getSubscriber(subscriberId).reset();
subscriberWarehouse.updateSubscriber(subscriptionRepository.getSubscriptionByInRoute(subscriberId));
return "Filters Updated Successfully!";