wip mifosx-195 maintenance changes

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/data/DataValidatorBuilder.java

@@ -385,7 +385,7 @@ public class DataValidatorBuilder {
     }
     
     public DataValidatorBuilder cantBeBlankWhenParameterProvidedIs(final String parameterName, final Object parameterValue) {
-        if (value != null) { return this; }
+        if (StringUtils.isNotBlank(value.toString())) { return this; }
 
         StringBuilder validationErrorCode = new StringBuilder("validation.msg.").append(resource).append(".").append(parameter)
                 .append(".must.be.provided.when.").append(parameterName).append(".is.").append(parameterValue);

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/domain/Report.java

@@ -194,27 +194,35 @@ public class Report extends AbstractPersistable<Long> {
 				.parameter("reportType")
 				.value(this.reportType)
 				.notBlank()
-				.notExceedingLengthOf(20)
 				.isOneOfTheseValues(
 						new Object[] { "Table", "Pentaho", "Chart" });
 
 		baseDataValidator.reset().parameter("reportSubType")
 				.value(this.reportSubType).notExceedingLengthOf(20);
 
-		if (this.reportType != null && this.reportType.equals("Chart")) {
+		if (StringUtils.isNotBlank(this.reportType)) {
-			baseDataValidator
+			if (this.reportType.equals("Chart")) {
-					.reset()
+				baseDataValidator
-					.parameter("reportSubType")
+						.reset()
-					.value(this.reportSubType)
+						.parameter("reportSubType")
-					.cantBeBlankWhenParameterProvidedIs("reportType",
+						.value(this.reportSubType)
-							this.reportType)
+						.cantBeBlankWhenParameterProvidedIs("reportType",
-					.isOneOfTheseValues(new Object[] { "Bar", "Pie" });
+								this.reportType)
+						.isOneOfTheseValues(new Object[] { "Bar", "Pie" });
+			} else {
+				baseDataValidator
+						.reset()
+						.parameter("reportSubType")
+						.value(this.reportSubType)
+						.mustBeBlankWhenParameterProvidedIs("reportType",
+								this.reportType);
+			}
 		}
 
-		baseDataValidator.reset().parameter("reportCategory").value(this.reportCategory)
+		baseDataValidator.reset().parameter("reportCategory")
-				.notExceedingLengthOf(45);
+				.value(this.reportCategory).notExceedingLengthOf(45);
 
-		if (this.reportType != null) {
+		if (StringUtils.isNotBlank(this.reportType)) {
 			if ((this.reportType.equals("Table"))
 					|| (this.reportType.equals("Chart"))) {
 				baseDataValidator
@@ -247,5 +255,5 @@ public class Report extends AbstractPersistable<Long> {
 	public String getReportName() {
 		return reportName;
 	}
-	
+
 }