Changeset 3046

Timestamp:

01/17/12 14:35:00 (4 months ago)

Author:

kasper

Message:

Ticket #442: Fixed cyclic dependency issue.

Location:

AnalyzerBeans/trunk

Files:

• core/src/main/java/org/eobjects/analyzer/job/AbstractFilterOutcome.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/job/ImmutableFilterOutcome.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/job/ImmutableMergedOutcome.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/job/LazyMergedOutcome.java (modified) (3 diffs)
• core/src/main/java/org/eobjects/analyzer/job/Outcome.java (modified) (1 diff)
• core/src/main/java/org/eobjects/analyzer/job/builder/AbstractBeanWithInputColumnsBuilder.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/job/builder/LazyFilterOutcome.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/job/builder/AnalysisJobBuilderTest.java (modified) (2 diffs)
• env/xml-config/src/main/java/org/eobjects/analyzer/job/JaxbJobReader.java (modified) (1 diff)

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

@@ -47 +47 @@
         protected final void decorateIdentity(List<Object> identifiers) {
                 identifiers.add(getCategory());
-                identifiers.add(getFilterJob());
+                identifiers.add(getSourceJob());
         }
 

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

@@ -31 +31 @@
                 _category = category;
         }
+        
+        @Override
+        public FilterJob getFilterJob() {
+                return _filterJob;
+        }
 
         @Override
-        public FilterJob getFilterJob() {
+        public FilterJob getSourceJob() {
                 return _filterJob;
         }

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

@@ -49 +49 @@
                 return false;
         }
+
+        @Override
+        public OutcomeSourceJob getSourceJob() {
+                return _mergedOutcomeJob;
+        }
 }

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

@@ -23 +23 @@
 
 public final class LazyMergedOutcome extends AbstractMergedOutcome implements MergedOutcome {
-        
+
         private static final long serialVersionUID = 1L;
 
@@ -30 +30 @@
         public LazyMergedOutcome(MergedOutcomeJobBuilder mergedOutcomeJobBuilder) {
                 _mergedOutcomeJobBuilder = mergedOutcomeJobBuilder;
-        }
-        
-        public MergedOutcomeJobBuilder getBuilder() {
-                return _mergedOutcomeJobBuilder;
         }
 
@@ -45 +41 @@
                 return _mergedOutcomeJobBuilder.toMergedOutcomeJob();
         }
+
+        @Override
+        public MergedOutcomeJobBuilder getSourceJob() {
+                return _mergedOutcomeJobBuilder;
+        }
 }

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

@@ -35 +35 @@
 
         /**
+         * Gets the source job for this outcome
+         * 
+         * @return the source job for this outcome
+         */
+        public OutcomeSourceJob getSourceJob();
+
+        /**
          * Requests whether or not a specific requirement is satisfied by this
          * outcome

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

@@ -35 +35 @@
 import org.eobjects.analyzer.job.Outcome;
 import org.eobjects.analyzer.job.OutcomeSinkJob;
+import org.eobjects.analyzer.job.OutcomeSourceJob;
 import org.eobjects.analyzer.util.CollectionUtils2;
 import org.eobjects.metamodel.util.CollectionUtils;
@@ -180 +181 @@
         }
 
-        public void setRequirement(Outcome requirement) {
+        public void setRequirement(Outcome requirement) throws IllegalArgumentException {
+                if (!validateRequirementCandidate(requirement)) {
+                        throw new IllegalArgumentException("Cyclic dependency detected when setting requirement: " + requirement);
+                }
                 if (_requirement != requirement) {
                         _requirement = requirement;
                         onRequirementChanged();
                 }
+        }
+
+        public boolean validateRequirementCandidate(Outcome requirement) {
+                if (requirement == null) {
+                        return true;
+                }
+                OutcomeSourceJob sourceJob = requirement.getSourceJob();
+                if (sourceJob == this) {
+                        return false;
+                }
+                if (sourceJob instanceof OutcomeSinkJob) {
+                        Outcome[] requirements = ((OutcomeSinkJob) sourceJob).getRequirements();
+                        for (Outcome transitiveRequirement : requirements) {
+                                boolean transitiveValidation = validateRequirementCandidate(transitiveRequirement);
+                                if (!transitiveValidation) {
+                                        return false;
+                                }
+                        }
+                }
+                return true;
         }
 

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

@@ -25 +25 @@
 import org.eobjects.analyzer.job.ImmutableBeanConfiguration;
 import org.eobjects.analyzer.job.ImmutableFilterJob;
+import org.eobjects.analyzer.job.OutcomeSourceJob;
 
 public final class LazyFilterOutcome extends AbstractFilterOutcome {
-        
+
         private static final long serialVersionUID = 1L;
 
@@ -36 +37 @@
                 _filterJobBuilder = filterJobBuilder;
                 _category = category;
+        }
+
+        @Override
+        public OutcomeSourceJob getSourceJob() {
+                return _filterJobBuilder;
         }
 

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

@@ -39 +39 @@
 import org.eobjects.analyzer.beans.stringpattern.PatternFinderAnalyzer;
 import org.eobjects.analyzer.configuration.AnalyzerBeansConfigurationImpl;
-import org.eobjects.analyzer.connection.DatastoreConnection;
 import org.eobjects.analyzer.connection.Datastore;
 import org.eobjects.analyzer.connection.DatastoreCatalogImpl;
+import org.eobjects.analyzer.connection.DatastoreConnection;
 import org.eobjects.analyzer.connection.JdbcDatastore;
 import org.eobjects.analyzer.data.DataTypeFamily;
@@ -78 +78 @@
         }
 
+        public void testPreventCyclicFilterDependencies() throws Exception {
+                analysisJobBuilder.addSourceColumns("PUBLIC.EMPLOYEES.REPORTSTO");
+                FilterJobBuilder<MaxRowsFilter, ValidationCategory> filter1 = analysisJobBuilder.addFilter(MaxRowsFilter.class);
+                FilterJobBuilder<NotNullFilter, ValidationCategory> filter2 = analysisJobBuilder.addFilter(NotNullFilter.class);
+                filter2.addInputColumn(analysisJobBuilder.getSourceColumnByName("reportsto"));
+                filter1.setRequirement(filter2.getOutcome(ValidationCategory.VALID));
+
+                try {
+                        filter2.setRequirement(filter1.getOutcome(ValidationCategory.VALID));
+                        fail("Exception expected");
+                } catch (IllegalArgumentException e) {
+                        assertEquals("Cyclic dependency detected when setting requirement: FilterOutcome[category=VALID]",
+                                        e.getMessage());
+                }
+        }
+
         public void testGetDatastore() throws Exception {
                 assertNotNull(analysisJobBuilder.getDatastore());

AnalyzerBeans/trunk/env/xml-config/src/main/java/org/eobjects/analyzer/job/JaxbJobReader.java

@@ -647 +647 @@
                                         LazyMergedOutcome outcome = (LazyMergedOutcome) outcomeMapping
                                                         .get(id);
-                                        MergedOutcomeJobBuilder builder = outcome.getBuilder();
+                                        MergedOutcomeJobBuilder builder = outcome.getSourceJob();
 
                                         // map the input requirements and columns