Skip to content
This repository was archived by the owner on Dec 19, 2023. It is now read-only.

Commit b492dab

Browse files
authored
removed hibernate-validator as transitive dep (#128)
1 parent beb513e commit b492dab

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,9 @@
238238
<version>1.13.6.RELEASE</version>
239239
</dependency>
240240
<dependency>
241-
<groupId>org.hibernate</groupId>
242-
<artifactId>hibernate-validator</artifactId>
243-
<version>5.3.4.Final</version>
241+
<groupId>javax.validation</groupId>
242+
<artifactId>validation-api</artifactId>
243+
<version>1.1.0.Final</version>
244244
</dependency>
245245
<dependency>
246246
<groupId>org.apache.commons</groupId>

spring-auto-restdocs-core/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,15 @@
5151
<groupId>org.springframework.data</groupId>
5252
<artifactId>spring-data-commons</artifactId>
5353
</dependency>
54+
<dependency>
55+
<groupId>javax.validation</groupId>
56+
<artifactId>validation-api</artifactId>
57+
</dependency>
5458
<dependency>
5559
<groupId>org.hibernate</groupId>
5660
<artifactId>hibernate-validator</artifactId>
61+
<version>5.3.4.Final</version>
62+
<scope>test</scope>
5763
</dependency>
5864
<dependency>
5965
<groupId>org.apache.commons</groupId>

spring-auto-restdocs-core/src/main/java/capital/scalable/restdocs/constraints/SkippableConstraintResolver.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,35 @@
1616

1717
package capital.scalable.restdocs.constraints;
1818

19-
import javax.validation.constraints.NotNull;
2019
import java.util.ArrayList;
20+
import java.util.Arrays;
2121
import java.util.Collection;
2222
import java.util.Collections;
2323
import java.util.List;
2424

25-
import org.hibernate.validator.constraints.NotBlank;
26-
import org.hibernate.validator.constraints.NotEmpty;
2725
import org.springframework.core.MethodParameter;
2826
import org.springframework.restdocs.constraints.Constraint;
2927

28+
3029
class SkippableConstraintResolver implements MethodParameterConstraintResolver {
31-
public static final Class<?>[] MANDATORY_VALUE_ANNOTATIONS =
32-
{NotNull.class, NotEmpty.class, NotBlank.class};
30+
public static final Collection<String> MANDATORY_VALUE_ANNOTATIONS = Arrays.asList(
31+
new String[]{
32+
"javax.validation.constraints.NotNull",
33+
"org.hibernate.validator.constraints.NotBlank",
34+
"org.hibernate.validator.constraints.NotEmpty"
35+
});
3336

3437
private final MethodParameterConstraintResolver delegate;
3538
private final GroupDescriptionResolver descriptionResolver;
36-
private final Collection<String> skippableConstraints;
3739

3840
public SkippableConstraintResolver(MethodParameterConstraintResolver delegate,
3941
GroupDescriptionResolver descriptionResolver) {
4042
this.delegate = delegate;
4143
this.descriptionResolver = descriptionResolver;
42-
this.skippableConstraints = new ArrayList<>();
43-
for (Class<?> a : MANDATORY_VALUE_ANNOTATIONS) {
44-
this.skippableConstraints.add(a.getCanonicalName());
45-
}
4644
}
4745

4846
private boolean isSkippable(Constraint constraint) {
49-
return skippableConstraints.contains(constraint.getName());
47+
return MANDATORY_VALUE_ANNOTATIONS.contains(constraint.getName());
5048
}
5149

5250
@Override

0 commit comments

Comments
 (0)