TEIIDDES-1914 Improved Mapping Class validation messages

Teiid-Designer · Nov 21, 2013 · b0bd2aa · b0bd2aa
1 parent a6e842c
commit b0bd2aa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...r/transformation/aspects/validation/rules/MappingClassTransformationValidationHelper.java b/...r/transformation/aspects/validation/rules/MappingClassTransformationValidationHelper.java
@@ -220,16 +220,22 @@ void validateRecursiveMappingClass( final MappingClass mc,
                                 MappingClassColumn childCol = (MappingClassColumn)childColumns.get(i);
                                 if (!rootCol.getName().equalsIgnoreCase(childCol.getName())) {
                                     // Mismatch column name between mapping class {0} and {1}
-                                    String msg = TransformationPlugin.Util.getString("MappingClassTransformationRule.Mismatch_Number_Column_Name_{0}_AND_{1}_2", rootMappingClass.getName(), mc.getName()); //$NON-NLS-1$
+                                	String rootColName = rootMappingClass.getName() + "." + rootCol.getName(); //$NON-NLS-1$
+                                	String childColName = mc.getName() + "." + childCol.getName(); //$NON-NLS-1$
+                                    String msg = TransformationPlugin.Util.getString("MappingClassTransformationRule.Mismatch_Number_Column_Name_{0}_AND_{1}_2", rootColName, childColName); //$NON-NLS-1$
                                     ValidationProblem errorProblem = new ValidationProblemImpl(0, IStatus.ERROR, msg);
                                     validationResult.addProblem(errorProblem);
+                                    break;
                                 }
 
                                 if (rootCol.getType() != childCol.getType()) {
                                     // Mismatch column type between mapping class {0} and {1}
-                                    String msg = TransformationPlugin.Util.getString("MappingClassTransformationRule.Mismatch_Column_Type_{0}_AND_{1}_3", rootMappingClass.getName(), mc.getName()); //$NON-NLS-1$                                        
+                                	String rootColName = rootMappingClass.getName() + "." + rootCol.getName(); //$NON-NLS-1$
+                                	String childColName = mc.getName() + "." + childCol.getName(); //$NON-NLS-1$
+                                    String msg = TransformationPlugin.Util.getString("MappingClassTransformationRule.Mismatch_Column_Type_{0}_AND_{1}_3", rootColName, childColName); //$NON-NLS-1$                                        
                                     ValidationProblem errorProblem = new ValidationProblemImpl(0, IStatus.ERROR, msg);
                                     validationResult.addProblem(errorProblem);
+                                    break;
                                 }
                             }
                         }

diff --git a/...s/org.teiid.designer.transformation/src/org/teiid/designer/transformation/i18n.properties b/...s/org.teiid.designer.transformation/src/org/teiid/designer/transformation/i18n.properties
@@ -22,9 +22,9 @@ MappingClassTransformationRule.Non-Query_NonUnion_transformation=The transformat
 MappingClassTransformationRule.No_INPUT_Parameters_In_Criteria=Query defining the mapping class {0} does not use INPUT parameters in its criteria.
 
 MappingClassTransformationRule.Mapping_Class_Is_Null_For_{0}_0=Recursion root mapping class not found for {0} class
-MappingClassTransformationRule.Mismatch_Number_Of_Column_{0}_AND_{1}_1=Mismatch number of columns between mapping class {0} and {1}
-MappingClassTransformationRule.Mismatch_Number_Column_Name_{0}_AND_{1}_2=Mismatch column name between mapping class {0} and {1}
-MappingClassTransformationRule.Mismatch_Column_Type_{0}_AND_{1}_3=Column type mismatch between recursion root mapping class {0} and recursion child mapping class {1}
+MappingClassTransformationRule.Mismatch_Number_Of_Column_{0}_AND_{1}_1=The number of columns in mapping class {0} is different than mapping class {1}
+MappingClassTransformationRule.Mismatch_Number_Column_Name_{0}_AND_{1}_2=The mapping class column name {0} does not match mapping class column {1}.  Check the column order.
+MappingClassTransformationRule.Mismatch_Column_Type_{0}_AND_{1}_3=The type for recursion root mapping class column {0} does not match the corresponding type for child mapping class column {1}
 
 MappingClassColumnUmlAspect.Signature_set=Signature set to 
 TransformationMappingValidationRule.Sql_transformation_in_the_model__1=Sql transformation in the model