Skip to content

Commit 4c8d377

Browse files
committed
HV-1363 More naming consistency
1 parent 254537e commit 4c8d377

11 files changed

+12
-12
lines changed

engine/src/main/java/org/hibernate/validator/internal/cfg/context/ConstraintMappingContextImplBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private <A extends Annotation> MetaConstraint<A> asMetaConstraint(ConfiguredCons
7373
TypeResolutionHelper typeResolutionHelper, ValueExtractorManager valueExtractorManager) {
7474
ConstraintDescriptorImpl<A> constraintDescriptor = new ConstraintDescriptorImpl<A>(
7575
constraintHelper,
76-
config.getLocation().getMember(),
76+
config.getLocation().getConstrainable(),
7777
config.createAnnotationDescriptor(),
7878
config.getLocation().getKind(),
7979
getConstraintType()

engine/src/main/java/org/hibernate/validator/internal/cfg/context/ContainerElementConstraintMappingContextImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ private <A extends Annotation> MetaConstraint<A> asMetaConstraint(ConfiguredCons
237237
TypeResolutionHelper typeResolutionHelper, ValueExtractorManager valueExtractorManager) {
238238
ConstraintDescriptorImpl<A> constraintDescriptor = new ConstraintDescriptorImpl<>(
239239
constraintHelper,
240-
config.getLocation().getMember(),
240+
config.getLocation().getConstrainable(),
241241
config.createAnnotationDescriptor(),
242242
config.getLocation().getKind(),
243243
getConstraintType()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private <A extends Annotation> MetaConstraint<A> adaptOriginAndImplicitGroup(Met
129129

130130
ConstraintDescriptorImpl<A> descriptor = new ConstraintDescriptorImpl<>(
131131
constraintHelper,
132-
constraint.getLocation().getMember(),
132+
constraint.getLocation().getConstrainable(),
133133
constraint.getDescriptor().getAnnotationDescriptor(),
134134
constraint.getConstraintLocationKind(),
135135
constraintClass.isInterface() ? constraintClass : null,

engine/src/main/java/org/hibernate/validator/internal/metadata/location/BeanConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Class<?> getDeclaringClass() {
4848
}
4949

5050
@Override
51-
public Constrainable getMember() {
51+
public Constrainable getConstrainable() {
5252
return null;
5353
}
5454

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ static ConstraintLocation forParameter(Callable callable, int index) {
6969
*
7070
* @return the member represented by this location. Will be {@code null} when this location represents a type.
7171
*/
72-
Constrainable getMember();
72+
Constrainable getConstrainable();
7373

7474
/**
7575
* Returns the type to be used when resolving constraint validators for constraints at this location. Note that this

engine/src/main/java/org/hibernate/validator/internal/metadata/location/CrossParameterConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public Class<?> getDeclaringClass() {
4040
}
4141

4242
@Override
43-
public Constrainable getMember() {
43+
public Constrainable getConstrainable() {
4444
return callable;
4545
}
4646

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ParameterConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public Class<?> getDeclaringClass() {
4444
}
4545

4646
@Override
47-
public Constrainable getMember() {
47+
public Constrainable getConstrainable() {
4848
return callable;
4949
}
5050

engine/src/main/java/org/hibernate/validator/internal/metadata/location/PropertyConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Class<?> getDeclaringClass() {
3636
}
3737

3838
@Override
39-
public Constrainable getMember() {
39+
public Constrainable getConstrainable() {
4040
return property;
4141
}
4242

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ReturnValueConstraintLocation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public Class<?> getDeclaringClass() {
4141
}
4242

4343
@Override
44-
public Constrainable getMember() {
44+
public Constrainable getConstrainable() {
4545
return callable;
4646
}
4747

engine/src/main/java/org/hibernate/validator/internal/metadata/location/TypeArgumentConstraintLocation.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public Class<?> getDeclaringClass() {
5252
}
5353

5454
@Override
55-
public Constrainable getMember() {
56-
return delegate.getMember();
55+
public Constrainable getConstrainable() {
56+
return delegate.getConstrainable();
5757
}
5858

5959
public TypeVariable<?> getTypeParameter() {

engine/src/main/java/org/hibernate/validator/internal/xml/mapping/ConstraintTypeStaxBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <A extends Annotation> MetaConstraint<A> build(ConstraintLocation constraintLoca
150150
// we set initially ConstraintOrigin.DEFINED_LOCALLY for all xml configured constraints
151151
// later we will make copies of this constraint descriptor when needed and adjust the ConstraintOrigin
152152
ConstraintDescriptorImpl<A> constraintDescriptor = new ConstraintDescriptorImpl<>(
153-
constraintHelper, constraintLocation.getMember(), annotationDescriptor, kind, constraintType
153+
constraintHelper, constraintLocation.getConstrainable(), annotationDescriptor, kind, constraintType
154154
);
155155

156156
return MetaConstraints.create( typeResolutionHelper, valueExtractorManager, constraintDescriptor, constraintLocation );

0 commit comments

Comments
 (0)