Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-02-13 14:20:07 +01:00
parent f93ca28884
commit 0030ff8711
12 changed files with 83 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-web/src/main/java/org/springframework/web/util/HtmlCharacterEntityReferences.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import org.springframework.util.Assert;
/**
* Represents a set of character entity references defined by the
* HTML 4.0 standard.
@@ -87,8 +85,9 @@ class HtmlCharacterEntityReferences {
while (keys.hasMoreElements()) {
String key = (String) keys.nextElement();
int referredChar = Integer.parseInt(key);
Assert.isTrue((referredChar < 1000 || (referredChar >= 8000 && referredChar < 10000)),
"Invalid reference to special HTML entity: " + referredChar);
if (!(referredChar < 1000 || (referredChar >= 8000 && referredChar < 10000))) {
throw new IllegalArgumentException("Invalid reference to special HTML entity: " + referredChar);
}
int index = (referredChar < 1000 ? referredChar : referredChar - 7000);
String reference = entityReferences.getProperty(key);
this.characterToEntityReferenceMap[index] = REFERENCE_START + reference + REFERENCE_END;
@@ -119,14 +118,14 @@ class HtmlCharacterEntityReferences {
}
/**
* Return the reference mapped to the given character or {@code null}.
* Return the reference mapped to the given character, or {@code null} if none found.
*/
public String convertToReference(char character) {
return convertToReference(character, WebUtils.DEFAULT_CHARACTER_ENCODING);
}
/**
* Return the reference mapped to the given character or {@code null}.
* Return the reference mapped to the given character, or {@code null} if none found.
* @since 4.1.2
*/
public String convertToReference(char character, String encoding) {