Story/586/t3736/new validation result interim

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/RosettaGenerator.xtend

@@ -37,6 +37,7 @@ import com.regnosys.rosetta.generator.java.reports.ReportGenerator
 import javax.inject.Inject
 import com.regnosys.rosetta.rosetta.RosettaRule
 import com.regnosys.rosetta.rosetta.RosettaReport
+import com.regnosys.rosetta.generator.java.validator.ValidatorGenerator
 
 /**
  * Generates code from your model files on save.
@@ -57,6 +58,7 @@ class RosettaGenerator implements IGenerator2 {
 
 	@Inject ModelObjectGenerator dataGenerator
 	@Inject ValidatorsGenerator validatorsGenerator
+	@Inject ValidatorGenerator validatorGenerator
 	@Inject extension RosettaFunctionExtensions
 	@Inject FunctionGenerator funcGenerator
 	@Inject ReportGenerator reportGenerator
@@ -146,10 +148,11 @@ class RosettaGenerator implements IGenerator2 {
 						Data: {
 							dataGenerator.generate(packages, fsa, it, version)
 							metaGenerator.generate(packages, fsa, it, version)
-							validatorsGenerator.generate(packages, fsa, it, version)
+							//validatorsGenerator.generate(packages, fsa, it, version)
 							it.conditions.forEach [ cond |
 								conditionGenerator.generate(packages, fsa, it, cond, version)
 							]
+							validatorGenerator.generate(packages, fsa, it, version)
 							tabulatorGenerator.generate(fsa, it, Optional.empty)
 						}
 						Function: {

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend

@@ -1,12 +1,14 @@
 package com.regnosys.rosetta.generator.java.condition
 
+import com.google.inject.ImplementedBy
 import com.regnosys.rosetta.RosettaExtensions
 import com.regnosys.rosetta.generator.java.JavaIdentifierRepresentationService
 import com.regnosys.rosetta.generator.java.JavaScope
 import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage
 import com.regnosys.rosetta.generator.java.expression.ExpressionGenerator
 import com.regnosys.rosetta.generator.java.function.FunctionDependencyProvider
 import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
+import com.regnosys.rosetta.generator.java.types.JavaTypeUtil
 import com.regnosys.rosetta.generator.java.util.ImportManagerExtension
 import com.regnosys.rosetta.generator.java.util.RosettaGrammarUtil
 import com.regnosys.rosetta.rosetta.simple.Condition
@@ -15,17 +17,15 @@ import com.regnosys.rosetta.types.RDataType
 import com.rosetta.model.lib.annotations.RosettaDataRule
 import com.rosetta.model.lib.expression.ComparisonResult
 import com.rosetta.model.lib.path.RosettaPath
+import com.rosetta.model.lib.validation.ConditionValidationData
 import com.rosetta.model.lib.validation.ValidationResult
 import com.rosetta.model.lib.validation.Validator
+import javax.inject.Inject
 import org.eclipse.xtend2.lib.StringConcatenationClient
 import org.eclipse.xtext.generator.IFileSystemAccess2
 
 import static com.regnosys.rosetta.generator.java.util.ModelGeneratorUtil.*
 import static com.regnosys.rosetta.rosetta.simple.SimplePackage.Literals.CONDITION__EXPRESSION
-import javax.inject.Inject
-import com.google.inject.ImplementedBy
-import com.rosetta.model.lib.validation.ValidationResult.ValidationType
-import com.regnosys.rosetta.generator.java.types.JavaTypeUtil
 
 class ConditionGenerator {
 	@Inject ExpressionGenerator expressionHandler
@@ -97,14 +97,14 @@ class ConditionGenerator {
 					public «ValidationResult»<«rosettaClass.name»> validate(«RosettaPath» «defaultClassPathId», «rosettaClass.name» «defaultClassValidateScope.createIdentifier(implicitVarRepr, rosettaClass.name.toFirstLower)») {
 						«ComparisonResult» «defaultClassResultId» = executeDataRule(«defaultClassValidateScope.getIdentifierOrThrow(implicitVarRepr)»);
 						if (result.get()) {
-							return «ValidationResult».success(NAME, ValidationResult.ValidationType.DATA_RULE, "«rosettaClass.name»", «defaultClassPathId», DEFINITION);
+							return «ValidationResult».success(«defaultClassPathId»);
 						}
 
 						String «defaultClassFailureMessageId» = «defaultClassResultId».getError();
 						if («defaultClassFailureMessageId» == null || «defaultClassFailureMessageId».contains("Null") || «defaultClassFailureMessageId» == "") {
 							«defaultClassFailureMessageId» = "Condition has failed.";
 						}
-						return «ValidationResult».failure(NAME, «ValidationType».DATA_RULE, "«rosettaClass.name»", «defaultClassPathId», DEFINITION, «defaultClassFailureMessageId»);
+						return «ValidationResult».failure(«defaultClassPathId», «defaultClassFailureMessageId», new «ConditionValidationData»());
 					}
 
 					private «ComparisonResult» executeDataRule(«rosettaClass.name» «defaultClassExecuteScope.createIdentifier(implicitVarRepr, rosettaClass.name.toFirstLower)») {
@@ -121,7 +121,7 @@ class ConditionGenerator {
 
 					@Override
 					public «ValidationResult»<«rosettaClass.name»> validate(«RosettaPath» «noOpClassPathId», «rosettaClass.name» «noOpClassValidateScope.createIdentifier(implicitVarRepr, rosettaClass.name.toFirstLower)») {
-						return «ValidationResult».success(NAME, ValidationResult.ValidationType.DATA_RULE, "«rosettaClass.name»", «noOpClassPathId», DEFINITION);
+						return «ValidationResult».success(«noOpClassPathId»);
 					}
 				}
 			}

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/expression/ExpressionGenerator.xtend

@@ -86,7 +86,7 @@ import com.rosetta.model.lib.expression.ExpressionOperators
 import com.rosetta.model.lib.expression.MapperMaths
 import com.rosetta.model.lib.mapper.MapperC
 import com.rosetta.model.lib.mapper.MapperS
-import com.rosetta.model.lib.validation.ValidationResult.ChoiceRuleValidationMethod
+import com.rosetta.model.lib.validation.ChoiceRuleValidationMethod
 import java.math.BigDecimal
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ModelMetaGenerator.xtend

@@ -84,14 +84,16 @@ class ModelMetaGenerator {
 					«ENDIF»
 				}
 
+				@Deprecated
 				@Override
 				public «Validator»<? super «dataClass»> validator() {
-					return new «validator»();
+					throw new «UnsupportedOperationException»();
 				}
 
+				@Deprecated
 				@Override
 				public «Validator»<? super «dataClass»> typeFormatValidator() {
-					return new «typeFormatValidator»();
+					throw new «UnsupportedOperationException»();
 				}
 
 				@Override

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/object/ValidatorsGenerator.xtend

@@ -13,7 +13,7 @@ import com.rosetta.model.lib.expression.ExpressionOperators
 import com.rosetta.model.lib.path.RosettaPath
 import com.rosetta.model.lib.validation.ExistenceChecker
 import com.rosetta.model.lib.validation.ValidationResult
-import com.rosetta.model.lib.validation.ValidationResult.ValidationType
+import com.rosetta.model.lib.validation.ValidationType
 import com.rosetta.model.lib.validation.Validator
 import com.rosetta.model.lib.validation.ValidatorWithArg
 import java.util.Map
@@ -80,7 +80,7 @@ class ValidatorsGenerator {
 			@Override
 			public «ValidationResult»<«t.toJavaType»> validate(«RosettaPath» path, «t.toJavaType» o) {
 				/* Casting is required to ensure types are output to ensure recompilation in Rosetta */
