1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From: Markus Koschany <apo@debian.org>
Date: Tue, 24 May 2022 00:53:54 +0200
Subject: Whitelist is Safelist
Fix FTBFS with jsoup 1.15.1.
Forwarded: no
---
.../constraintvalidators/hv/SafeHtmlValidator.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
index 7fba356..59fe5c7 100644
--- a/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
+++ b/engine/src/main/java/org/hibernate/validator/internal/constraintvalidators/hv/SafeHtmlValidator.java
@@ -15,7 +15,7 @@
import org.jsoup.nodes.Element;
import org.jsoup.parser.Parser;
import org.jsoup.safety.Cleaner;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
import org.hibernate.validator.constraints.SafeHtml;
@@ -28,25 +28,25 @@
* @author Hardy Ferentschik
*/
public class SafeHtmlValidator implements ConstraintValidator<SafeHtml, CharSequence> {
- private Whitelist whitelist;
+ private Safelist whitelist;
@Override
public void initialize(SafeHtml safeHtmlAnnotation) {
switch ( safeHtmlAnnotation.whitelistType() ) {
case BASIC:
- whitelist = Whitelist.basic();
+ whitelist = Safelist.basic();
break;
case BASIC_WITH_IMAGES:
- whitelist = Whitelist.basicWithImages();
+ whitelist = Safelist.basicWithImages();
break;
case NONE:
- whitelist = Whitelist.none();
+ whitelist = Safelist.none();
break;
case RELAXED:
- whitelist = Whitelist.relaxed();
+ whitelist = Safelist.relaxed();
break;
case SIMPLE_TEXT:
- whitelist = Whitelist.simpleText();
+ whitelist = Safelist.simpleText();
break;
}
whitelist.addTags( safeHtmlAnnotation.additionalTags() );
|
