Commit e7bb1d1

committed

HV-2135 Do not create unnecessary context for cascading into container elements

Signed-off-by: marko-bekhta <marko.prykladna@gmail.com>

1 parent fdb480d commit e7bb1d1Copy full SHA for e7bb1d1

File tree

-5

lines changed

engine/src/main/java/org/hibernate/validator/internal/engine
- ValidatorImpl.java
- path
  - MutablePath.java

-5

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -781,14 +781,13 @@ private void doValidate(Object value, String nodeName) {`
`781`	`781`
`782`	`782`	`// Cascade validation to container elements if we are dealing with a container element`
`783`	`783`	`if ( cascadingMetaData.hasContainerElementsMarkedForCascading() ) {`
`784`		`- ValueContext<?, Object> cascadedTypeArgumentValueContext = buildNewLocalExecutionContext( valueContext, value );`
`785`	`784`	`if ( cascadingMetaData.getTypeParameter() != null ) {`
`786`	`785`	`cascadedValueContext.setTypeParameter( cascadingMetaData.getDeclaredContainerClass(), cascadingMetaData.getDeclaredTypeParameterIndex() );`
`787`	`786`	`}`
`788`	`787`
`789`		`- cascadedTypeArgumentValueContext.appendTypeParameterNode( nodeName );`
	`788`	`+ cascadedValueContext.appendTypeParameterNode( nodeName );`
`790`	`789`
`791`		`- validateCascadedContainerElementsInContext( value, validationContext, cascadedTypeArgumentValueContext, cascadingMetaData, validationOrder );`
	`790`	`+ validateCascadedContainerElementsInContext( value, validationContext, cascadedValueContext, cascadingMetaData, validationOrder );`
`792`	`791`	`}`
`793`	`792`	`}`
`794`	`793`	`}`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,8 +172,6 @@ public void setLeafNodeValueIfRequired(Object value) {`
`172`	`172`	`// The value is only exposed for property and container element nodes`
`173`	`173`	`if ( currentLeafNode.getKind() == ElementKind.PROPERTY \|\| currentLeafNode.getKind() == ElementKind.CONTAINER_ELEMENT ) {`
`174`	`174`	`currentLeafNode.setPropertyValue( value );`
`175`		`-`
`176`		`- // the property value is not part of the NodeImpl hashCode so we don't need to reset the PathImpl hashCode`
`177`	`175`	`}`
`178`	`176`	`}`
`179`	`177`

Comments

(0)