Changeset 3103

Timestamp:

01/31/12 22:13:13 (4 months ago)

Author:

kasper

Message:

Ticket #751: Deprecated DataTypeFamily? and replaced it with java types throughout AnalyzerBeans

Location:

AnalyzerBeans/trunk

Files:

• api/src/main/java/org/eobjects/analyzer/data/DataTypeFamily.java (modified) (1 diff)
• api/src/main/java/org/eobjects/analyzer/data/InputColumn.java (modified) (1 diff)
• api/src/test/java/org/eobjects/analyzer/beans/api/DataTypeFamilyTest.java (modified) (1 diff)
• api/src/test/java/org/eobjects/analyzer/data/DataTypeFamilyTest.java (modified) (2 diffs)
• cli/src/main/java/org/eobjects/analyzer/cli/CliRunner.java (modified) (4 diffs)
• cli/src/test/java/org/eobjects/analyzer/cli/MainTest.java (modified) (1 diff)
• components/el/pom.xml (modified) (2 diffs)
• components/el/src/main/java/org/eobjects/analyzer/data/ELInputColumn.java (modified) (4 diffs)
• components/javascript/src/main/java/org/eobjects/analyzer/beans/script/JavaScriptUtils.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/beans/filter/EqualsFilter.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/beans/filter/NullCheckFilter.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/data/AbstractInputColumn.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/data/ConstantInputColumn.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/data/MetaModelInputColumn.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/data/MetaModelInputRow.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/data/MockInputColumn.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/data/TransformedInputColumn.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/descriptors/AnnotationBasedTransformerBeanDescriptor.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptor.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptorImpl.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/descriptors/TransformerBeanDescriptor.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/job/builder/AbstractBeanWithInputColumnsBuilder.java (modified) (4 diffs)
• core/src/main/java/org/eobjects/analyzer/job/builder/AnalysisJobBuilder.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/job/builder/MergedOutcomeJobBuilder.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/job/builder/TransformerJobBuilder.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/util/SourceColumnFinder.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/util/StandardTypeConverter.java (modified) (3 diffs)
• core/src/test/java/org/eobjects/analyzer/beans/datastructures/DataStructuresIntegrationTest.java (modified) (1 diff)
• core/src/test/java/org/eobjects/analyzer/data/MetaModelInputColumnTest.java (modified) (1 diff)
• core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedAnalyzerBeanDescriptorTest.java (modified) (1 diff)
• core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedTransformerBeanDescriptorTest.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptorImplTest.java (modified) (3 diffs)
• core/src/test/java/org/eobjects/analyzer/job/builder/AnalysisJobBuilderTest.java (modified) (3 diffs)
• core/src/test/java/org/eobjects/analyzer/job/builder/TransformerJobBuilderTest.java (modified) (4 diffs)
• core/src/test/java/org/eobjects/analyzer/test/full/scenarios/ValueDistributionAndStringAnalysisTest.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/util/SourceColumnFinderTest.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/util/StringConverterTest.java (modified) (1 diff)

AnalyzerBeans/trunk/api/src/main/java/org/eobjects/analyzer/data/DataTypeFamily.java

@@ -51 +51 @@
  * 
  * @author Kasper SÞrensen
+ * 
+ * @deprecated {@link DataTypeFamily} is no longer sufficient for AnalyzerBeans'
+ *             scope. The full Java type system will be used.
  */
