Changeset 3072

Timestamp:

01/19/12 20:04:44 (4 months ago)

Author:

kasper

Message:

Made sure AnnotatedRowsResult? is Serializable

Location:

AnalyzerBeans/trunk

Files:

• api/src/main/java/org/eobjects/analyzer/data/InputRow.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/data/AbstractInputRow.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/data/MetaModelInputRow.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/data/MockInputRow.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/data/TransformedInputRow.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/AnnotatedRowsResult.java (modified) (6 diffs)
• core/src/main/java/org/eobjects/analyzer/result/CrosstabResult.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/result/DefaultResultProducer.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/storage/RowAnnotation.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/storage/RowAnnotationImpl.java (modified) (1 diff)
• core/src/test/java/org/eobjects/analyzer/result/AnnotatedRowResultTest.java (added)

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

@@ -20 +20 @@
 package org.eobjects.analyzer.data;
 
+import java.io.Serializable;
 import java.util.List;
 
@@ -39 +40 @@
  * @author Kasper SÞrensen
  */
-public interface InputRow {
+public interface InputRow extends Serializable {
 
         /**

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

@@ -27 +27 @@
 public abstract class AbstractInputRow implements InputRow {
 
+        private static final long serialVersionUID = 1L;
+
         @Override
         public final <E> E getValue(InputColumn<E> column) {

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

@@ -33 +33 @@
 
 public final class MetaModelInputRow extends AbstractInputRow {
+
+        private static final long serialVersionUID = 1L;
 
         private final Row _row;

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

@@ -35 +35 @@
 public class MockInputRow extends AbstractInputRow {
 
+        private static final long serialVersionUID = 1L;
+
         private static final AtomicInteger _idGenerator = new AtomicInteger(Integer.MIN_VALUE);
 
@@ -68 +70 @@
                 return new ArrayList<InputColumn<?>>(_values.keySet());
         }
-        
+
         @Override
         public boolean containsInputColumn(InputColumn<?> inputColumn) {

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

@@ -36 +36 @@
 public final class TransformedInputRow extends AbstractInputRow {
 
+        private static final long serialVersionUID = 1L;
+
         private static final Logger logger = LoggerFactory.getLogger(TransformedInputRow.class);
+        
         private final InputRow _delegate;
         private final Map<InputColumn<?>, Object> _values;

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

@@ -32 +32 @@
 import org.eobjects.analyzer.data.InputColumn;
 import org.eobjects.analyzer.data.InputRow;
+import org.eobjects.analyzer.storage.InMemoryRowAnnotationFactory;
 import org.eobjects.analyzer.storage.RowAnnotation;
 import org.eobjects.analyzer.storage.RowAnnotationFactory;
@@ -46 +47 @@
 
         private final transient RowAnnotationFactory _annotationFactory;
-        private final transient RowAnnotation _annotation;
-        private final transient InputColumn<?>[] _highlightedColumns;
-        private transient InputRow[] _rows;
 
+        private final InputColumn<?>[] _highlightedColumns;
+        private final RowAnnotation _annotation;
+        private InputRow[] _rows;
         private TableModel _tableModel;
         private List<InputColumn<?>> _inputColumns;
@@ -58 +59 @@
                 _annotation = annotation;
                 _highlightedColumns = highlightedColumns;
+        }
+
+        private RowAnnotationFactory getAnnotationFactory() {
+                if (_annotationFactory == null) {
+                        // only occurs for deserialized instances
+                        return new InMemoryRowAnnotationFactory();
+                }
+                return _annotationFactory;
         }
 
@@ -75 +84 @@
         public InputRow[] getRows() {
                 if (_rows == null) {
-                        _rows = _annotationFactory.getRows(_annotation);
+                        _rows = getAnnotationFactory().getRows(getAnnotation());
                         if (_rows == null) {
                                 _rows = new InputRow[0];
@@ -94 +103 @@
          */
         public TableModel toDistinctValuesTableModel(InputColumn<?> inputColumnOfInterest) {
-                Map<Object, Integer> valueCounts = _annotationFactory.getValueCounts(_annotation, inputColumnOfInterest);
+                Map<Object, Integer> valueCounts = getAnnotationFactory().getValueCounts(getAnnotation(), inputColumnOfInterest);
                 DefaultTableModel tableModel = new DefaultTableModel(new String[] { inputColumnOfInterest.getName(),
                                 "Count in dataset" }, valueCounts.size());
@@ -163 +172 @@
 
         public RowAnnotation getAnnotation() {
+                if (_annotation == null) {
+                        // only occurs for deserialized instances
+                        return getAnnotationFactory().createAnnotation();
+                }
                 return _annotation;
         }
 
         public int getRowCount() {
-                return _annotation.getRowCount();
+                return getAnnotation().getRowCount();
         }
 }

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

@@ -23 +23 @@
 
         private static final long serialVersionUID = 1L;
-        private Crosstab<?> crosstab;
+        
+        private final Crosstab<?> crosstab;
 
         public CrosstabResult(Crosstab<?> crosstab) {

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

@@ -25 +25 @@
 
         private static final long serialVersionUID = 1L;
-        private AnalyzerResult result;
+        
+        private final AnalyzerResult result;
 
         public DefaultResultProducer(AnalyzerResult result) {

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/storage/RowAnnotation.java

@@ -20 +20 @@
 package org.eobjects.analyzer.storage;
 
+import java.io.Serializable;
+
 /**
  * Represents an annotation (aka a mark, a label or a categorization) of a row.
@@ -32 +34 @@
  * @author Kasper SÞrensen
  */
-public interface RowAnnotation {
+public interface RowAnnotation extends Serializable {
 
         public int getRowCount();

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/storage/RowAnnotationImpl.java

@@ -22 +22 @@
 final class RowAnnotationImpl implements RowAnnotation {
 
+        private static final long serialVersionUID = 1L;
+
         private volatile int _rowCount;