Changeset 3055

Timestamp:

01/18/12 20:03:08 (4 months ago)

Author:

kasper

Message:

Ticket #749: Ensured serializability of a set of analyzer results.

Location:

AnalyzerBeans/trunk

Files:

• components/writers/src/main/java/org/eobjects/analyzer/beans/writers/WriteDataResultImpl.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/beans/valuedist/ValueCountList.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/beans/valuedist/ValueCountListImpl.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/AnnotatedRowsResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/BooleanAnalyzerResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/DataSetResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/ListResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/PatternFinderResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/SimilarityResult.java (modified) (1 diff)

AnalyzerBeans/trunk/components/writers/src/main/java/org/eobjects/analyzer/beans/writers/WriteDataResultImpl.java

@@ -37 +37 @@
 
         private final int _writtenRowCount;
-        private final Func<DatastoreCatalog, Datastore> _datastoreFunc;
         private final String _schemaName;
         private final String _tableName;
         private final int _errorRowCount;
-        private final FileDatastore _errorDatastore;
+
+        private final transient Func<DatastoreCatalog, Datastore> _datastoreFunc;
+        private final transient FileDatastore _errorDatastore;
 
         public WriteDataResultImpl(final int writtenRowCount,
@@ -117 +118 @@
                 String message = _writtenRowCount + " records written to table";
                 if (_errorRowCount > 0) {
-                        message = message + "\n - WARNING! " + _errorRowCount
-                                        + " record failed, written to file: "
-                                        + _errorDatastore.getFilename();
+                        if (_errorDatastore == null) {
+                                message = message + "\n - WARNING! " + _errorRowCount
+                                                + " record failed";
+                        } else {
+                                message = message + "\n - WARNING! " + _errorRowCount
+                                                + " record failed, written to file: "
+                                                + _errorDatastore.getFilename();
+                        }
                 }
                 return message;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/beans/valuedist/ValueCountList.java

@@ -20 +20 @@
 package org.eobjects.analyzer.beans.valuedist;
 
+import java.io.Serializable;
 import java.util.List;
 
-public interface ValueCountList {
+public interface ValueCountList extends Serializable {
 
         public List<ValueCount> getValueCounts();

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/beans/valuedist/ValueCountListImpl.java

@@ -20 +20 @@
 package org.eobjects.analyzer.beans.valuedist;
 
-import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-public class ValueCountListImpl implements Serializable, ValueCountList {
+public class ValueCountListImpl implements ValueCountList {
 
         private static final long serialVersionUID = 1L;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/AnnotatedRowsResult.java

@@ -48 +48 @@
         private final transient RowAnnotation _annotation;
         private final transient InputColumn<?>[] _highlightedColumns;
-        private transient InputRow[] _rows;;
+        private transient InputRow[] _rows;
 
         private TableModel _tableModel;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/BooleanAnalyzerResult.java

@@ -23 +23 @@
 
         private static final long serialVersionUID = 1L;
-        private Crosstab<Number> _columnStatisticsCrosstab;
-        private Crosstab<Number> _valueCombinationCrosstab;
+        
+        private final Crosstab<Number> _columnStatisticsCrosstab;
+        private final Crosstab<Number> _valueCombinationCrosstab;
 
         public BooleanAnalyzerResult(Crosstab<Number> columnStatisticsCrosstab, Crosstab<Number> valueCombinationCrosstab) {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/DataSetResult.java

@@ -37 +37 @@
         // this class uses a list of rows in order to make it serializable (a
         // DataSet is not serializable)
-        private List<Row> _rows;
+        private final List<Row> _rows;
 
         public DataSetResult(List<Row> rows) {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/ListResult.java

@@ -33 +33 @@
         private static final long serialVersionUID = 1L;
 
-        private List<E> _values;
+        private final List<E> _values;
 
         public ListResult(List<E> values) {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/PatternFinderResult.java

@@ -41 +41 @@
 
         private static final long serialVersionUID = 1L;
+        
         private final InputColumn<String> _column;
         private final InputColumn<String> _groupColumn;

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/result/SimilarityResult.java

@@ -30 +30 @@
         private static final long serialVersionUID = 1L;
 
-        private List<SimilarityGroup> _similarityGroups;
+        private final List<SimilarityGroup> _similarityGroups;
 
         public SimilarityResult(List<SimilarityGroup> similarityGroups) {