+@Deprecated
 public enum DataTypeFamily {
 

AnalyzerBeans/trunk/api/src/main/java/org/eobjects/analyzer/data/InputColumn.java

@@ -79 +79 @@
          * @return the family of datatypes that matches column's data type. This
          *         value should be corresponding to the type-parameter <E>.
+         * 
+         * @deprecated use {@link #getDataType()} instead.
          */
+        @Deprecated
         public DataTypeFamily getDataTypeFamily();
 }

AnalyzerBeans/trunk/api/src/test/java/org/eobjects/analyzer/beans/api/DataTypeFamilyTest.java

@@ -22 +22 @@
 import java.util.Date;
 
+import junit.framework.TestCase;
+
 import org.eobjects.analyzer.data.DataTypeFamily;
 
-import junit.framework.TestCase;
-
+@SuppressWarnings("deprecation")
 public class DataTypeFamilyTest extends TestCase {
 

AnalyzerBeans/trunk/api/src/test/java/org/eobjects/analyzer/data/DataTypeFamilyTest.java

@@ -24 +24 @@
 import junit.framework.TestCase;
 
+@SuppressWarnings("deprecation")
 public class DataTypeFamilyTest extends TestCase {
 
@@ -35 +36 @@
 
         public void testValueOfClass() throws Exception {
-                assertEquals(DataTypeFamily.BOOLEAN,
-                                DataTypeFamily.valueOf(Boolean.class));
+                assertEquals(DataTypeFamily.BOOLEAN, DataTypeFamily.valueOf(Boolean.class));
                 assertEquals(DataTypeFamily.DATE, DataTypeFamily.valueOf(Date.class));
-                assertEquals(DataTypeFamily.NUMBER,
-                                DataTypeFamily.valueOf(Number.class));
-                assertEquals(DataTypeFamily.NUMBER,
-                                DataTypeFamily.valueOf(Integer.class));
-                assertEquals(DataTypeFamily.NUMBER,
-                                DataTypeFamily.valueOf(Double.class));
-                assertEquals(DataTypeFamily.STRING,
-                                DataTypeFamily.valueOf(String.class));
-                assertEquals(DataTypeFamily.UNDEFINED,
-                                DataTypeFamily.valueOf(Object.class));
-                assertEquals(DataTypeFamily.UNDEFINED,
-                                DataTypeFamily.valueOf(Byte[].class));
+                assertEquals(DataTypeFamily.NUMBER, DataTypeFamily.valueOf(Number.class));
+                assertEquals(DataTypeFamily.NUMBER, DataTypeFamily.valueOf(Integer.class));
+                assertEquals(DataTypeFamily.NUMBER, DataTypeFamily.valueOf(Double.class));
+                assertEquals(DataTypeFamily.STRING, DataTypeFamily.valueOf(String.class));
+                assertEquals(DataTypeFamily.UNDEFINED, DataTypeFamily.valueOf(Object.class));
+                assertEquals(DataTypeFamily.UNDEFINED, DataTypeFamily.valueOf(Byte[].class));
         }
 }

AnalyzerBeans/trunk/cli/src/main/java/org/eobjects/analyzer/cli/CliRunner.java

@@ -45 +45 @@
 import org.eobjects.analyzer.connection.Datastore;
 import org.eobjects.analyzer.connection.DatastoreConnection;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.descriptors.AnalyzerBeanDescriptor;
 import org.eobjects.analyzer.descriptors.BeanDescriptor;
@@ -464 +463 @@
                                 if (propertyForInput != null) {
                                         if (propertyForInput.isArray()) {
-                                                write(" - Consumes multiple input columns (type: " + propertyForInput.getInputColumnDataTypeFamily()
-                                                                + ")");
+                                                write(" - Consumes multiple input columns (type: "
+                                                                + propertyForInput.getTypeArgument(0).getSimpleName() + ")");
                                         } else {
-                                                write(" - Consumes a single input column (type: " + propertyForInput.getInputColumnDataTypeFamily()
-                                                                + ")");
+                                                write(" - Consumes a single input column (type: "
+                                                                + propertyForInput.getTypeArgument(0).getSimpleName() + ")");
                                         }
                                 }
@@ -476 +475 @@
                                         if (propertyForInput.isArray()) {
                                                 write("   Input columns: " + propertyForInput.getName() + " (type: "
-                                                                + propertyForInput.getInputColumnDataTypeFamily() + ")");
+                                                                + propertyForInput.getTypeArgument(0).getSimpleName() + ")");
                                         } else {
                                                 write("   Input column: " + propertyForInput.getName() + " (type: "
-                                                                + propertyForInput.getInputColumnDataTypeFamily() + ")");
+                                                                + propertyForInput.getTypeArgument(0).getSimpleName() + ")");
                                         }
                                 }
@@ -493 +492 @@
 
                         if (descriptor instanceof TransformerBeanDescriptor<?>) {
-                                DataTypeFamily dataTypeFamily = ((TransformerBeanDescriptor<?>) descriptor).getOutputDataTypeFamily();
-                                write(" - Output type is: " + dataTypeFamily);
+                                Class<?> dataType = ((TransformerBeanDescriptor<?>) descriptor).getOutputDataType();
+                                write(" - Output type is: " + dataType.getSimpleName());
                         }
 

AnalyzerBeans/trunk/cli/src/test/java/org/eobjects/analyzer/cli/MainTest.java

@@ -148 +148 @@
 
                 assertTrue(out.indexOf("name: Email standardizer") != -1);
-                assertTrue(out.indexOf("Output type is: STRING") != -1);
+                assertTrue(out.indexOf("Output type is: String") != -1);
         }
 

AnalyzerBeans/trunk/components/el/pom.xml

@@ -1 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
         <modelVersion>4.0.0</modelVersion>
         <parent>
@@ -16 +17 @@
                 <dependency>
                         <groupId>de.odysseus.juel</groupId>
-                        <artifactId>juel</artifactId>
-                        <version>2.1.3</version>
+                        <artifactId>juel-impl</artifactId>
+                        <version>2.2.4</version>
+                        <exclusions>
+                                <exclusion>
+                                        <groupId>de.odysseus.juel</groupId>
+                                        <artifactId>juel-api</artifactId>
+                                </exclusion>
+                        </exclusions>
+                </dependency>
+                <dependency>
+                        <groupId>javax.el</groupId>
+                        <artifactId>javax.el-api</artifactId>
+                        <version>2.2.4</version>
                 </dependency>
         </dependencies>

AnalyzerBeans/trunk/components/el/src/main/java/org/eobjects/analyzer/data/ELInputColumn.java

@@ -44 +44 @@
         private static final long serialVersionUID = 1L;
 
-        private static final Logger logger = LoggerFactory.getLogger(ELInputColumn.class);
+        private static final Logger logger = LoggerFactory
+                        .getLogger(ELInputColumn.class);
 
         private final ExpressionFactory _factory;
