Changeset 3049

Timestamp:

01/17/12 16:18:55 (4 months ago)

Author:

kasper

Message:

Improved handling and matching of column types

Files:

• AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/util/ReflectionUtils.java (modified) (3 diffs)
• AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/util/SourceColumnFinder.java (modified) (1 diff)
• AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/descriptors/ConfiguredPropertyDescriptorImplTest.java (modified) (1 diff)
• DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/panels/MetadataPanel.java (modified) (4 diffs)

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

@@ -23 +23 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;
@@ -77 +78 @@
                 if (thisType instanceof Class<?>) {
                         thisClass = (Class<?>) thisType;
-                        if (includeArray && thisClass.isArray()) {
+                        if (includeArray && thisClass.isArray() && !ofThatType.isArray()) {
                                 thisClass = thisClass.getComponentType();
                         }
@@ -302 +303 @@
                         GenericArrayType gaType = (GenericArrayType) someType;
                         someType = gaType.getGenericComponentType();
+                        return Array.newInstance((Class<?>) someType, 0).getClass();
                 }
 

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

@@ -100 +100 @@
                         InputColumn<?>[] outputColumns = source.getOutput();
                         for (InputColumn<?> col : outputColumns) {
-                                DataTypeFamily dtf = col.getDataTypeFamily();
-                                if (dtf == dataTypeFamily || dataTypeFamily == DataTypeFamily.UNDEFINED) {
-                                        if (dataType == null || col.getDataType() == null) {
+                                final DataTypeFamily columnFamily = col.getDataTypeFamily();
+                                if (columnFamily == dataTypeFamily || dataTypeFamily == DataTypeFamily.UNDEFINED) {
+                                        final Class<?> columnDataType = col.getDataType();
+                                        if (dataType == null || columnDataType == null) {
                                                 result.add(col);
                                         } else {
-                                                if (ReflectionUtils.is(col.getDataType(), dataType)) {
+                                                if (ReflectionUtils.is(columnDataType, dataType)) {
                                                         result.add(col);
                                                 }

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

@@ -46 +46 @@
         String str2;
 
+        @Configured
+        InputColumn<byte[]> someBytes;
+
         @Override
         protected void setUp() throws Exception {
                 super.setUp();
                 _descriptor = Descriptors.ofFilter(MockFilter.class);
+        }
+
+        public void testGetTypeParameterOfArrayType() throws Exception {
+                ConfiguredPropertyDescriptor descriptor = new ConfiguredPropertyDescriptorImpl(getClass().getDeclaredField(
+                                "someBytes"), null);
+                assertEquals(1, descriptor.getTypeArgumentCount());
+                Class<?> typeArgument = descriptor.getTypeArgument(0);
+                assertEquals(byte[].class, typeArgument);
         }
 

DataCleaner/trunk/core/src/main/java/org/eobjects/datacleaner/panels/MetadataPanel.java

@@ -43 +43 @@
         private static final long serialVersionUID = 1L;
 
-        private static final String[] columnNames = new String[] { "Table", "Column", "Type", "Native type", "Size",
-                        "Nullable?", "Indexed?" };
+        private static final String[] COLUMN_NAMES = new String[] { "Table", "Column", "Type family", "Type", "Native type",
+                        "Size", "Nullable?", "Indexed?" };
 
         private final AnalysisJobBuilder _analysisJobBuilder;
-        private final DCTable _table;;
+        private final DCTable _table;
 
         @Inject
@@ -56 +56 @@
                 _analysisJobBuilder.getSourceColumnListeners().add(this);
 
-                _table = new DCTable(columnNames);
-                _table.setAlignment(5, Alignment.CENTER);
+                _table = new DCTable(COLUMN_NAMES);
+                _table.setAlignment(5, Alignment.RIGHT);
                 _table.setAlignment(6, Alignment.CENTER);
+                _table.setAlignment(7, Alignment.CENTER);
 
                 setLayout(new BorderLayout());
@@ -72 +73 @@
                 final Icon validIcon = ImageManager.getInstance().getImageIcon(IconUtils.STATUS_VALID, IconUtils.ICON_SIZE_SMALL);
 
-                DefaultTableModel model = new DefaultTableModel(columnNames, sourceColumns.size());
+                final DefaultTableModel model = new DefaultTableModel(COLUMN_NAMES, sourceColumns.size());
 
                 int i = 0;
@@ -80 +81 @@
                         model.setValueAt(column.getName(), i, 1);
                         model.setValueAt(inputColumn.getDataTypeFamily(), i, 2);
-                        model.setValueAt(column.getNativeType(), i, 3);
-                        model.setValueAt(column.getColumnSize(), i, 4);
+                        model.setValueAt(column.getType(), i, 3);
+                        model.setValueAt(column.getNativeType(), i, 4);
+                        model.setValueAt(column.getColumnSize(), i, 5);
 
                         Boolean nullable = column.isNullable();
                         if (nullable != null && nullable.booleanValue()) {
-                                model.setValueAt(validIcon, i, 5);
+                                model.setValueAt(validIcon, i, 6);
                         } else {
-                                model.setValueAt("", i, 5);
+                                model.setValueAt("", i, 6);
                         }
 
                         boolean indexed = column.isIndexed();
                         if (indexed) {
-                                model.setValueAt(validIcon, i, 6);
+                                model.setValueAt(validIcon, i, 7);
                         } else {
-                                model.setValueAt("", i, 6);
+                                model.setValueAt("", i, 7);
                         }