Changeset 975 for AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/AnalysisJobBuilder.java

Timestamp:

08/14/10 12:37:00 (22 months ago)

Author:

kasper

Message:

Made descriptors more type-safe by adding type parameter for bean type.

File:

• AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/AnalysisJobBuilder.java (modified) (11 diffs)

AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/AnalysisJobBuilder.java

@@ -25 +25 @@
         private DataContextProvider _dataContextProvider;
         private List<MetaModelInputColumn> _sourceColumns = new ArrayList<MetaModelInputColumn>();
-        private List<TransformerJobBuilder> _transformerJobBuilders = new ArrayList<TransformerJobBuilder>();
-        private List<RowProcessingAnalyzerJobBuilder> _analyzerJobBuilders = new ArrayList<RowProcessingAnalyzerJobBuilder>();
+        private List<TransformerJobBuilder<?>> _transformerJobBuilders = new ArrayList<TransformerJobBuilder<?>>();
+        private List<RowProcessingAnalyzerJobBuilder<?>> _analyzerJobBuilders = new ArrayList<RowProcessingAnalyzerJobBuilder<?>>();
         private IdGenerator transformedColumnIdGenerator = new PrefixedIdGenerator(
                         "trans");
@@ -110 +110 @@
         }
 
-        public TransformerJobBuilder addTransformer(
-                        Class<? extends Transformer<?>> transformerClass) {
-                TransformerBeanDescriptor descriptor = _configuration
+        public <T extends Transformer<?>> TransformerJobBuilder<T> addTransformer(
+                        Class<T> transformerClass) {
+                TransformerBeanDescriptor<T> descriptor = _configuration
                                 .getDescriptorProvider().getTransformerBeanDescriptorForClass(
                                                 transformerClass);
@@ -122 +122 @@
         }
 
-        public List<TransformerJobBuilder> getTransformerJobBuilders() {
+        public List<TransformerJobBuilder<?>> getTransformerJobBuilders() {
                 return Collections.unmodifiableList(_transformerJobBuilders);
         }
 
-        public TransformerJobBuilder addTransformer(
-                        TransformerBeanDescriptor descriptor) {
-                TransformerJobBuilder transformerJobBuilder = new TransformerJobBuilder(
+        public <T extends Transformer<?>> TransformerJobBuilder<T> addTransformer(
+                        TransformerBeanDescriptor<T> descriptor) {
+                TransformerJobBuilder<T> transformerJobBuilder = new TransformerJobBuilder<T>(
                                 descriptor, transformedColumnIdGenerator);
                 _transformerJobBuilders.add(transformerJobBuilder);
@@ -134 +134 @@
         }
 
-        public AnalysisJobBuilder removeTransformer(TransformerJobBuilder tjb) {
+        public AnalysisJobBuilder removeTransformer(TransformerJobBuilder<?> tjb) {
                 _transformerJobBuilders.remove(tjb);
                 return this;
         }
 
-        public List<RowProcessingAnalyzerJobBuilder> getAnalyzerJobBuilders() {
+        public List<RowProcessingAnalyzerJobBuilder<?>> getAnalyzerJobBuilders() {
                 return Collections.unmodifiableList(_analyzerJobBuilders);
         }
 
-        public RowProcessingAnalyzerJobBuilder addAnalyzer(
-                        Class<? extends RowProcessingAnalyzer<?>> analyzerClass) {
-                AnalyzerBeanDescriptor descriptor = _configuration
+        public <A extends RowProcessingAnalyzer<?>> RowProcessingAnalyzerJobBuilder<A> addAnalyzer(
+                        Class<A> analyzerClass) {
+                AnalyzerBeanDescriptor<A> descriptor = _configuration
                                 .getDescriptorProvider().getAnalyzerBeanDescriptorForClass(
                                                 analyzerClass);
@@ -152 +152 @@
                                         + analyzerClass);
                 }
-                RowProcessingAnalyzerJobBuilder analyzerJobBuilder = new RowProcessingAnalyzerJobBuilder(
+                RowProcessingAnalyzerJobBuilder<A> analyzerJobBuilder = new RowProcessingAnalyzerJobBuilder<A>(
                                 descriptor);
                 _analyzerJobBuilders.add(analyzerJobBuilder);
@@ -158 +158 @@
         }
 
-        public AnalysisJobBuilder removeAnalyzer(RowProcessingAnalyzerJobBuilder ajb) {
+        public AnalysisJobBuilder removeAnalyzer(
+                        RowProcessingAnalyzerJobBuilder<?> ajb) {
                 _analyzerJobBuilders.remove(ajb);
                 return this;
@@ -178 +179 @@
                 }
 
-                for (TransformerJobBuilder transformerJobBuilder : _transformerJobBuilders) {
+                for (TransformerJobBuilder<?> transformerJobBuilder : _transformerJobBuilders) {
                         List<MutableInputColumn<?>> outputColumns = transformerJobBuilder
                                         .getOutputColumns();
@@ -205 +206 @@
                 }
 
-                for (TransformerJobBuilder tjb : _transformerJobBuilders) {
+                for (TransformerJobBuilder<?> tjb : _transformerJobBuilders) {
                         if (!tjb.isConfigured()) {
                                 return false;
@@ -211 +212 @@
                 }
 
-                for (RowProcessingAnalyzerJobBuilder ajb : _analyzerJobBuilders) {
+                for (RowProcessingAnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
                         if (!ajb.isConfigured()) {
                                 return false;
@@ -227 +228 @@
 
                 Collection<TransformerJob> transformerJobs = new LinkedList<TransformerJob>();
-                for (TransformerJobBuilder tjb : _transformerJobBuilders) {
+                for (TransformerJobBuilder<?> tjb : _transformerJobBuilders) {
                         try {
                                 TransformerJob transformerJob = tjb.toTransformerJob();
@@ -239 +240 @@
 
                 Collection<AnalyzerJob> analyzerJobs = new LinkedList<AnalyzerJob>();
-                for (RowProcessingAnalyzerJobBuilder ajb : _analyzerJobBuilders) {
+                for (RowProcessingAnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
                         try {
                                 AnalyzerJob analyzerJob = ajb.toAnalyzerJob();