Skip to content

HV-1831 experiments (6.2) #1170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

HV-1831 experiments (6.2) #1170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0eb0e17
HV-1831 Unfinished experiments
gsmet Feb 24, 2021
d4acd34
HV-1831 Add a couple of examples illustrating various cases
gsmet Feb 25, 2021
aea0642
HV-1831 Clean up another experiment that shouldn't have been committed
gsmet Mar 8, 2021
cea9b8c
Add the same bean to List twice
gbadner Mar 10, 2021
f4d7656
Copy nodes when changing the nature of the leaf
gsmet Mar 11, 2021
e859ea7
HV-1831 : Experiment detecting cycles in bean classes
gbadner Apr 9, 2021
21d7d7b
Correct checkstyle failures
gbadner Apr 15, 2021
5fbe22f
HV-1831 : Experiment detecting cycles in bean classes
gbadner Apr 23, 2021
d4a4f4c
HV-1831 : Experiment detecting cycles in bean classes
gbadner Apr 30, 2021
2bf5eec
HV-1831 : Update Cascade tests to use PredefinedScopeHibernateValidat…
gbadner Apr 30, 2021
eec033f
HV-1831 Specific benchmark infrastructure for predefined scope
gsmet Apr 30, 2021
dc1cdb4
HV-1831 Add some guidance about next step
gsmet May 20, 2021
ee22331
HV-1831 : Wrap a `BeanMetaData` in a `NonTrackedBeanMetaDataImpl` if …
gbadner Jul 20, 2021
b5262e5
HV-1831 New zero cost approach to processed bean tracking strategy
gsmet Jul 30, 2021
9d250a0
HV-1831 Create ProcessedBeansTrackingVoter contract
gsmet Aug 26, 2021
19786df
HV-1831 Enhance ExecutableMetaData with tracking information
gsmet Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ain/java/org/hibernate/validator/internal/engine/PredefinedScopeValidatorFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@ public PredefinedScopeValidatorFactoryImpl(ConfigurationState configurationState
determineConstraintValidatorPayload( hibernateSpecificConfig ),
determineConstraintExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
determineCustomViolationExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
beanMetaDataManager.getProcessedBeansTrackingStrategy(),
constraintValidatorInitializationContext );

if ( LOG.isDebugEnabled() ) {
Expand Down Expand Up @@ -265,6 +264,10 @@ public boolean isTraversableResolverResultCacheEnabled() {
return validatorFactoryScopedContext.isTraversableResolverResultCacheEnabled();
}

public PredefinedScopeBeanMetaDataManager getBeanMetaDataManager() {
return beanMetaDataManager;
}

@Override
public <T> T unwrap(Class<T> type) {
// allow unwrapping into public super types
Expand Down
8 changes: 2 additions & 6 deletions engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineAllowOverridingMethodAlterParameterConstraint;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineAllowParallelMethodsDefineParameterConstraints;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineBeanMetaDataClassNormalizer;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintExpressionLanguageFeatureLevel;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintMappings;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintValidatorPayload;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineConstraintExpressionLanguageFeatureLevel;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineCustomViolationExpressionLanguageFeatureLevel;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineExternalClassLoader;
import static org.hibernate.validator.internal.engine.ValidatorFactoryConfigurationHelper.determineFailFast;
Expand Down Expand Up @@ -47,7 +47,6 @@
import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManager;
import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorManagerImpl;
import org.hibernate.validator.internal.engine.groups.ValidationOrderGenerator;
import org.hibernate.validator.internal.engine.tracking.HasCascadablesProcessedBeansTrackingStrategy;
import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
import org.hibernate.validator.internal.metadata.BeanMetaDataManager;
import org.hibernate.validator.internal.metadata.BeanMetaDataManagerImpl;
Expand Down Expand Up @@ -161,10 +160,7 @@ public ValidatorFactoryImpl(ConfigurationState configurationState) {
determineTraversableResolverResultCacheEnabled( hibernateSpecificConfig, properties ),
determineConstraintValidatorPayload( hibernateSpecificConfig ),
determineConstraintExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
determineCustomViolationExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ),
( hibernateSpecificConfig != null && hibernateSpecificConfig.getProcessedBeansTrackingStrategy() != null )
? hibernateSpecificConfig.getProcessedBeansTrackingStrategy()
: new HasCascadablesProcessedBeansTrackingStrategy() );
determineCustomViolationExpressionLanguageFeatureLevel( hibernateSpecificConfig, properties ) );