-				String error = 
+				String error =
 					«Lists».<«ComparisonResult»>newArrayList(
 						«FOR attrCheck : attributes.map[checkCardinality(toExpandedAttribute)].filter[it !== null] SEPARATOR ", "»
 							«attrCheck»
@@ -101,13 +101,13 @@ class ValidatorsGenerator {
 
 			@Override
 			public «ValidationResult»<«t.toJavaType»> validate(«RosettaPath» path, «t.toJavaType» o) {
-				String error = 
+				String error =
 					«Lists».<«ComparisonResult»>newArrayList(
 						«FOR attrCheck : attributes.map[checkTypeFormat].filter[it !== null] SEPARATOR ", "»
 							«attrCheck»
 						«ENDFOR»
 					).stream().filter(res -> !res.get()).map(res -> res.getError()).collect(«method(Collectors, "joining")»("; "));
-				
+
 				if (!«method(Strings, "isNullOrEmpty")»(error)) {
 					return «method(ValidationResult, "failure")»("«t.name»", «ValidationResult.ValidationType».TYPE_FORMAT, "«t.name»", path, "", error);
 				}

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/java/validator/ValidatorGenerator.xtend

@@ -0,0 +1,180 @@
+package com.regnosys.rosetta.generator.java.validator
+
+import com.regnosys.rosetta.RosettaExtensions
+import com.regnosys.rosetta.generator.java.JavaScope
+import com.regnosys.rosetta.generator.java.RosettaJavaPackages.RootPackage
+import com.regnosys.rosetta.generator.java.types.JavaTypeTranslator
+import com.regnosys.rosetta.generator.java.types.JavaTypeUtil
+import com.regnosys.rosetta.generator.java.util.ImportManagerExtension
+import com.regnosys.rosetta.rosetta.simple.Attribute
+import com.regnosys.rosetta.rosetta.simple.Data
+import com.regnosys.rosetta.types.RDataType
+import com.regnosys.rosetta.types.RosettaTypeProvider
+import com.regnosys.rosetta.types.TypeSystem
+import com.regnosys.rosetta.types.builtin.RBuiltinTypeService
+import com.regnosys.rosetta.types.builtin.RNumberType
+import com.regnosys.rosetta.types.builtin.RStringType
+import com.rosetta.model.lib.ModelSymbolId
+import com.rosetta.model.lib.validation.AttributeValidation
+import com.rosetta.model.lib.validation.RosettaModelObjectValidator
+import com.rosetta.model.lib.validation.TypeValidation
+import com.rosetta.model.lib.validation.ValidationUtil
+import com.rosetta.util.DottedPath
+import java.math.BigDecimal
+import java.util.ArrayList
+import java.util.Optional
+import java.util.regex.Pattern
+import java.util.stream.Collectors
+import javax.inject.Inject
+import org.apache.commons.text.StringEscapeUtils
+import org.eclipse.xtend2.lib.StringConcatenationClient
+import org.eclipse.xtext.generator.IFileSystemAccess2
+import static extension com.regnosys.rosetta.generator.util.RosettaAttributeExtensions.*
+import java.util.List
+import com.rosetta.model.lib.validation.ValidationResult
+import com.rosetta.model.lib.path.RosettaPath
+import com.rosetta.model.lib.validation.ConditionValidation
+import com.rosetta.util.types.generated.GeneratedJavaClass
+
+class ValidatorGenerator {
+	@Inject extension ImportManagerExtension
+	@Inject extension RosettaExtensions
+	@Inject extension JavaTypeTranslator
+	@Inject extension RosettaTypeProvider
+	@Inject extension TypeSystem
+	@Inject extension RBuiltinTypeService
+	@Inject extension JavaTypeUtil
+
+	def generate(RootPackage root, IFileSystemAccess2 fsa, Data data, String version) {
+		val topScope = new JavaScope(root.typeValidation)
+
+		val classBody = data.classBody(topScope, root)
+		val content = buildClass(root.typeValidation, classBody, topScope)
+		fsa.generateFile('''«root.typeValidation.withForwardSlashes»/«data.name»Validator.java''', content)
+	}
+
+	private def StringConcatenationClient classBody(Data data, JavaScope scope, RootPackage root) {
+
+		val modelPojo = new RDataType(data).toJavaReferenceType
+		val rDataType = new RDataType(data)
+		'''
+			public class «data.name»Validator implements «RosettaModelObjectValidator»<«modelPojo»>{
+				«FOR con : data.conditions»
+				@«Inject» protected «new GeneratedJavaClass(root.condition, con.conditionName(data), Object)» «con.name.toFirstLower»;
+
+				«ENDFOR»
+				@Override
+				public «TypeValidation» validate(«RosettaPath» path, «rDataType.toJavaReferenceType» o) {
+
+					«DottedPath» packageName = «DottedPath».of(o.getClass().getPackage().toString());
+					«String» simpleName = o.getClass().getSimpleName();
+					«ModelSymbolId» modelSymbolId = new «ModelSymbolId»(packageName, simpleName);
+
+				 	«List»<«AttributeValidation»> attributeValidations = new «ArrayList»<>();
+				 	«FOR attribute : data.allAttributes»
+				 	 	attributeValidations.add(validate«attribute.name.toFirstUpper»(«attribute.attributeValue», path));
+				 	«ENDFOR»
+
+				 	«List»<«ConditionValidation»> conditionValidations = new «ArrayList»<>();
+				 	«FOR dataCondition : data.conditions»
+				 		conditionValidations.add(validate«dataCondition.name.toFirstUpper»(o, path));
+				 	«ENDFOR»
+
+				 	return new «TypeValidation»(modelSymbolId, attributeValidations, conditionValidations);
+				}
+
+				«FOR attribute : data.allAttributes»
+				public «AttributeValidation» validate«attribute.name.toFirstUpper»(«attribute.RTypeOfSymbol.toJavaReferenceType» atr, «RosettaPath» path) {
+					«List»<«ValidationResult»> validationResults = new «ArrayList»<>();
+					«ValidationResult» cardinalityValidation = «checkCardinality(attribute)»;
+					validationResults.add(«checkTypeFormat(attribute)»);
+
+					return new «AttributeValidation»("«attribute.name»", cardinalityValidation, validationResults);
+				}
+				«ENDFOR»
+
+				«FOR dataCondition : data.conditions»
+				public «ConditionValidation» validate«dataCondition.name.toFirstUpper»(«rDataType.toJavaReferenceType» data, «RosettaPath» path) {
+					«ValidationResult» result = «dataCondition.name.toFirstLower».validate(path, data);
+
+					return new «ConditionValidation»(«dataCondition.name.toFirstLower».toString(), result);
+				}
+				«ENDFOR»
+			}
+		'''
+
+	}
+	private def StringConcatenationClient checkCardinality(Attribute attr) {
+		if (attr.card.inf === 0 && attr.card.unbounded) {
+			null
+		} else {
+			/* Casting is required to ensure types are output to ensure recompilation in Rosetta */
+			if (attr.card.isIsMany) {
+				'''«method(ValidationUtil, "checkCardinality")»("«attr.name»", atr == null ? 0 : atr.size(), «attr.card.inf», «attr.card.sup» , path)'''
+			} else {
+				'''«method(ValidationUtil, "checkCardinality")»("«attr.name»", atr != null ? 1 : 0, «attr.card.inf», «attr.card.sup», path)'''
+			}
+		}
+	}
+
+	private def StringConcatenationClient checkTypeFormat(Attribute attr) {
+		val t = attr.RTypeOfSymbol.stripFromTypeAliases
+		if (t instanceof RStringType) {
+			if (t != UNCONSTRAINED_STRING) {
+				val min = t.interval.minBound
+				val max = t.interval.max.optional
+				val pattern = t.pattern.optionalPattern
+
+				return '''«method(ValidationUtil, "checkString")»("«attr.name»", atr, «min», «max», «pattern», path)'''
+			}
+		} else if (t instanceof RNumberType) {
+			if (t != UNCONSTRAINED_NUMBER) {
+				val digits = t.digits.optional
+				val fractionalDigits = t.fractionalDigits.optional
+				val min = t.interval.min.optionalBigDecimal
+				val max = t.interval.max.optionalBigDecimal
+
+				return '''«method(ValidationUtil, "checkNumber")»("«attr.name»",atr, «digits», «IF !t.isInteger»«fractionalDigits», «ENDIF»«min», «max», path)'''
+			}
+		}
+		return null
+	}
+
+	private def StringConcatenationClient getAttributeValue(Attribute attr) {
+		if (attr.metaAnnotations.empty) {
+			'''o.get«attr.name?.toFirstUpper»()'''
+		} else {
+			val jt = attr.toExpandedAttribute.toMultiMetaOrRegularJavaType
+			if (jt.isList) {
+				val itemType = jt.itemType
+				'''o.get«attr.name?.toFirstUpper»().stream().map(«itemType»::getValue).collect(«Collectors».toList())'''
+			} else {
+				'''o.get«attr.name?.toFirstUpper»().getValue()'''
+			}
+		}
+	}
+	private def StringConcatenationClient optional(Optional<? extends Object> v) {
+		if (v.isPresent) {
+			'''«method(Optional, "of")»(«v.get»)'''
+		} else {
+			'''«method(Optional, "empty")»()'''
+		}
+	}
+	private def StringConcatenationClient optionalPattern(Optional<Pattern> v) {
+		if (v.isPresent) {
+			'''«method(Optional, "of")»(«Pattern».compile("«StringEscapeUtils.escapeJava(v.get.toString)»"))'''
+		} else {
+			'''«method(Optional, "empty")»()'''
+		}
+	}
+	private def StringConcatenationClient optionalBigDecimal(Optional<BigDecimal> v) {
+		if (v.isPresent) {
+			'''«method(Optional, "of")»(new «BigDecimal»("«StringEscapeUtils.escapeJava(v.get.toString)»"))'''
+		} else {
+			'''«method(Optional, "empty")»()'''
+		}
+	}
+
+
+}
+≈Ω

rosetta-runtime/src/main/java/com/rosetta/model/lib/expression/ExpressionOperators.java

@@ -17,6 +17,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import com.rosetta.model.lib.validation.*;
 import org.apache.commons.lang3.StringUtils;
 
 import com.rosetta.model.lib.RosettaModelObject;
@@ -25,9 +26,6 @@
 import com.rosetta.model.lib.mapper.Mapper.Path;
 import com.rosetta.model.lib.mapper.MapperS;
 import com.rosetta.model.lib.meta.RosettaMetaData;
-import com.rosetta.model.lib.validation.ExistenceChecker;
-import com.rosetta.model.lib.validation.ValidationResult;
-import com.rosetta.model.lib.validation.ValidatorWithArg;
 
 public class ExpressionOperators {
 
@@ -125,7 +123,7 @@ private static <T extends RosettaModelObject> ComparisonResult validateOnlyExist
 		if (onlyExistsValidator != null) {
 			ValidationResult<? extends RosettaModelObject> validationResult = onlyExistsValidator.validate(null, parent, fields);
 			// Translate validationResult into comparisonResult
-			return validationResult.isSuccess() ? 
+			return ValidationResult.isSuccess() ?
 					ComparisonResult.success() : 
 					ComparisonResult.failure(validationResult.getFailureReason().orElse(""));
 		} else {
@@ -274,6 +272,7 @@ public static ComparisonResult checkCardinality(String msgPrefix, int actual, in
 		return ComparisonResult.success();
 	}
 
+	@Deprecated
 	public static ComparisonResult checkString(String msgPrefix, String value, int minLength, Optional<Integer> maxLength, Optional<Pattern> pattern) {
 		if (value == null) {
 			return ComparisonResult.success();
@@ -420,7 +419,7 @@ private static <T> String formatMultiError(Mapper<T> o) {
 
 	// one-of and choice
 
-	public static <T> ComparisonResult choice(Mapper<T> mapper, List<String> choiceFieldNames, ValidationResult.ChoiceRuleValidationMethod necessity) {
+	public static <T> ComparisonResult choice(Mapper<T> mapper, List<String> choiceFieldNames, ChoiceRuleValidationMethod necessity) {
 		T object = mapper.get();
 		List<String> populatedFieldNames = new LinkedList<>();
 		for (String a: choiceFieldNames) {