Skip to content

Commit 3063210

Browse files
marko-bekhtagsmet
authored andcommitted
HV-1623 Clean up property metadata
- changed Constrainable to Property to better represent the intended objects to be processed by the builder - removed unused parameters, fields and methods
1 parent dbffeba commit 3063210

File tree

1 file changed

+3
-31
lines changed

1 file changed

+3
-31
lines changed

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/PropertyMetaData.java

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
*/
77
package org.hibernate.validator.internal.metadata.aggregated;
88

9-
import java.lang.reflect.Method;
109
import java.lang.reflect.Type;
11-
import java.security.AccessController;
12-
import java.security.PrivilegedAction;
1310
import java.util.ArrayDeque;
1411
import java.util.Collections;
1512
import java.util.Deque;
@@ -24,7 +21,6 @@
2421

2522
import javax.validation.ElementKind;
2623

27-
import org.hibernate.validator.HibernateValidatorPermission;
2824
import org.hibernate.validator.internal.engine.valueextraction.ValueExtractorManager;
2925
import org.hibernate.validator.internal.metadata.core.ConstraintHelper;
3026
import org.hibernate.validator.internal.metadata.core.MetaConstraint;
@@ -44,7 +40,6 @@
4440
import org.hibernate.validator.internal.properties.javabean.JavaBeanGetter;
4541
import org.hibernate.validator.internal.util.CollectionHelper;
4642
import org.hibernate.validator.internal.util.TypeResolutionHelper;
47-
import org.hibernate.validator.internal.util.privilegedactions.GetDeclaredMethod;
4843
import org.hibernate.validator.internal.util.stereotypes.Immutable;
4944

5045
/**
@@ -72,8 +67,7 @@ private PropertyMetaData(String propertyName,
7267
Type type,
7368
Set<MetaConstraint<?>> constraints,
7469
Set<MetaConstraint<?>> containerElementsConstraints,
75-
Set<Cascadable> cascadables,
76-
boolean cascadingProperty) {
70+
Set<Cascadable> cascadables) {
7771
super(
7872
propertyName,
7973
type,
@@ -158,9 +152,8 @@ public static class Builder extends MetaDataBuilder {
158152
);
159153

160154
private final String propertyName;
161-
private final Map<Constrainable, Cascadable.Builder> cascadableBuilders = new HashMap<>();
155+
private final Map<Property, Cascadable.Builder> cascadableBuilders = new HashMap<>();
162156
private final Type propertyType;
163-
private boolean cascadingProperty = false;
164157

165158
public Builder(Class<?> beanClass, ConstrainedField constrainedProperty, ConstraintHelper constraintHelper, TypeResolutionHelper typeResolutionHelper,
166159
ValueExtractorManager valueExtractorManager) {
@@ -207,8 +200,6 @@ public boolean accepts(ConstrainedElement constrainedElement) {
207200
public final void add(ConstrainedElement constrainedElement) {
208201
super.add( constrainedElement );
209202

210-
cascadingProperty = cascadingProperty || constrainedElement.getCascadingMetaDataBuilder().isCascading();
211-
212203
if ( constrainedElement.getCascadingMetaDataBuilder().isMarkedForCascadingOnAnnotatedObjectOrContainerElements() ||
213204
constrainedElement.getCascadingMetaDataBuilder().hasGroupConversionsOnAnnotatedObjectOrContainerElements() ) {
214205

@@ -316,24 +307,6 @@ else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
316307
return null;
317308
}
318309

319-
/**
320-
* Returns an accessible copy of the given member.
321-
*/
322-
private Method getAccessible(Method original) {
323-
SecurityManager sm = System.getSecurityManager();
324-
if ( sm != null ) {
325-
sm.checkPermission( HibernateValidatorPermission.ACCESS_PRIVATE_MEMBERS );
326-
}
327-
328-
Class<?> clazz = original.getDeclaringClass();
329-
330-
return run( GetDeclaredMethod.andMakeAccessible( clazz, original.getName() ) );
331-
}
332-
333-
private <T> T run(PrivilegedAction<T> action) {
334-
return System.getSecurityManager() != null ? AccessController.doPrivileged( action ) : action.run();
335-
}
336-
337310
@Override
338311
public PropertyMetaData build() {
339312
Set<Cascadable> cascadables = cascadableBuilders.values()
@@ -346,8 +319,7 @@ public PropertyMetaData build() {
346319
propertyType,
347320
adaptOriginsAndImplicitGroups( getDirectConstraints() ),
348321
adaptOriginsAndImplicitGroups( getContainerElementConstraints() ),
349-
cascadables,
350-
cascadingProperty
322+
cascadables
351323
);
352324
}
353325
}

0 commit comments

Comments
 (0)