ConstraintValidatorManager constraintValidatorManager = new ConstraintValidatorManagerImpl(
configurationState.getConstraintValidatorFactory(),
Expand Down
26 changes: 2 additions & 24 deletions .../src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryScopedContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorInitializationContext;
import org.hibernate.validator.internal.engine.constraintvalidation.HibernateConstraintValidatorInitializationContextImpl;
import org.hibernate.validator.internal.engine.tracking.ProcessedBeansTrackingStrategy;
import org.hibernate.validator.internal.util.Contracts;
import org.hibernate.validator.internal.util.ExecutableParameterNameProvider;
import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel;
Expand Down Expand Up @@ -79,11 +78,6 @@ public class ValidatorFactoryScopedContext {
*/
private final ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel;

/**
* Strategy used to enable or not processed beans tracking.
*/
private final ProcessedBeansTrackingStrategy processedBeansTrackingStrategy;

/**
* The constraint validator initialization context.
*/
Expand All @@ -99,11 +93,10 @@ public class ValidatorFactoryScopedContext {
boolean traversableResolverResultCacheEnabled,
Object constraintValidatorPayload,
ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel,
ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel,
ProcessedBeansTrackingStrategy processedBeansTrackingStrategy) {
ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel) {
this( messageInterpolator, traversableResolver, parameterNameProvider, clockProvider, temporalValidationTolerance, scriptEvaluatorFactory, failFast,
traversableResolverResultCacheEnabled, constraintValidatorPayload, constraintExpressionLanguageFeatureLevel,
customViolationExpressionLanguageFeatureLevel, processedBeansTrackingStrategy,
customViolationExpressionLanguageFeatureLevel,
new HibernateConstraintValidatorInitializationContextImpl( scriptEvaluatorFactory, clockProvider,
temporalValidationTolerance ) );
}
Expand All @@ -119,7 +112,6 @@ public class ValidatorFactoryScopedContext {
Object constraintValidatorPayload,
ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel,
ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel,
ProcessedBeansTrackingStrategy processedBeanTrackingStrategy,
HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext) {
this.messageInterpolator = messageInterpolator;
this.traversableResolver = traversableResolver;
Expand All @@ -132,7 +124,6 @@ public class ValidatorFactoryScopedContext {
this.constraintValidatorPayload = constraintValidatorPayload;
this.constraintExpressionLanguageFeatureLevel = constraintExpressionLanguageFeatureLevel;
this.customViolationExpressionLanguageFeatureLevel = customViolationExpressionLanguageFeatureLevel;
this.processedBeansTrackingStrategy = processedBeanTrackingStrategy;
this.constraintValidatorInitializationContext = constraintValidatorInitializationContext;
}

Expand Down Expand Up @@ -184,10 +175,6 @@ public ExpressionLanguageFeatureLevel getCustomViolationExpressionLanguageFeatur
return this.customViolationExpressionLanguageFeatureLevel;
}

public ProcessedBeansTrackingStrategy getProcessedBeansTrackingStrategy() {
return processedBeansTrackingStrategy;
}

static class Builder {
private final ValidatorFactoryScopedContext defaultContext;

Expand All @@ -202,7 +189,6 @@ static class Builder {
private Object constraintValidatorPayload;
private ExpressionLanguageFeatureLevel constraintExpressionLanguageFeatureLevel;
private ExpressionLanguageFeatureLevel customViolationExpressionLanguageFeatureLevel;
private ProcessedBeansTrackingStrategy processedBeansTrackingStrategy;
private HibernateConstraintValidatorInitializationContextImpl constraintValidatorInitializationContext;

Builder(ValidatorFactoryScopedContext defaultContext) {
Expand All @@ -220,7 +206,6 @@ static class Builder {
this.constraintValidatorPayload = defaultContext.constraintValidatorPayload;
this.constraintExpressionLanguageFeatureLevel = defaultContext.constraintExpressionLanguageFeatureLevel;
this.customViolationExpressionLanguageFeatureLevel = defaultContext.customViolationExpressionLanguageFeatureLevel;
this.processedBeansTrackingStrategy = defaultContext.processedBeansTrackingStrategy;
this.constraintValidatorInitializationContext = defaultContext.constraintValidatorInitializationContext;
}

Expand Down Expand Up @@ -307,12 +292,6 @@ public ValidatorFactoryScopedContext.Builder setCustomViolationExpressionLanguag
return this;
}

public ValidatorFactoryScopedContext.Builder setProcessedBeansTrackingStrategy(
ProcessedBeansTrackingStrategy processedBeansTrackingStrategy) {
this.processedBeansTrackingStrategy = processedBeansTrackingStrategy;
return this;
}

public ValidatorFactoryScopedContext build() {
return new ValidatorFactoryScopedContext(
messageInterpolator,
Expand All @@ -326,7 +305,6 @@ public ValidatorFactoryScopedContext build() {
constraintValidatorPayload,
constraintExpressionLanguageFeatureLevel,
customViolationExpressionLanguageFeatureLevel,
processedBeansTrackingStrategy,
HibernateConstraintValidatorInitializationContextImpl.of(
constraintValidatorInitializationContext,
scriptEvaluatorFactory,
Expand Down
31 changes: 0 additions & 31 deletions ...nate/validator/internal/engine/tracking/HasCascadablesProcessedBeansTrackingStrategy.java
View file
Open in desktop

This file was deleted.

79 changes: 39 additions & 40 deletions ...ate/validator/internal/engine/tracking/PredefinedScopeProcessedBeansTrackingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*/
package org.hibernate.validator.internal.engine.tracking;

import java.lang.reflect.Executable;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Collections;
Expand All @@ -15,22 +14,22 @@
import java.util.Map;
import java.util.Set;

import org.hibernate.validator.internal.metadata.PredefinedScopeBeanMetaDataManager;
import org.hibernate.validator.internal.metadata.aggregated.BeanMetaData;
import org.hibernate.validator.internal.metadata.aggregated.CascadingMetaData;
import org.hibernate.validator.internal.metadata.aggregated.ContainerCascadingMetaData;
import org.hibernate.validator.internal.metadata.facets.Cascadable;
import org.hibernate.validator.internal.properties.Signature;
import org.hibernate.validator.internal.util.CollectionHelper;

public class PredefinedScopeProcessedBeansTrackingStrategy implements ProcessedBeansTrackingStrategy {

private final Map<Class<?>, Boolean> trackingEnabledForBeans;

private final Map<Executable, Boolean> trackingEnabledForReturnValues;
private final Map<Signature, Boolean> trackingEnabledForReturnValues;

private final Map<Executable, Boolean> trackingEnabledForParameters;
private final Map<Signature, Boolean> trackingEnabledForParameters;

public PredefinedScopeProcessedBeansTrackingStrategy(PredefinedScopeBeanMetaDataManager beanMetaDataManager) {
public PredefinedScopeProcessedBeansTrackingStrategy(Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap) {
// TODO: build the maps from the information inside the beanMetaDataManager
// There is a good chance we will need a structure with the whole hierarchy of constraint classes.
// That's something we could add to PredefinedScopeBeanMetaDataManager, as we are already doing similar things
Expand All @@ -39,24 +38,24 @@ public PredefinedScopeProcessedBeansTrackingStrategy(PredefinedScopeBeanMetaData
// PredefinedScopeBeanMetaDataManager.

this.trackingEnabledForBeans = CollectionHelper.toImmutableMap(
new TrackingEnabledStrategyBuilder( beanMetaDataManager ).build()
new TrackingEnabledStrategyBuilder( rawBeanMetaDataMap ).build()
);
this.trackingEnabledForReturnValues = CollectionHelper.toImmutableMap( new HashMap<>() );
this.trackingEnabledForParameters = CollectionHelper.toImmutableMap( new HashMap<>() );
}

private static class TrackingEnabledStrategyBuilder {
private final PredefinedScopeBeanMetaDataManager beanMetaDataManager;
private final Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap;
private final Map<Class<?>, Boolean> classToBeanTrackingEnabled;

TrackingEnabledStrategyBuilder(PredefinedScopeBeanMetaDataManager beanMetaDataManager) {
this.beanMetaDataManager = beanMetaDataManager;
this.classToBeanTrackingEnabled = new HashMap<>( beanMetaDataManager.getBeanMetaData().size() );
TrackingEnabledStrategyBuilder(Map<Class<?>, BeanMetaData<?>> rawBeanMetaDataMap) {
this.rawBeanMetaDataMap = rawBeanMetaDataMap;
this.classToBeanTrackingEnabled = CollectionHelper.newHashMap( rawBeanMetaDataMap.size() );
}

public Map<Class<?>, Boolean> build() {
final Set<Class<?>> beanClassesInPath = new HashSet<>();
for ( BeanMetaData<?> beanMetadata : beanMetaDataManager.getBeanMetaData() ) {
for ( BeanMetaData<?> beanMetadata : rawBeanMetaDataMap.values() ) {
determineTrackingRequired( beanMetadata.getBeanClass(), beanClassesInPath );
if ( !beanClassesInPath.isEmpty() ) {
throw new IllegalStateException( "beanClassesInPath not empty" );
Expand Down Expand Up @@ -160,38 +159,38 @@ private boolean determineTrackingRequired(Class<?> beanClass, Set<Class<?>> bean

// TODO: is there a more concise way to do this?
private <T> Set<Class<?>> getDirectCascadedBeanClasses(Class<T> beanClass ) {
final BeanMetaData<T> beanMetaData = beanMetaDataManager.getBeanMetaData( beanClass );
if ( beanMetaData.hasCascadables() ) {
final Set<Class<?>> directCascadedBeanClasses = new HashSet<>();
for ( Cascadable cascadable : beanMetaData.getCascadables() ) {
final CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();
if ( cascadingMetaData.isContainer() ) {
final ContainerCascadingMetaData containerCascadingMetaData = (ContainerCascadingMetaData) cascadingMetaData;
if ( containerCascadingMetaData.getEnclosingType() instanceof ParameterizedType ) {
ParameterizedType parameterizedType = (ParameterizedType) containerCascadingMetaData.getEnclosingType();
for ( Type typeArgument : parameterizedType.getActualTypeArguments() ) {
if ( typeArgument instanceof Class ) {
directCascadedBeanClasses.add( (Class<?>) typeArgument );
}
else {
throw new UnsupportedOperationException( "Only ParameterizedType values of type Class are supported" );
}
final BeanMetaData<?> beanMetaData = rawBeanMetaDataMap.get( beanClass );

if ( beanMetaData == null || !beanMetaData.hasCascadables() ) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering how to deal with beanMetaData == null. I'm glad to see that spelled out here.

return Collections.emptySet();
}

final Set<Class<?>> directCascadedBeanClasses = new HashSet<>();
for ( Cascadable cascadable : beanMetaData.getCascadables() ) {
final CascadingMetaData cascadingMetaData = cascadable.getCascadingMetaData();
if ( cascadingMetaData.isContainer() ) {
final ContainerCascadingMetaData containerCascadingMetaData = (ContainerCascadingMetaData) cascadingMetaData;
if ( containerCascadingMetaData.getEnclosingType() instanceof ParameterizedType ) {
ParameterizedType parameterizedType = (ParameterizedType) containerCascadingMetaData.getEnclosingType();
for ( Type typeArgument : parameterizedType.getActualTypeArguments() ) {
if ( typeArgument instanceof Class ) {
directCascadedBeanClasses.add( (Class<?>) typeArgument );
}
else {
throw new UnsupportedOperationException( "Only ParameterizedType values of type Class are supported" );
}
}
else {
throw new UnsupportedOperationException( "Non-parameterized containers are not supported yet." );
}
}
else {
// TODO: For now, assume non-container Cascadables are always beans. Truee???
directCascadedBeanClasses.add( (Class<?>) cascadable.getCascadableType() );
throw new UnsupportedOperationException( "Non-parameterized containers are not supported yet." );
}
}
return directCascadedBeanClasses;
}
else {
return Collections.emptySet();
else {
// TODO: For now, assume non-container Cascadables are always beans. Truee???
directCascadedBeanClasses.add( (Class<?>) cascadable.getCascadableType() );
}
}
return directCascadedBeanClasses;
}

private boolean register(Class<?> beanClass, boolean isBeanTrackingEnabled) {
Expand All @@ -212,21 +211,21 @@ public boolean isEnabledForBean(Class<?> rootBeanClass, boolean hasCascadables)
}

@Override
public boolean isEnabledForReturnValue(Executable executable, boolean hasCascadables) {
public boolean isEnabledForReturnValue(Signature signature, boolean hasCascadables) {
if ( !hasCascadables ) {
return false;
}

return trackingEnabledForReturnValues.getOrDefault( executable, true );
return trackingEnabledForReturnValues.getOrDefault( signature, true );
}

@Override
public boolean isEnabledForParameters(Executable executable, boolean hasCascadables) {
public boolean isEnabledForParameters(Signature signature, boolean hasCascadables) {
if ( !hasCascadables ) {
return false;
}

return trackingEnabledForParameters.getOrDefault( executable, true );
return trackingEnabledForParameters.getOrDefault( signature, true );
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...java/org/hibernate/validator/internal/engine/tracking/ProcessedBeansTrackingStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
*/
package org.hibernate.validator.internal.engine.tracking;

import java.lang.reflect.Executable;
import org.hibernate.validator.internal.properties.Signature;

public interface ProcessedBeansTrackingStrategy {

boolean isEnabledForBean(Class<?> beanClass, boolean hasCascadables);

boolean isEnabledForReturnValue(Executable executable, boolean hasCascadables);
boolean isEnabledForReturnValue(Signature signature, boolean hasCascadables);

boolean isEnabledForParameters(Executable executable, boolean hasCascadables);
boolean isEnabledForParameters(Signature signature, boolean hasCascadables);

void clear();
}
2 changes: 1 addition & 1 deletion ...java/org/hibernate/validator/internal/engine/validationcontext/BeanValidationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class BeanValidationContext<T> extends AbstractValidationContext<T> {
BeanMetaData<T> rootBeanMetaData
) {
super( constraintValidatorManager, constraintValidatorFactory, validatorScopedContext, traversableResolver, constraintValidatorInitializationContext,
rootBean, rootBeanClass, rootBeanMetaData, rootBeanMetaData.isTrackingRequired()
rootBean, rootBeanClass, rootBeanMetaData, rootBeanMetaData.isTrackingEnabled()
);
}

Expand Down
Loading