Changeset 976 for AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/job/AbstractBeanWithInputColumnsBuilder.java

Timestamp:

08/14/10 15:10:12 (22 months ago)

Author:

kasper

Message:

Made it possible to configure jobs using "configurable bean" acting as a prototype for actual executed beans

File:

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

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

@@ -1 +1 @@
 package org.eobjects.analyzer.job;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.eobjects.analyzer.data.DataTypeFamily;
@@ -12 +11 @@
 import org.eobjects.analyzer.descriptors.BeanDescriptor;
 import org.eobjects.analyzer.descriptors.ConfiguredPropertyDescriptor;
+import org.eobjects.analyzer.util.CollectionUtils;
 
 @SuppressWarnings("unchecked")
 class AbstractBeanWithInputColumnsBuilder<D extends BeanDescriptor<E>, E, B>
                 extends AbstractBeanJobBuilder<D, E, B> {
-
-        private List<InputColumn<?>> _inputColumns = new ArrayList<InputColumn<?>>();
 
         public AbstractBeanWithInputColumnsBuilder(D descriptor,
@@ -44 +42 @@
                         }
                 }
-                _inputColumns.add(inputColumn);
+
+                ConfiguredPropertyDescriptor configuredPropertyForInput = getDescriptor()
+                                .getConfiguredPropertyForInput();
+                Object inputColumns = configuredPropertyForInput
+                                .getValue(getConfigurableBean());
+                if (inputColumns == null) {
+                        if (configuredPropertyForInput.isArray()) {
+                                inputColumns = new InputColumn[] { inputColumn };
+                        } else {
+                                inputColumns = inputColumn;
+                        }
+                } else {
+                        inputColumns = CollectionUtils.array(InputColumn.class, inputColumns, inputColumn);
+                }
+                configuredPropertyForInput
+                                .setValue(getConfigurableBean(), inputColumns);
+
                 return (B) this;
         }
@@ -63 +77 @@
 
         public B removeInputColumn(InputColumn<?> inputColumn) {
-                _inputColumns.remove(inputColumn);
-                // TODO: Notify consumers
+                ConfiguredPropertyDescriptor configuredPropertyForInput = getDescriptor()
+                                .getConfiguredPropertyForInput();
+                Object inputColumns = configuredPropertyForInput
+                                .getValue(getConfigurableBean());
+                if (inputColumns != null) {
+                        if (inputColumns == inputColumn) {
+                                inputColumns = null;
+                        } else {
+                                if (inputColumns.getClass().isArray()) {
+                                        inputColumns = CollectionUtils.arrayRemove(inputColumns,
+                                                        inputColumn);
+                                }
+                        }
+                        configuredPropertyForInput.setValue(getConfigurableBean(),
+                                        inputColumns);
+                }
                 return (B) this;
         }
 
         public List<InputColumn<?>> getInputColumns() {
-                return Collections.unmodifiableList(_inputColumns);
-        }
-
-        public boolean isConfigured() {
-                if (_inputColumns.isEmpty()) {
-                        // no input given
-                        return false;
-                }
-
-                if (!super.isConfigured()) {
-                        return false;
-                }
-
                 ConfiguredPropertyDescriptor configuredPropertyForInput = getDescriptor()
                                 .getConfiguredPropertyForInput();
-                if (!configuredPropertyForInput.isArray()) {
-                        if (_inputColumns.size() != 1) {
-                                // exactly one input column is required
-                                return false;
+                Object inputColumns = configuredPropertyForInput
+                                .getValue(getConfigurableBean());
+                if (inputColumns == null) {
+                        return Collections.emptyList();
+                }
+                List<InputColumn<?>> result;
+                if (inputColumns.getClass().isArray()) {
+                        int length = Array.getLength(inputColumns);
+                        result = new ArrayList<InputColumn<?>>(length);
+                        for (int i = 0; i < length; i++) {
+                                result.add((InputColumn<?>) Array.get(inputColumns, i));
                         }
+                } else {
+                        result = new ArrayList<InputColumn<?>>(1);
+                        result.add((InputColumn<?>) inputColumns);
                 }
-                return true;
-        }
-
-        @Override
-        public Map<ConfiguredPropertyDescriptor, Object> getConfiguredProperties() {
-                Map<ConfiguredPropertyDescriptor, Object> properties = new HashMap<ConfiguredPropertyDescriptor, Object>(
-                                super.getConfiguredProperties());
-
-                // explicitly add the input columns (because they are handled as a
-                // separate variable in this builder
-                List<InputColumn<?>> inputColumns = getInputColumns();
-                properties.put(getDescriptor().getConfiguredPropertyForInput(),
-                                inputColumns.toArray(new InputColumn<?>[inputColumns.size()]));
-
-                return Collections.unmodifiableMap(properties);
+                return Collections.unmodifiableList(result);
         }
 }