xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2692 Fixed non-notification of adhoc's due to incorrect lookup of subscription.

Browse source 
Former-commit-id: 339245a534bf2da5071536e959086d5e4f7b2bf0
This commit is contained in:
Dave Hladky 2014-01-14 15:25:25 -06:00
parent eb96c396c2
commit fee9c183f9
12 changed files with 80 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/ncf/MonolithicBandwidthManagerCreator.java
View file

@ -21,6 +21,7 @@ package com.raytheon.uf.edex.datadelivery.bandwidth.ncf;
import com.raytheon.uf.common.datadelivery.registry.Coverage;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -49,6 +50,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* ------------ ---------- ----------- --------------------------
* Nov 13, 2013 2545 bgonzale Initial creation
* Dec 04, 2013 2566 bgonzale use bandwidthmanager method to retrieve spring files.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -81,9 +83,10 @@ public class MonolithicBandwidthManagerCreator<T extends Time, C extends Coverag
BandwidthDaoUtil<T, C> bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}
@ -103,10 +106,11 @@ public class MonolithicBandwidthManagerCreator<T extends Time, C extends Coverag
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
return new MonolithicBandwidthManager(dbInit, bandwidthDao,
retrievalManager,
bandwidthDaoUtil, dataSetMetaDataHandler, subscriptionHandler,
bandwidthDaoUtil, dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}

8
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/ncf/NcfBandwidthManagerCreator.java
View file

@ -29,6 +29,7 @@ import com.raytheon.uf.common.datadelivery.registry.Coverage;
import com.raytheon.uf.common.datadelivery.registry.DataDeliveryRegistryObjectTypes;
import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -62,6 +63,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Nov 19, 2013 2545 bgonzale Added registryEventListener method for update events.
* Reschedule updated shared subscriptions.
* Dec 04, 2013 2566 bgonzale use bandwidthmanager method to retrieve spring files.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -92,9 +94,10 @@ public class NcfBandwidthManagerCreator<T extends Time, C extends Coverage> impl
BandwidthDaoUtil<T, C> bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}
@ -151,9 +154,10 @@ public class NcfBandwidthManagerCreator<T extends Time, C extends Coverage> impl
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
return new NcfBandwidthManager(dbInit, bandwidthDao, retrievalManager,
bandwidthDaoUtil, dataSetMetaDataHandler, subscriptionHandler,
bandwidthDaoUtil, dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}

1
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
View file

@ -48,6 +48,7 @@
<!-- Registry handlers required for EdexBandwidthManager -->
<constructor-arg ref="DataSetMetaDataHandler" />
<constructor-arg ref="SubscriptionHandler" />
<constructor-arg ref="AdhocSubscriptionHandler" />
<constructor-arg ref="subscriptionNotificationService" />
</bean>
</beans>

6
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
View file

@ -134,6 +134,7 @@ import com.raytheon.uf.edex.registry.ebxml.exception.EbxmlRegistryException;
* Dec 17, 2013 2636 bgonzale Changed logging to differentiate the output.
* Jan 08, 2014 2615 bgonzale getMostRecent checks subscription time constraints before scheduling.
* handlePoint method now schedules most recent.
* Jan 14, 2014 2692 dhladky Bad Point scheduling final Empty list.
*
* </pre>
*
@ -614,9 +615,8 @@ public abstract class BandwidthManager<T extends Time, C extends Coverage>
*/
private List<BandwidthAllocation> handlePoint(
Subscription<T, C> subscription) {
List<BandwidthAllocation> unscheduled = Collections.emptyList();
unscheduled.addAll(schedule(subscription,
((PointTime) subscription.getTime()).getInterval()));
List<BandwidthAllocation> unscheduled = schedule(subscription,
((PointTime) subscription.getTime()).getInterval());
unscheduled.addAll(getMostRecent(subscription, false));
return unscheduled;
}

12
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthContextFactory.java
View file

