From a6e9ecdc68b3709449f50644ef46d813e624728e Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 1 May 2017 13:05:00 +0100
Subject: [PATCH] Remove redundant intermediate abstract bean

The waitingForPipelines property is already set in all instances.
---
 mdx/common-beans.xml | 4 ----
 mdx/uk/generate.xml  | 8 ++++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 9a541410..450d780e 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -166,10 +166,6 @@
         <property name="serializer" ref="serializer"/>
     </bean>
 
-    <bean id="PipelineDemultiplexerStage" abstract="true" parent="mda.PipelineDemultiplexerStage"
-        p:waitingForPipelines="true"
-    />
-
     <bean id="PipelineMergeStage.deduplicate" abstract="true" parent="mda.PipelineMergeStage"
         p:collectionMergeStrategy-ref="deduplicateMergeStrategy"/>
 
diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index b20d2305..a4b48785 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -850,7 +850,7 @@
                 <!--
                     Fork a new output pipeline for the registrar statistics.
                 -->
-                <bean id="rawRegistrarDemux" parent="PipelineDemultiplexerStage">
+                <bean id="rawRegistrarDemux" parent="mda.PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -890,7 +890,7 @@
                     metadata as closely as possible, so the fork must happen before
                     too many UK-specific transformations are performed.
                 -->
-                <bean id="registrarDemux" parent="PipelineDemultiplexerStage">
+                <bean id="registrarDemux" parent="mda.PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -952,7 +952,7 @@
                 <!--
                     Fork into new pipelines for the production, fallback and WAYF aggregates.
                 -->
-                <bean id="productionDemux" parent="PipelineDemultiplexerStage">
+                <bean id="productionDemux" parent="mda.PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">
@@ -1007,7 +1007,7 @@
                 <!--
                     Fork into new pipelines for additional aggregates.
                 -->
-                <bean id="preProductionDemux" parent="PipelineDemultiplexerStage">
+                <bean id="preProductionDemux" parent="mda.PipelineDemultiplexerStage">
                     <property name="pipelineAndSelectionStrategies">
                         <list>
                             <bean class="net.shibboleth.utilities.java.support.collection.Pair">