@@ -61 +62 @@
                         if (!(inputColumn instanceof ExpressionBasedInputColumn)) {
                                 Object value = row.getValue(inputColumn);
-                                Class<?> javaType = inputColumn.getDataTypeFamily().getJavaType();
-                                ValueExpression valueExpression = _factory.createValueExpression(value, javaType);
+                                Class<?> javaType = inputColumn.getDataType();
+                                ValueExpression valueExpression = _factory
+                                                .createValueExpression(value, javaType);
                                 String variableName = inputColumn.getName();
-                                variableName = StringUtils.replaceWhitespaces(variableName, "_");
+                                variableName = StringUtils
+                                                .replaceWhitespaces(variableName, "_");
                                 context.setVariable(variableName, valueExpression);
                         }
@@ -70 +73 @@
 
                 try {
-                        ValueExpression valueExpression = _factory.createValueExpression(context, _expression, String.class);
+                        ValueExpression valueExpression = _factory.createValueExpression(
+                                        context, _expression, String.class);
                         return (String) valueExpression.getValue(context);
                 } catch (ELException e) {
@@ -83 +87 @@
         }
 
+        @SuppressWarnings("deprecation")
         @Override
-        public DataTypeFamily getDataTypeFamily() {
-                return DataTypeFamily.STRING;
+        public org.eobjects.analyzer.data.DataTypeFamily getDataTypeFamily() {
+                return org.eobjects.analyzer.data.DataTypeFamily.STRING;
         }
 
+        @Override
+        public Class<? extends String> getDataType() {
+                return String.class;
+        }
 }

AnalyzerBeans/trunk/components/javascript/src/main/java/org/eobjects/analyzer/beans/script/JavaScriptUtils.java

@@ -20 +20 @@
 package org.eobjects.analyzer.beans.script;
 
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.InputRow;
+import org.eobjects.analyzer.util.ReflectionUtils;
 import org.mozilla.javascript.Context;
 import org.mozilla.javascript.NativeArray;