@ -23,6 +23,7 @@ import java.io.File;
import com.raytheon.uf.common.datadelivery.registry.Coverage;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -55,6 +56,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Jul 10, 2013 2106 djohnson Dependency inject registry handlers.
* Oct 03, 2013 1797 dhladky Some generics
* Nov 07, 2013 2506 bgonzale Added notification handler to bandwidth context.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -85,6 +87,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
BandwidthDaoUtil<T, C> bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService notificationService);
}
@ -103,6 +106,8 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
private final IDataSetMetaDataHandler dataSetMetaDataHandler;
private final ISubscriptionHandler subscriptionHandler;
private final IAdhocSubscriptionHandler adhocSubscriptionHandler;
private final ISubscriptionNotificationService notificationService;
@ -117,6 +122,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
* @param dbInit
* @param dataSetMetaDataHandler
* @param subscriptionHandler
* @param adhocSubscriptionHandler
* @param notificationService
*/
EdexBandwidthContextFactory(IBandwidthDao<T, C> bandwidthDao,
@ -126,6 +132,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
IBandwidthDbInit dbInit,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService notificationService) {
this.bandwidthDao = bandwidthDao;
this.bandwidthBucketDao = bandwidthBucketDao;
@ -134,6 +141,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
this.dbInit = dbInit;
this.dataSetMetaDataHandler = dataSetMetaDataHandler;
this.subscriptionHandler = subscriptionHandler;
this.adhocSubscriptionHandler = adhocSubscriptionHandler;
this.notificationService = notificationService;
}
@ -147,7 +155,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
* the {@link BandwidthManager} instance
*/
EdexBandwidthContextFactory(EdexBandwidthManager<T, C> instance) {
this(null, null, null, null, null, null, null, null);
this(null, null, null, null, null, null, null, null, null);
EdexBandwidthContextFactory.instance = instance;
}
@ -239,7 +247,7 @@ public class EdexBandwidthContextFactory<T extends Time, C extends Coverage> imp
BandwidthDaoUtil bandwidthDaoUtil) {
return bandwidthManagerCreator.getBandwidthManager(dbInit,
bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
notificationService);
}
}

34
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
View file

