Skip to content

Commit fd29ae0

Browse files
jdamerowjdamerow
committed
Merge pull request #90 from diging/hotfix/v2.0.2
[CCP-139] updated Apache commons-lang to 3.4 and used new escape method
2 parents be131d6 + 09c014f commit fd29ae0

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

‎Conceptpower+Spring/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@
340340
<dependency>
341341
<groupId>org.apache.commons</groupId>
342342
<artifactId>commons-lang3</artifactId>
343-
<version>3.1</version>
343+
<version>3.4</version>
344344
</dependency>
345345

346346
<!-- Jackson JSON Mapper -->

‎Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLConceptMessage.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
5656
// lemma
5757
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
5858
+ XMLConstants.LEMMA + ">");
59-
sb.append(StringEscapeUtils.escapeXml(entry.getWord()));
59+
sb.append(StringEscapeUtils.escapeXml10(entry.getWord()));
6060
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
6161
+ XMLConstants.LEMMA + ">");
6262

@@ -70,53 +70,53 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
7070
// description
7171
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
7272
+ XMLConstants.DESCRIPTION + ">");
73-
sb.append(StringEscapeUtils.escapeXml(entry.getDescription()));
73+
sb.append(StringEscapeUtils.escapeXml10(entry.getDescription()));
7474
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
7575
+ XMLConstants.DESCRIPTION + ">");
7676

7777
// concept list
7878
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
7979
+ XMLConstants.CONCEPT_LIST + ">");
80-
sb.append(StringEscapeUtils.escapeXml(entry.getConceptList()));
80+
sb.append(StringEscapeUtils.escapeXml10(entry.getConceptList()));
8181
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
8282
+ XMLConstants.CONCEPT_LIST + ">");
8383

8484
// creator id
8585
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
8686
+ XMLConstants.CREATOR_ID + ">");
87-
sb.append(StringEscapeUtils.escapeXml(entry.getCreatorId() != null ? entry
87+
sb.append(StringEscapeUtils.escapeXml10(entry.getCreatorId() != null ? entry
8888
.getCreatorId().trim() : ""));
8989
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
9090
+ XMLConstants.CREATOR_ID + ">");
9191

9292
// equal to
9393
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
9494
+ XMLConstants.EQUAL_TO + ">");
95-
sb.append(StringEscapeUtils.escapeXml(entry.getEqualTo() != null ? entry
95+
sb.append(StringEscapeUtils.escapeXml10(entry.getEqualTo() != null ? entry
9696
.getEqualTo().trim() : ""));
9797
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
9898
+ XMLConstants.EQUAL_TO + ">");
9999

100100
// modified by
101101
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
102102
+ XMLConstants.MODIFIED_BY + ">");
103-
sb.append(StringEscapeUtils.escapeXml(entry.getModified() != null ? entry
103+
sb.append(StringEscapeUtils.escapeXml10(entry.getModified() != null ? entry
104104
.getModified().trim() : ""));
105105
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
106106
+ XMLConstants.MODIFIED_BY + ">");
107107

108108
// similar to
109109
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
110110
+ XMLConstants.SIMILAR_TO + ">");
111-
sb.append(StringEscapeUtils.escapeXml(entry.getSimilarTo() != null ? entry
111+
sb.append(StringEscapeUtils.escapeXml10(entry.getSimilarTo() != null ? entry
112112
.getSimilarTo().trim() : ""));
113113
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
114114
+ XMLConstants.SIMILAR_TO + ">");
115115

116116
// synonym ids
117117
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
118118
+ XMLConstants.SYNONYM_IDS + ">");
119-
sb.append(StringEscapeUtils.escapeXml(entry.getSynonymIds() != null ? entry
119+
sb.append(StringEscapeUtils.escapeXml10(entry.getSynonymIds() != null ? entry
120120
.getSynonymIds().trim() : ""));
121121
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
122122
+ XMLConstants.SYNONYM_IDS + ">");
@@ -132,7 +132,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
132132
}
133133
sb.append(">");
134134
if (type != null)
135-
sb.append(StringEscapeUtils.escapeXml(type.getTypeName()));
135+
sb.append(StringEscapeUtils.escapeXml10(type.getTypeName()));
136136
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
137137
+ XMLConstants.TYPE + ">");
138138

@@ -146,7 +146,7 @@ public String getEntry(ConceptEntry entry, ConceptType type) {
146146
// wordnet id
147147
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
148148
+ XMLConstants.WORDNET_ID + ">");
149-
sb.append(StringEscapeUtils.escapeXml(entry.getWordnetId() != null ? entry
149+
sb.append(StringEscapeUtils.escapeXml10(entry.getWordnetId() != null ? entry
150150
.getWordnetId().trim() : ""));
151151
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
152152
+ XMLConstants.WORDNET_ID + ">");

‎Conceptpower+Spring/src/main/java/edu/asu/conceptpower/xml/XMLTypeMessage.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,37 +43,37 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
4343
}
4444
sb.append(">");
4545
if (type != null)
46-
sb.append(StringEscapeUtils.escapeXml(type.getTypeName()));
46+
sb.append(StringEscapeUtils.escapeXml10(type.getTypeName()));
4747
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
4848
+ XMLConstants.TYPE + ">");
4949

5050
// type description
5151
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
5252
+ XMLConstants.DESCRIPTION + ">");
53-
sb.append(StringEscapeUtils.escapeXml(type.getDescription()));
53+
sb.append(StringEscapeUtils.escapeXml10(type.getDescription()));
5454
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
5555
+ XMLConstants.DESCRIPTION + ">");
5656

5757
// creator id
5858
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
5959
+ XMLConstants.CREATOR_ID + ">");
60-
sb.append(StringEscapeUtils.escapeXml(type.getCreatorId() != null ? type
60+
sb.append(StringEscapeUtils.escapeXml10(type.getCreatorId() != null ? type
6161
.getCreatorId().trim() : ""));
6262
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
6363
+ XMLConstants.CREATOR_ID + ">");
6464

6565
// matches
6666
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
6767
+ XMLConstants.MATCHES + ">");
68-
sb.append(StringEscapeUtils.escapeXml(type.getMatches() != null ? type
68+
sb.append(StringEscapeUtils.escapeXml10(type.getMatches() != null ? type
6969
.getMatches().trim() : ""));
7070
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
7171
+ XMLConstants.MATCHES + ">");
7272

7373
// modified by
7474
sb.append("<" + XMLConstants.NAMESPACE_PREFIX + ":"
7575
+ XMLConstants.MODIFIED_BY + ">");
76-
sb.append(StringEscapeUtils.escapeXml(type.getModified() != null ? type
76+
sb.append(StringEscapeUtils.escapeXml10(type.getModified() != null ? type
7777
.getModified().trim() : ""));
7878
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
7979
+ XMLConstants.MODIFIED_BY + ">");
@@ -89,7 +89,7 @@ public List<String> appendEntry(ConceptType type, ConceptType supertype) {
8989
+ uriCreator.getTypeURI(supertype) + "\"");
9090

9191
sb.append(">");
92-
sb.append(StringEscapeUtils.escapeXml(supertype.getTypeName()));
92+
sb.append(StringEscapeUtils.escapeXml10(supertype.getTypeName()));
9393
sb.append("</" + XMLConstants.NAMESPACE_PREFIX + ":"
9494
+ XMLConstants.SUPERTYPE + ">");
9595
}

0 commit comments

Comments
 (0)