@@ -69 +69 @@
 
                         if (value != null) {
-                                if (column.getDataTypeFamily() == DataTypeFamily.NUMBER) {
+                                Class<?> dataType = column.getDataType();
+                                if (ReflectionUtils.isNumber(dataType)) {
                                         value = Context.toNumber(value);
-                                } else if (column.getDataTypeFamily() == DataTypeFamily.BOOLEAN) {
+                                } else if (ReflectionUtils.isBoolean(dataType)) {
                                         value = Context.toBoolean(value);
                                 }

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/beans/filter/EqualsFilter.java

@@ -32 +32 @@
 import org.eobjects.analyzer.beans.convert.ConvertToNumberTransformer;
 import org.eobjects.analyzer.beans.convert.ConvertToStringTransformer;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.InputRow;
+import org.eobjects.analyzer.util.ReflectionUtils;
 import org.eobjects.metamodel.query.FilterItem;
 import org.eobjects.metamodel.query.OperatorType;
@@ -72 +72 @@
         @Initialize
         public void init() {
-                DataTypeFamily dataTypeFamily = column.getDataTypeFamily();
+                Class<?> dataType = column.getDataType();
                 operands = new Object[values.length];
                 for (int i = 0; i < values.length; i++) {
                         final String value = values[i];
                         final Object operand;
-                        if (dataTypeFamily == DataTypeFamily.BOOLEAN) {
+                        if (ReflectionUtils.isBoolean(dataType)) {
                                 operand = ConvertToBooleanTransformer.transformValue(value, ConvertToBooleanTransformer.DEFAULT_TRUE_TOKENS,
                                                 ConvertToBooleanTransformer.DEFAULT_FALSE_TOKENS);
-                        } else if (dataTypeFamily == DataTypeFamily.DATE) {
+                        } else if (ReflectionUtils.isDate(dataType)) {
                                 operand = ConvertToDateTransformer.getInternalInstance().transformValue(value);
-                        } else if (dataTypeFamily == DataTypeFamily.NUMBER) {
+                        } else if (ReflectionUtils.isNumber(dataType)) {
                                 operand = ConvertToNumberTransformer.transformValue(value);
                                 number = true;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/beans/filter/NullCheckFilter.java

@@ -28 +28 @@
 import org.eobjects.analyzer.beans.api.FilterBean;
 import org.eobjects.analyzer.beans.api.QueryOptimizedFilter;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.InputRow;
@@ -82 +81 @@
                                 Column column = col.getPhysicalColumn();
                                 q.where(column, OperatorType.DIFFERENT_FROM, null);
-                                if (considerEmptyStringAsNull && col.getDataTypeFamily() == DataTypeFamily.STRING) {
+                                if (considerEmptyStringAsNull && col.getDataType() == String.class) {
                                         q.where(column, OperatorType.DIFFERENT_FROM, "");
                                 }
@@ -95 +94 @@
                                 FilterItem fi1 = new FilterItem(selectItem, OperatorType.EQUALS_TO, null);
                                 filterItems.add(fi1);
-                                if (considerEmptyStringAsNull && col.getDataTypeFamily() == DataTypeFamily.STRING) {
+                                if (considerEmptyStringAsNull && col.getDataType() == String.class) {
                                         FilterItem fi2 = new FilterItem(selectItem, OperatorType.EQUALS_TO, "");
                                         filterItems.add(fi2);

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/AbstractInputColumn.java

@@ -36 +36 @@
         }
 
-        @SuppressWarnings("unchecked")
-        @Override
-        public Class<? extends E> getDataType() {
-                return (Class<? extends E>) getDataTypeFamily().getJavaType();
-        }
-
         @Override
         public Column getPhysicalColumn() throws IllegalStateException {
@@ -76 +70 @@
                 if (obj.getClass() == this.getClass()) {
                         AbstractInputColumn<?> that = (AbstractInputColumn<?>) obj;
-                        if (that.getDataTypeFamily() == this.getDataTypeFamily()) {
+                        if (that.getDataType() == this.getDataType()) {
                                 if (that.isPhysicalColumn() == this.isPhysicalColumn()) {
                                         return equalsInternal(that);

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/ConstantInputColumn.java

@@ -31 +31 @@
  */
 public final class ConstantInputColumn extends AbstractExpressionBasedInputColumn<String> {
-        
+
         private static final long serialVersionUID = 1L;
 
@@ -49 +49 @@
         }
 
+        @SuppressWarnings("deprecation")
         @Override
-        public DataTypeFamily getDataTypeFamily() {
-                return DataTypeFamily.STRING;
+        public org.eobjects.analyzer.data.DataTypeFamily getDataTypeFamily() {
+                return org.eobjects.analyzer.data.DataTypeFamily.STRING;
         }
 
@@ -58 +59 @@
                 return _value;
         }
+
+        @Override
+        public Class<? extends String> getDataType() {
+                return String.class;
+        }
 }

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/MetaModelInputColumn.java

@@ -89 +89 @@
 
         @Override
+        @SuppressWarnings("deprecation")
         public DataTypeFamily getDataTypeFamily() {
                 ColumnType type = _column.getType();

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/MetaModelInputRow.java

@@ -22 +22 @@
 import java.util.ArrayList;
 import java.util.List;
-
-import org.eobjects.analyzer.beans.convert.ConvertToBooleanTransformer;
-import org.eobjects.analyzer.beans.convert.ConvertToDateTransformer;
-import org.eobjects.analyzer.beans.convert.ConvertToNumberTransformer;
-import org.eobjects.analyzer.beans.convert.ConvertToStringTransformer;
 
 import org.eobjects.metamodel.data.Row;
@@ -79 +74 @@
                 Column physicalColumn = column.getPhysicalColumn();
                 Object value = _row.getValue(physicalColumn);
-
-                DataTypeFamily dataTypeFamily = column.getDataTypeFamily();
-                switch (dataTypeFamily) {
-                case DATE:
-                        value = ConvertToDateTransformer.getInternalInstance().transformValue(value);
-                        break;
-                case BOOLEAN:
-                        value = ConvertToBooleanTransformer.transformValue(value, ConvertToBooleanTransformer.DEFAULT_TRUE_TOKENS,
-                                        ConvertToBooleanTransformer.DEFAULT_FALSE_TOKENS);
-                        break;
-                case NUMBER:
-                        value = ConvertToNumberTransformer.transformValue(value);
-                        break;
-                case STRING:
-                        value = ConvertToStringTransformer.transformValue(value);
-                        break;
-                }
-
+                
                 return (E) value;
         }

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/MockInputColumn.java

@@ -31 +31 @@
  */
 public class MockInputColumn<E> extends AbstractInputColumn<E> {
-        
+
         private static final long serialVersionUID = 1L;
 
@@ -52 +52 @@
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public DataTypeFamily getDataTypeFamily() {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/data/TransformedInputColumn.java

@@ -38 +38 @@
 
         private final String _id;
-        private DataTypeFamily _dataTypeFamily;
         private Class<?> _dataType;
         private String _name;
@@ -77 +76 @@
         }
 
-        public void setDataTypeFamily(DataTypeFamily dataTypeFamily) {
-                _dataTypeFamily = dataTypeFamily;
-        }
-
         @Override
         public boolean isPhysicalColumn() {
@@ -91 +86 @@
         }
 
+        @SuppressWarnings("deprecation")
         @Override
         public DataTypeFamily getDataTypeFamily() {
-                return _dataTypeFamily;
+                return DataTypeFamily.valueOf(_dataType);
         }
 

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/descriptors/AnnotationBasedTransformerBeanDescriptor.java

@@ -22 +22 @@
 import org.eobjects.analyzer.beans.api.Transformer;
 import org.eobjects.analyzer.beans.api.TransformerBean;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.util.ReflectionUtils;
 
 final class AnnotationBasedTransformerBeanDescriptor<T extends Transformer<?>> extends AbstractBeanDescriptor<T> implements
                 TransformerBeanDescriptor<T> {
-        
+
         private static final long serialVersionUID = 1L;
 
@@ -59 +58 @@
 
         @Override
-        public DataTypeFamily getOutputDataTypeFamily() {
+        public Class<?> getOutputDataType() {
                 Class<?> typeParameter = ReflectionUtils.getTypeParameter(getComponentClass(), Transformer.class, 0);
-                if (typeParameter == null) {
-                        throw new IllegalStateException("Could not determine Transformer's output data type");
-                }
-                return DataTypeFamily.valueOf(typeParameter);
+                return typeParameter;
+        }
 
-                // Type[] interfaces = getComponentClass().getGenericInterfaces();
-                // for (Type type : interfaces) {
-                // if (type instanceof ParameterizedType) {
-                // ParameterizedType pType = (ParameterizedType) type;
-                // if (pType.getRawType() == Transformer.class) {
-                // Class<?> typeParameter = ReflectionUtils.getTypeParameter(pType, 0);
-                // return DataTypeFamily.valueOf(typeParameter);
-                // }
-                // }
-                // }
-                // return DataTypeFamily.UNDEFINED;
+        @Override
+        @SuppressWarnings("deprecation")
+        public org.eobjects.analyzer.data.DataTypeFamily getOutputDataTypeFamily() {
+                Class<?> outputDataType = getOutputDataType();
+                return org.eobjects.analyzer.data.DataTypeFamily.valueOf(outputDataType);
         }
 }

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptor.java

@@ -23 +23 @@
 import org.eobjects.analyzer.beans.api.Convertable;
 import org.eobjects.analyzer.beans.api.Converter;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.util.HasAliases;
 
@@ -52 +51 @@
 
         /**
-         * Gets the {@link DataTypeFamily} of the configured property, if it is an
-         * input column type property (see {@link #isInputColumn()})
+         * Gets the {@link org.eobjects.analyzer.data.DataTypeFamily} of the
+         * configured property, if it is an input column type property (see
+         * {@link #isInputColumn()})
          * 
          * @return
+         * 
+         * @deprecated use {@link #getType()} and {@link #getTypeArgument(int)}
+         *             instead
          */
-        public DataTypeFamily getInputColumnDataTypeFamily();
+        @Deprecated
+        public org.eobjects.analyzer.data.DataTypeFamily getInputColumnDataTypeFamily();
 
         /**

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptorImpl.java

@@ -28 +28 @@
 import org.eobjects.analyzer.beans.api.Converter;
 import org.eobjects.analyzer.beans.api.Description;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.util.ReflectionUtils;
 
@@ -78 +77 @@
         }
 
+        @SuppressWarnings("deprecation")
         @Override
-        public DataTypeFamily getInputColumnDataTypeFamily() {
+        public org.eobjects.analyzer.data.DataTypeFamily getInputColumnDataTypeFamily() {
                 if (isInputColumn()) {
                         int count = getTypeArgumentCount();
                         if (count == 0) {
-                                return DataTypeFamily.UNDEFINED;
+                                return org.eobjects.analyzer.data.DataTypeFamily.UNDEFINED;
                         }
                         Type typeArgument = getTypeArgument(0);
-                        return DataTypeFamily.valueOf(typeArgument);
+                        return org.eobjects.analyzer.data.DataTypeFamily.valueOf(typeArgument);
                 }
                 return null;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/descriptors/TransformerBeanDescriptor.java

@@ -21 +21 @@
 
 import org.eobjects.analyzer.beans.api.Transformer;
-import org.eobjects.analyzer.data.DataTypeFamily;
 
 /**
@@ -33 +32 @@
 
         /**
-         * Gets the output data's {@link DataTypeFamily}.
+         * Gets the output data's {@link org.eobjects.analyzer.data.DataTypeFamily}.
          * 
-         * @return a {@link DataTypeFamily} value that represents the data type of
-         *         this transformer bean's output.
+         * @return a {@link org.eobjects.analyzer.data.DataTypeFamily} value that
+         *         represents the data type of this transformer bean's output.
+         * 
+         * @deprecated use {@link #getOutputDataType()} instead.
          */
-        public DataTypeFamily getOutputDataTypeFamily();
-        
+        @Deprecated
+        public org.eobjects.analyzer.data.DataTypeFamily getOutputDataTypeFamily();
+
+        /**
+         * Gets the output data's default data type. Note that individual output
+         * columns of the transformer can override this data type.
+         * 
+         * @return the default data type of the transformed columns.
+         */
+        public Class<?> getOutputDataType();
+
 }

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

@@ -28 +28 @@
 import java.util.Set;
 
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.descriptors.BeanDescriptor;
@@ -37 +36 @@
 import org.eobjects.analyzer.job.OutcomeSourceJob;
 import org.eobjects.analyzer.util.CollectionUtils2;
+import org.eobjects.analyzer.util.ReflectionUtils;
 import org.eobjects.metamodel.util.CollectionUtils;
 
@@ -86 +86 @@
         // delegate to
         public B addInputColumn(InputColumn<?> inputColumn, ConfiguredPropertyDescriptor propertyDescriptor) {
-                DataTypeFamily expectedDataTypeFamily = propertyDescriptor.getInputColumnDataTypeFamily();
-                if (expectedDataTypeFamily != DataTypeFamily.UNDEFINED) {
-                        DataTypeFamily actualDataTypeFamily = inputColumn.getDataTypeFamily();
-                        if (expectedDataTypeFamily != actualDataTypeFamily) {
-                                throw new IllegalArgumentException("Unsupported InputColumn type: " + actualDataTypeFamily + ", expected: "
-                                                + expectedDataTypeFamily);
+                if (propertyDescriptor == null || !propertyDescriptor.isInputColumn()) {
+                        throw new IllegalArgumentException("Property is not of InputColumn type: " + propertyDescriptor);
+                }
+
+                final Class<?> expectedDataType = propertyDescriptor.getTypeArgument(0);
+                if (expectedDataType != null && expectedDataType != Object.class) {
+                        // check input column type parameter compatibility
+                        final Class<?> actualDataType = inputColumn.getDataType();
+                        if (!ReflectionUtils.is(actualDataType, expectedDataType, false)) {
+                                throw new IllegalArgumentException("Unsupported InputColumn type: " + actualDataType + ", expected: "
+                                                + expectedDataType);
                         }
                 }
@@ -200 +205 @@
                         return true;
                 }
-                
+
                 return validateRequirementCandidate(outcomes[0]);
         }

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

@@ -34 +34 @@
 import org.eobjects.analyzer.connection.Datastore;
 import org.eobjects.analyzer.connection.DatastoreConnection;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.MetaModelInputColumn;
@@ -500 +499 @@
          *            the {@link DataTypeFamily} to search for
          * @return a list of matching InputColumns.
-         */
-        public List<InputColumn<?>> getAvailableInputColumns(DataTypeFamily dataTypeFamily) {
+         * @deprecated use {@link #getAvailableInputColumns(Class)} instead
+         */
+        @Deprecated
+        public List<InputColumn<?>> getAvailableInputColumns(org.eobjects.analyzer.data.DataTypeFamily dataTypeFamily) {
                 return getAvailableInputColumns(dataTypeFamily, null);
         }
@@ -509 +510 @@
          * given data type specification.
          * 
+         * @param dataType
+         *            the data type to look for
+         * @return a list of matching input columns
+         */
+        public List<InputColumn<?>> getAvailableInputColumns(Class<?> dataType) {
+                return getAvailableInputColumns(null, dataType);
+        }
+
+        /**
+         * Finds the available input columns (source or transformed) that match the
+         * given data type specification.
+         * 
          * @param dataTypeFamily
-         *            the {@link DataTypeFamily} to search for
+         *            the {@link org.eobjects.analyzer.data.DataTypeFamily} to
+         *            search for
          * @param dataType
          *            optionally a concrete type to look for, if the
-         *            {@link DataTypeFamily} is null or
-         *            {@link DataTypeFamily#UNDEFINED}.
+         *            {@link org.eobjects.analyzer.data.DataTypeFamily} is null or
+         *            {@link org.eobjects.analyzer.data.DataTypeFamily#UNDEFINED}.
          * @return a list of matching InputColumns.
-         */
-        public List<InputColumn<?>> getAvailableInputColumns(DataTypeFamily dataTypeFamily, Class<?> dataType) {
+         * 
+         * @deprecated use {@link #getAvailableInputColumns(Class)} instead
+         */
+        @Deprecated
+        public List<InputColumn<?>> getAvailableInputColumns(org.eobjects.analyzer.data.DataTypeFamily dataTypeFamily,
+                        Class<?> dataType) {
                 SourceColumnFinder finder = new SourceColumnFinder();
                 finder.addSources(this);

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/job/builder/MergedOutcomeJobBuilder.java

@@ -122 +122 @@
                                         InputColumn<?> inputColumn = inputColumns.get(i);
                                         TransformedInputColumn<Object> outputColumn = new TransformedInputColumn<Object>("Merged column " + (i + 1), _idGenerator);
-                                        outputColumn.setDataTypeFamily(inputColumn.getDataTypeFamily());
                                         outputColumn.setDataType(inputColumn.getDataType());
                                         _outputColumns.add(outputColumn);

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/job/builder/TransformerJobBuilder.java

@@ -28 +28 @@
 import org.eobjects.analyzer.configuration.InjectionManager;
 import org.eobjects.analyzer.configuration.InjectionManagerImpl;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.MutableInputColumn;
@@ -126 +125 @@
                         Class<?> dataType = outputColumns.getColumnType(i);
                         if (dataType == null) {
-                                dataType = descriptor.getOutputDataTypeFamily().getJavaType();
-                        }
-                        DataTypeFamily dataTypeFamily = DataTypeFamily.valueOf(dataType);
+                                dataType = descriptor.getOutputDataType();
+                        }
 
                         TransformedInputColumn<?> col = (TransformedInputColumn<?>) _outputColumns.get(i);
@@ -134 +132 @@
                         if (dataType != col.getDataType()) {
                                 col.setDataType(dataType);
-                                changed = true;
-                        }
-                        if (dataTypeFamily != col.getDataTypeFamily()) {
-                                col.setDataTypeFamily(dataTypeFamily);
                                 changed = true;
                         }

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/util/SourceColumnFinder.java

@@ -27 +27 @@
 import java.util.TreeSet;
 
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.ExpressionBasedInputColumn;
 import org.eobjects.analyzer.data.InputColumn;
@@ -91 +90 @@
         }
 
-        public List<InputColumn<?>> findInputColumns(DataTypeFamily dataTypeFamily, Class<?> dataType) {
+        public List<InputColumn<?>> findInputColumns(Class<?> dataType) {
+                return findInputColumns(null, dataType);
+        }
+
+        /**
+         * @deprecated use {@link #findInputColumns(Class)} instead.
+         */
+        @Deprecated
+        public List<InputColumn<?>> findInputColumns(org.eobjects.analyzer.data.DataTypeFamily dataTypeFamily, Class<?> dataType) {
                 if (dataTypeFamily == null) {
-                        dataTypeFamily = DataTypeFamily.UNDEFINED;
+                        dataTypeFamily = org.eobjects.analyzer.data.DataTypeFamily.UNDEFINED;
                 }
 
@@ -100 +107 @@
                         InputColumn<?>[] outputColumns = source.getOutput();
                         for (InputColumn<?> col : outputColumns) {
-                                final DataTypeFamily columnFamily = col.getDataTypeFamily();
-                                if (columnFamily == dataTypeFamily || dataTypeFamily == DataTypeFamily.UNDEFINED) {
+                                final org.eobjects.analyzer.data.DataTypeFamily columnFamily = col.getDataTypeFamily();
+                                if (columnFamily == dataTypeFamily || dataTypeFamily == org.eobjects.analyzer.data.DataTypeFamily.UNDEFINED) {
                                         final Class<?> columnDataType = col.getDataType();
                                         if (dataType == null || columnDataType == null) {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/util/StandardTypeConverter.java

@@ -108 +108 @@
                         return Float.valueOf(str);
                 }
+                if (ReflectionUtils.is(type, Class.class)) {
+                        try {
+                                return Class.forName(str);
+                        } catch (ClassNotFoundException e) {
+                                throw new IllegalArgumentException("Class not found: " + str, e);
+                        }
+                }
                 if (type.isEnum()) {
                         try {
@@ -154 +161 @@
                         ChangeAwareObjectInputStream objectInputStream = null;
                         try {
-                                objectInputStream = new ChangeAwareObjectInputStream(new ByteArrayInputStream(
-                                                bytes));
+                                objectInputStream = new ChangeAwareObjectInputStream(new ByteArrayInputStream(bytes));
                                 objectInputStream.addClassLoader(type.getClassLoader());
                                 Object obj = objectInputStream.readObject();
@@ -192 +198 @@
                 } else if (o instanceof Enum) {
                         return ((Enum<?>) o).name();
+                } else if (o instanceof Class) {
+                        result = ((Class<?>) o).getName();
                 } else if (o instanceof Serializable) {
                         logger.info("toString(...): No built-in handling of type: {}, using serialization.", o.getClass().getName());

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/beans/datastructures/DataStructuresIntegrationTest.java

@@ -83 +83 @@
                 }
 
-                assertSame(1, ajb.getAvailableInputColumns(null, Map.class).size());
-                assertSame(mapColumn, ajb.getAvailableInputColumns(null, Map.class).get(0));
-                assertSame(1, ajb.getAvailableInputColumns(null, List.class).size());
-                assertSame(listColumn, ajb.getAvailableInputColumns(null, List.class).get(0));
+                assertSame(1, ajb.getAvailableInputColumns(Map.class).size());
+                assertSame(mapColumn, ajb.getAvailableInputColumns(Map.class).get(0));
+                assertSame(1, ajb.getAvailableInputColumns(List.class).size());
+                assertSame(listColumn, ajb.getAvailableInputColumns(List.class).get(0));
 
                 final MutableInputColumn<?> elementColumn;

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/data/MetaModelInputColumnTest.java

@@ -26 +26 @@
 public class MetaModelInputColumnTest extends TestCase {
 
+        @SuppressWarnings("deprecation")
         public void testGetDataTypeFamily() throws Exception {
                 assertEquals(DataTypeFamily.STRING,

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedAnalyzerBeanDescriptorTest.java

@@ -36 +36 @@
 import org.eobjects.analyzer.result.AnalyzerResult;
 
+@SuppressWarnings("deprecation")
 public class AnnotationBasedAnalyzerBeanDescriptorTest extends TestCase {
 

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedTransformerBeanDescriptorTest.java

@@ -22 +22 @@
 import java.util.Set;
 
+import junit.framework.TestCase;
+
 import org.eobjects.analyzer.beans.api.OutputRowCollector;
 import org.eobjects.analyzer.beans.convert.ConvertToNumberTransformer;
@@ -30 +32 @@
 import org.eobjects.analyzer.job.tasks.MockMultiRowTransformer;
 
-import junit.framework.TestCase;
-
+@SuppressWarnings("deprecation")
 public class AnnotationBasedTransformerBeanDescriptorTest extends TestCase {
 

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptorImplTest.java

@@ -49 +49 @@
         InputColumn<byte[]> someBytes;
 
+        @Configured
+        InputColumn<String>[] stringColumns;
+
         @Override
         protected void setUp() throws Exception {
@@ -55 +58 @@
         }
 
-        public void testGetTypeParameterOfArrayType() throws Exception {
+        public void testGetTypeParameterOfArrayType1() throws Exception {
                 ConfiguredPropertyDescriptor descriptor = new ConfiguredPropertyDescriptorImpl(getClass().getDeclaredField(
                                 "someBytes"), null);
@@ -61 +64 @@
                 Class<?> typeArgument = descriptor.getTypeArgument(0);
                 assertEquals(byte[].class, typeArgument);
+        }
+
+        public void testGetTypeParameterOfArrayType2() throws Exception {
+                ConfiguredPropertyDescriptor descriptor = new ConfiguredPropertyDescriptorImpl(getClass().getDeclaredField(
+                                "stringColumns"), null);
+                assertEquals(1, descriptor.getTypeArgumentCount());
+                Class<?> typeArgument = descriptor.getTypeArgument(0);
+                assertEquals(String.class, typeArgument);
         }
 

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/job/builder/AnalysisJobBuilderTest.java

@@ -47 +47 @@
 import org.eobjects.analyzer.connection.DatastoreConnection;
 import org.eobjects.analyzer.connection.JdbcDatastore;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.MetaModelInputColumn;
@@ -147 +146 @@
                                 .addTransformer(ConvertToStringTransformer.class);
 
-                Collection<InputColumn<?>> numberColumns = analysisJobBuilder.getAvailableInputColumns(DataTypeFamily.NUMBER, null);
+                Collection<InputColumn<?>> numberColumns = analysisJobBuilder.getAvailableInputColumns(Number.class);
                 assertEquals(1, numberColumns.size());
                 assertEquals("[MetaModelInputColumn[PUBLIC.EMPLOYEES.EMPLOYEENUMBER]]", Arrays.toString(numberColumns.toArray()));
@@ -159 +158 @@
                 AnalyzerJobBuilder<StringAnalyzer> analyzerJobBuilder = analysisJobBuilder.addAnalyzer(StringAnalyzer.class);
 
-                List<InputColumn<?>> stringInputColumns = analysisJobBuilder.getAvailableInputColumns(DataTypeFamily.STRING, null);
+                List<InputColumn<?>> stringInputColumns = analysisJobBuilder.getAvailableInputColumns(String.class);
                 Set<String> columnNames = new TreeSet<String>();
                 for (InputColumn<?> inputColumn : stringInputColumns) {

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/job/builder/TransformerJobBuilderTest.java

@@ -20 +20 @@
 package org.eobjects.analyzer.job.builder;
 
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -33 +34 @@
 import org.eobjects.analyzer.configuration.AnalyzerBeansConfigurationImpl;
 import org.eobjects.analyzer.data.ConstantInputColumn;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.MockInputColumn;
@@ -116 +116 @@
 
         public void testGetAvailableInputColumns() throws Exception {
-                assertEquals(2, ajb.getAvailableInputColumns(DataTypeFamily.UNDEFINED, null).size());
-                assertEquals(2, ajb.getAvailableInputColumns(null, null).size());
-                assertEquals(1, ajb.getAvailableInputColumns(DataTypeFamily.STRING, null).size());
-                assertEquals(0, ajb.getAvailableInputColumns(DataTypeFamily.DATE, null).size());
+                assertEquals(2, ajb.getAvailableInputColumns(Object.class).size());
+                assertEquals(2, ajb.getAvailableInputColumns((Class<?>) null).size());
+                assertEquals(1, ajb.getAvailableInputColumns(String.class).size());
+                assertEquals(0, ajb.getAvailableInputColumns(Date.class).size());
         }
 
@@ -130 +130 @@
                         fail("Exception expected");
                 } catch (IllegalArgumentException e) {
-                        assertEquals("Unsupported InputColumn type: NUMBER, expected: STRING", e.getMessage());
+                        assertEquals("Unsupported InputColumn type: class java.lang.Integer, expected: class java.lang.String", e.getMessage());
                 }
                 assertFalse(tjb.isConfigured());

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/test/full/scenarios/ValueDistributionAndStringAnalysisTest.java

@@ -31 +31 @@
 import org.eobjects.analyzer.connection.DatastoreConnection;
 import org.eobjects.analyzer.connection.JdbcDatastore;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.InputRow;
@@ -88 +87 @@
 
                 AnalyzerJobBuilder<StringAnalyzer> stringAnalyzerJob = analysisJobBuilder.addAnalyzer(StringAnalyzer.class);
-                stringAnalyzerJob.addInputColumns(analysisJobBuilder.getAvailableInputColumns(DataTypeFamily.STRING, null));
+                stringAnalyzerJob.addInputColumns(analysisJobBuilder.getAvailableInputColumns(String.class));
 
                 AnalysisJob analysisJob = analysisJobBuilder.toAnalysisJob();

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/util/SourceColumnFinderTest.java

@@ -27 +27 @@
 import org.eobjects.analyzer.customcolumn.MockConvertToMonthObjectTransformer;
 import org.eobjects.analyzer.customcolumn.Month;
-import org.eobjects.analyzer.data.DataTypeFamily;
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.MockInputColumn;
@@ -40 +39 @@
                 analysisJobBuilder.addTransformer(MockConvertToMonthObjectTransformer.class).addInputColumn(new MockInputColumn<String>("month", String.class));
                 columnFinder.addSources(analysisJobBuilder);
-                List<InputColumn<?>> findInputColumns = columnFinder.findInputColumns(DataTypeFamily.UNDEFINED, Month.class);
+                List<InputColumn<?>> findInputColumns = columnFinder.findInputColumns(Month.class);
                 assertEquals(1, findInputColumns.size());
         }

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/util/StringConverterTest.java

@@ -90 +90 @@
                 runTests((short) 12, "12");
                 runTests((byte) 12, "12");
+                runTests(String.class, "java.lang.String");
                 runTests(1337.0, "1337.0");
                 runTests(1337.0f, "1337.0");