@ -52,6 +52,7 @@ import com.raytheon.uf.common.datadelivery.registry.PointTime;
import com.raytheon.uf.common.datadelivery.registry.SiteSubscription;
import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -110,6 +111,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthUtil;
* Nov 15, 2013 2545 bgonzale Added check for subscription events before sending
* notifications. Republish dataset metadata registry
* insert and update events as dataset metadata events.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -125,6 +127,8 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
private final IDataSetMetaDataHandler dataSetMetaDataHandler;
private final ISubscriptionHandler subscriptionHandler;
private final IAdhocSubscriptionHandler adhocSubscriptionHandler;
private final ScheduledExecutorService scheduler;
@ -158,12 +162,14 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
BandwidthDaoUtil<T, C> bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil);
this.dataSetMetaDataHandler = dataSetMetaDataHandler;
this.subscriptionHandler = subscriptionHandler;
this.subscriptionNotificationService = subscriptionNotificationService;
this.adhocSubscriptionHandler = adhocSubscriptionHandler;
// schedule maintenance tasks
scheduler = Executors.newScheduledThreadPool(1);
@ -228,6 +234,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
* @param subscription
* The completed subscription.
*/
@SuppressWarnings("unchecked")
@Subscribe
public void subscriptionFulfilled(
SubscriptionRetrievalFulfilled subscriptionRetrievalFulfilled) {
@ -260,14 +267,23 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
// Schedule the next iteration of the subscription
BandwidthSubscription dao = sr.getBandwidthSubscription();
Subscription<T, C> subscription;
try {
// recurring site subscription
subscription = subscriptionHandler.getByName(dao.getName());
if (subscription == null) {
StringBuilder sb = new StringBuilder("Subscription: ");
sb.append(dao.getName());
sb.append(" Not Found in Subscription Handler.");
throw new RegistryHandlerException(sb.toString());
// not recurring, try an adhoc subscription
subscription = adhocSubscriptionHandler.getByName(dao
.getName());
// still doesn't work, punt!
if (subscription == null) {
StringBuilder sb = new StringBuilder("Subscription: ");
sb.append(dao.getName());
sb.append(" Not Found in Subscription Handler.");
throw new RegistryHandlerException(sb.toString());
}
}
} catch (RegistryHandlerException e1) {
statusHandler.handle(Priority.PROBLEM,
@ -277,6 +293,8 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
// AdhocSubscriptions are one and done, so don't reschedule.
if (subscription instanceof AdhocSubscription) {
statusHandler.info("Adhoc Subscription ["
+ subscription.getName() + "] complete.");
return;
}
@ -321,6 +339,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
*
* @param event
*/
@SuppressWarnings("unchecked")
@Subscribe
@AllowConcurrentEvents
public void subscriptionRemoved(RemoveRegistryEvent event) {
@ -356,6 +375,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
* @param re
* The <code>InsertRegistryEvent</code> Object to evaluate.
*/
@SuppressWarnings("unchecked")
@Subscribe
@AllowConcurrentEvents
public void registryEventListener(InsertRegistryEvent re) {
@ -418,7 +438,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
private void publishDataSetMetaDataEvent(RegistryEvent re) {
final String id = re.getId();
DataSetMetaData dsmd = getDataSetMetaData(id);
DataSetMetaData<?> dsmd = getDataSetMetaData(id);
if (dsmd != null) {
// Repost the Object to the BandwidthEventBus to free
@ -442,6 +462,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
}
}
@SuppressWarnings("unchecked")
private DataSetMetaData<T> getDataSetMetaData(String id) {
return getRegistryObjectById(dataSetMetaDataHandler, id);
}
@ -739,7 +760,6 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
final SubscriptionRetrievalAttributes<T, C> sra = bandwidthDao
.getSubscriptionRetrievalAttributes(retrieval);
if (sra != null) {
@SuppressWarnings("unchecked")
Subscription<T, C> sub = sra.getSubscription();
if (sub != null) {
subscriptions.add(sub);
@ -768,7 +788,7 @@ public abstract class EdexBandwidthManager<T extends Time, C extends Coverage>
* the datasetmetadata update
* @return the subscription
*/
@SuppressWarnings("rawtypes")
@SuppressWarnings({ "rawtypes", "unchecked" })
private static Subscription updateSubscriptionWithDataSetMetaData(
Subscription sub, DataSetMetaData dataSetMetaData) {
// TODO perfect candidate for the factory for time and coverage

8
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/WfoBandwidthManagerCreator.java
View file

@ -32,6 +32,7 @@ import com.raytheon.uf.common.datadelivery.registry.Coverage;
import com.raytheon.uf.common.datadelivery.registry.DataDeliveryRegistryObjectTypes;
import com.raytheon.uf.common.datadelivery.registry.Subscription;
import com.raytheon.uf.common.datadelivery.registry.Time;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -65,6 +66,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Reschedule updated local subscriptions.
* Nov 27, 2013 2545 mpduff Get data by network
* Dec 04, 2013 2566 bgonzale use bandwidthmanager method to retrieve spring files.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -101,9 +103,10 @@ public class WfoBandwidthManagerCreator<T extends Time, C extends Coverage>
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}
@ -192,9 +195,10 @@ public class WfoBandwidthManagerCreator<T extends Time, C extends Coverage>
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
return new WfoBandwidthManager<T, C>(dbInit, bandwidthDao,
retrievalManager, bandwidthDaoUtil, dataSetMetaDataHandler,
subscriptionHandler, subscriptionNotificationService);
subscriptionHandler, adhocSubscriptionHandler, subscriptionNotificationService);
}
}

7
tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestBandwidthContextFactory.java
View file

@ -21,6 +21,7 @@ package com.raytheon.uf.edex.datadelivery.bandwidth;
import java.io.File;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -71,11 +72,13 @@ public class IntegrationTestBandwidthContextFactory extends
IBandwidthDbInit dbInit,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService notificationService) {
super(bandwidthDao, bandwidthBucketsDao,
new IntegrationTestBandwidthInitializer(),
bandwidthManagerCreator, dbInit, dataSetMetaDataHandler,
subscriptionHandler, notificationService);
subscriptionHandler, adhocSubscriptionHandler, notificationService);
}
/**
@ -93,6 +96,6 @@ public class IntegrationTestBandwidthContextFactory extends
*/
public static File getIntegrationTestBandwidthMapConfigFile() {
return new IntegrationTestBandwidthContextFactory(null, null, null,
null, null, null, null).getBandwidthMapConfigFile();
null, null, null, null, null).getBandwidthMapConfigFile();
}
}

