6
6
*/
7
7
package org .hibernate .validator .internal .metadata .aggregated ;
8
8
9
- import java .lang .reflect .Method ;
10
9
import java .lang .reflect .Type ;
11
- import java .security .AccessController ;
12
- import java .security .PrivilegedAction ;
13
10
import java .util .ArrayDeque ;
14
11
import java .util .Collections ;
15
12
import java .util .Deque ;
24
21
25
22
import javax .validation .ElementKind ;
26
23
27
- import org .hibernate .validator .HibernateValidatorPermission ;
28
24
import org .hibernate .validator .internal .engine .valueextraction .ValueExtractorManager ;
29
25
import org .hibernate .validator .internal .metadata .core .ConstraintHelper ;
30
26
import org .hibernate .validator .internal .metadata .core .MetaConstraint ;
44
40
import org .hibernate .validator .internal .properties .javabean .JavaBeanGetter ;
45
41
import org .hibernate .validator .internal .util .CollectionHelper ;
46
42
import org .hibernate .validator .internal .util .TypeResolutionHelper ;
47
- import org .hibernate .validator .internal .util .privilegedactions .GetDeclaredMethod ;
48
43
import org .hibernate .validator .internal .util .stereotypes .Immutable ;
49
44
50
45
/**
@@ -72,8 +67,7 @@ private PropertyMetaData(String propertyName,
72
67
Type type ,
73
68
Set <MetaConstraint <?>> constraints ,
74
69
Set <MetaConstraint <?>> containerElementsConstraints ,
75
- Set <Cascadable > cascadables ,
76
- boolean cascadingProperty ) {
70
+ Set <Cascadable > cascadables ) {
77
71
super (
78
72
propertyName ,
79
73
type ,
@@ -158,9 +152,8 @@ public static class Builder extends MetaDataBuilder {
158
152
);
159
153
160
154
private final String propertyName ;
161
- private final Map <Constrainable , Cascadable .Builder > cascadableBuilders = new HashMap <>();
155
+ private final Map <Property , Cascadable .Builder > cascadableBuilders = new HashMap <>();
162
156
private final Type propertyType ;
163
- private boolean cascadingProperty = false ;
164
157
165
158
public Builder (Class <?> beanClass , ConstrainedField constrainedProperty , ConstraintHelper constraintHelper , TypeResolutionHelper typeResolutionHelper ,
166
159
ValueExtractorManager valueExtractorManager ) {
@@ -207,8 +200,6 @@ public boolean accepts(ConstrainedElement constrainedElement) {
207
200
public final void add (ConstrainedElement constrainedElement ) {
208
201
super .add ( constrainedElement );
209
202
210
- cascadingProperty = cascadingProperty || constrainedElement .getCascadingMetaDataBuilder ().isCascading ();
211
-
212
203
if ( constrainedElement .getCascadingMetaDataBuilder ().isMarkedForCascadingOnAnnotatedObjectOrContainerElements () ||
213
204
constrainedElement .getCascadingMetaDataBuilder ().hasGroupConversionsOnAnnotatedObjectOrContainerElements () ) {
214
205
@@ -316,24 +307,6 @@ else if ( constrainedElement.getKind() == ConstrainedElementKind.METHOD ) {
316
307
return null ;
317
308
}
318
309
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
-
337
310
@ Override
338
311
public PropertyMetaData build () {
339
312
Set <Cascadable > cascadables = cascadableBuilders .values ()
@@ -346,8 +319,7 @@ public PropertyMetaData build() {
346
319
propertyType ,
347
320
adaptOriginsAndImplicitGroups ( getDirectConstraints () ),
348
321
adaptOriginsAndImplicitGroups ( getContainerElementConstraints () ),
349
- cascadables ,
350
- cascadingProperty
322
+ cascadables
351
323
);
352
324
}
353
325
}
0 commit comments