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

Timestamp:

08/28/10 12:54:10 (21 months ago)

Author:

kasper

Message:

Ticket #382: First draft - needs more testing and marshalling

File:

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

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

@@ -7 +7 @@
 import java.util.List;
 
+import org.eobjects.analyzer.beans.ExploringAnalyzer;
 import org.eobjects.analyzer.beans.RowProcessingAnalyzer;
 import org.eobjects.analyzer.beans.Transformer;
@@ -26 +27 @@
         private List<MetaModelInputColumn> _sourceColumns = new ArrayList<MetaModelInputColumn>();
         private List<TransformerJobBuilder<?>> _transformerJobBuilders = new ArrayList<TransformerJobBuilder<?>>();
-        private List<RowProcessingAnalyzerJobBuilder<?>> _analyzerJobBuilders = new ArrayList<RowProcessingAnalyzerJobBuilder<?>>();
+        private List<AnalyzerJobBuilder<?>> _analyzerJobBuilders = new ArrayList<AnalyzerJobBuilder<?>>();
         private IdGenerator transformedColumnIdGenerator = new PrefixedIdGenerator(
                         "trans");
@@ -139 +140 @@
         }
 
-        public List<RowProcessingAnalyzerJobBuilder<?>> getAnalyzerJobBuilders() {
+        public List<AnalyzerJobBuilder<?>> getAnalyzerJobBuilders() {
                 return Collections.unmodifiableList(_analyzerJobBuilders);
         }
 
-        public <A extends RowProcessingAnalyzer<?>> RowProcessingAnalyzerJobBuilder<A> addAnalyzer(
+        public <A extends ExploringAnalyzer<?>> ExploringAnalyzerJobBuilder<A> addExploringAnalyzer(
+                        Class<A> analyzerClass) {
+                AnalyzerBeanDescriptor<A> descriptor = _configuration
+                                .getDescriptorProvider().getAnalyzerBeanDescriptorForClass(
+                                                analyzerClass);
+                if (descriptor == null) {
+                        throw new IllegalArgumentException("No descriptor found for: "
+                                        + analyzerClass);
+                }
+                ExploringAnalyzerJobBuilder<A> analyzerJobBuilder = new ExploringAnalyzerJobBuilder<A>(
+                                descriptor);
+                _analyzerJobBuilders.add(analyzerJobBuilder);
+                return analyzerJobBuilder;
+        }
+
+        public <A extends RowProcessingAnalyzer<?>> RowProcessingAnalyzerJobBuilder<A> addRowProcessingAnalyzer(
                         Class<A> analyzerClass) {
                 AnalyzerBeanDescriptor<A> descriptor = _configuration
@@ -212 +228 @@
                 }
 
-                for (RowProcessingAnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
+                for (AnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
                         if (!ajb.isConfigured()) {
                                 return false;
@@ -240 +256 @@
 
                 Collection<AnalyzerJob> analyzerJobs = new LinkedList<AnalyzerJob>();
-                for (RowProcessingAnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
+                for (AnalyzerJobBuilder<?> ajb : _analyzerJobBuilders) {
                         try {
                                 AnalyzerJob analyzerJob = ajb.toAnalyzerJob();