5
tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestWfoBandwidthManager.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.uf.edex.datadelivery.bandwidth;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -45,6 +46,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* May 15, 2013 2000 djohnson Include daos.
* Jul 10, 2013 2106 djohnson Dependency inject registry handlers.
* Nov 08, 2013 2506 bgonzale Added notification service to bandwidth manager.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -74,9 +76,10 @@ public class IntegrationTestWfoBandwidthManager extends WfoBandwidthManager {
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}

5
tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/IntegrationTestWfoBandwidthManagerCreator.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.uf.edex.datadelivery.bandwidth;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -40,6 +41,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Feb 20, 2013 1543 djohnson Initial creation
* Jul 10, 2013 2106 djohnson Dependency inject registry handlers.
* Nov 08, 2013 2506 bgonzale Added notification service to bandwidth manager.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -58,9 +60,10 @@ public class IntegrationTestWfoBandwidthManagerCreator implements
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
return new IntegrationTestWfoBandwidthManager(dbInit, bandwidthDao,
retrievalManager, bandwidthDaoUtil, dataSetMetaDataHandler,
subscriptionHandler, subscriptionNotificationService);
subscriptionHandler, adhocSubscriptionHandler, subscriptionNotificationService);
}
}

5
tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/ncf/IntegrationTestNcfBandwidthManager.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.uf.edex.datadelivery.bandwidth.ncf;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -45,6 +46,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Feb 27, 2013 1644 djohnson Extend NCF bandwidth manager.
* Jul 10, 2013 2106 djohnson Dependency inject registry handlers.
* Nov 08, 2013 2506 bgonzale Added notification service to bandwidth manager.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -74,9 +76,10 @@ public class IntegrationTestNcfBandwidthManager extends NcfBandwidthManager {
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
super(dbInit, bandwidthDao, retrievalManager, bandwidthDaoUtil,
dataSetMetaDataHandler, subscriptionHandler,
dataSetMetaDataHandler, subscriptionHandler, adhocSubscriptionHandler,
subscriptionNotificationService);
}

5
tests/integration/com/raytheon/uf/edex/datadelivery/bandwidth/ncf/IntegrationTestNcfBandwidthManagerCreator.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.uf.edex.datadelivery.bandwidth.ncf;
import com.raytheon.uf.common.datadelivery.registry.handlers.IAdhocSubscriptionHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.IDataSetMetaDataHandler;
import com.raytheon.uf.common.datadelivery.registry.handlers.ISubscriptionHandler;
import com.raytheon.uf.common.datadelivery.service.ISubscriptionNotificationService;
@ -41,6 +42,7 @@ import com.raytheon.uf.edex.datadelivery.bandwidth.util.BandwidthDaoUtil;
* Feb 20, 2013 1543 djohnson Initial creation
* Jul 10, 2013 2106 djohnson Dependency inject registry handlers.
* Nov 08, 2013 2506 bgonzale Added notification service to bandwidth manager.
* Jan 14, 2014 2692 dhladky AdhocSubscription handler
*
* </pre>
*
@ -59,9 +61,10 @@ public class IntegrationTestNcfBandwidthManagerCreator implements
BandwidthDaoUtil bandwidthDaoUtil,
IDataSetMetaDataHandler dataSetMetaDataHandler,
ISubscriptionHandler subscriptionHandler,
IAdhocSubscriptionHandler adhocSubscriptionHandler,
ISubscriptionNotificationService subscriptionNotificationService) {
return new IntegrationTestNcfBandwidthManager(dbInit, bandwidthDao,
retrievalManager, bandwidthDaoUtil, dataSetMetaDataHandler,
subscriptionHandler, subscriptionNotificationService);
subscriptionHandler, adhocSubscriptionHandler, subscriptionNotificationService);
}
}