=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/LinearNodePipeline.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/LinearNodePipeline.java 2014-06-26 05:19:55 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/LinearNodePipeline.java 2014-11-20 09:36:25 +0000 @@ -28,8 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE */ -import com.google.common.collect.Lists; - +import java.util.ArrayList; import java.util.List; import static com.google.common.base.Preconditions.checkNotNull; @@ -44,23 +43,28 @@ private class NodeTransformerWithArgs { NodeTransformer transformer; - List args; + List arguments; - private NodeTransformerWithArgs( NodeTransformer transformer, List args ) + NodeTransformerWithArgs( NodeTransformer transformer, List arguments ) { this.transformer = transformer; - this.args = args; + this.arguments = arguments; + } + + Node transform( Node node ) + { + return transformer.transform( node, arguments ); } } - private List nodeTransformers = Lists.newArrayList(); + private List nodeTransformers = new ArrayList<>(); @Override public Node process( Node node ) { - for ( NodeTransformerWithArgs nodeTransformerWithArgs : nodeTransformers ) + for ( NodeTransformerWithArgs nodeTransformer : nodeTransformers ) { - node = nodeTransformerWithArgs.transformer.transform( node, nodeTransformerWithArgs.args ); + node = nodeTransformer.transform( node ); if ( node == null ) { @@ -73,11 +77,11 @@ public void addTransformer( NodeTransformer nodeTransformer ) { - nodeTransformers.add( new NodeTransformerWithArgs( checkNotNull( nodeTransformer ), Lists.newArrayList() ) ); + nodeTransformers.add( new NodeTransformerWithArgs( checkNotNull( nodeTransformer ), new ArrayList() ) ); } - public void addTransformer( NodeTransformer nodeTransformer, List args ) + public void addTransformer( NodeTransformer nodeTransformer, List arguments ) { - nodeTransformers.add( new NodeTransformerWithArgs( checkNotNull( nodeTransformer ), args ) ); + nodeTransformers.add( new NodeTransformerWithArgs( checkNotNull( nodeTransformer ), arguments ) ); } }