Skip to content

Commit 05815d6

Browse files
scothisscothis
committed
applying spring:url best practices
1 parent eb89752 commit 05815d6

File tree

8 files changed

+26
-17
lines changed

8 files changed

+26
-17
lines changed

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/dataAccessFailure.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ ex.printStackTrace(new java.io.PrintWriter(out));
1414

1515
<p/>
1616
<br/>
17-
<a href="<spring:url value="/welcome.do"/>">Home</a>
17+
<a href="<spring:url value="/welcome" escapeXml="true" />">Home</a>
1818

1919
<%@ include file="/WEB-INF/jsp/footer.jsp" %>

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/findOwners.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<h2>Find Owners:</h2>
55

66
<spring:url value="/clinic/owners" var="formUrl"/>
7-
<form:form modelAttribute="owner" action="${formUrl}" method="GET">
7+
<form:form modelAttribute="owner" action="${fn:escapeXml(formUrl)}" method="get">
88
<table>
99
<tr>
1010
<th>
@@ -20,6 +20,6 @@
2020
</form:form>
2121

2222
<br/>
23-
<a href='<spring:url value="/clinic/owners/new"/>'>Add Owner</a>
23+
<a href='<spring:url value="/clinic/owners/new" escapeXml="true"/>'>Add Owner</a>
2424

2525
<%@ include file="/WEB-INF/jsp/footer.jsp" %>

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/footer.jsp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<table class="footer">
33
<tr>
4-
<td><a href="<spring:url value="/clinic/welcome"/>">Home</a></td>
5-
<td align="right"><img src="<spring:url value="/images/springsource-logo.png"/>" alt="Sponsored by SpringSource"/></td>
4+
<td><a href="<spring:url value="/clinic/welcome" escapeXml="true" />">Home</a></td>
5+
<td align="right"><img src="<spring:url value="/images/springsource-logo.png" escapeXml="true" />" alt="Sponsored by SpringSource"/></td>
66
</tr>
77
</table>
88

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/header.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<head>
77
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
8-
<link rel="stylesheet" href="<spring:url value="/styles/petclinic.css"/>" type="text/css"/>
8+
<link rel="stylesheet" href="<spring:url value="/styles/petclinic.css" escapeXml="true" />" type="text/css"/>
99
<title>PetClinic :: a Spring Framework demonstration</title>
1010
</head>
1111

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/includes.jsp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
33
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
44
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
5+
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owner.jsp

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,16 @@
2424
<table class="table-buttons">
2525
<tr>
2626
<td colspan="2" align="center">
27-
<a href="<spring:url value="${owner.id}/edit"/>">Edit Owner</a>
27+
<spring:url value="{ownerId}/edit" var="editUrl">
28+
<spring:param name="ownerId" value="${owner.id}" />
29+
</spring:url>
30+
<a href="${fn:escapeXml(editUrl)}">Edit Owner</a>
2831
</td>
2932
<td>
30-
<a href="<spring:url value="${owner.id}/pets/new"/>">Add New Pet</a>
33+
<spring:url value="{ownerId}/pets/new" var="addUrl">
34+
<spring:param name="ownerId" value="${owner.id}" />
35+
</spring:url>
36+
<a href="${fn:escapeXml(addUrl)}">Add New Pet</a>
3137
</td>
3238
</tr>
3339
</table>
@@ -74,17 +80,19 @@
7480
<table class="table-buttons">
7581
<tr>
7682
<td>
77-
<spring:url value="${owner.id}/pets/{petId}" var="petUrl">
83+
<spring:url value="{ownerId}/pets/{petId}" var="petUrl">
84+
<spring:param name="ownerId" value="${owner.id}"/>
7885
<spring:param name="petId" value="${pet.id}"/>
7986
</spring:url>
80-
<a href="${petUrl}">Edit Pet</a>
87+
<a href="${fn:escapeXml(petUrl)}">Edit Pet</a>
8188
</td>
8289
<td></td>
8390
<td>
84-
<spring:url value="${owner.id}/pets/{petId}/visits/new" var="visitUrl">
91+
<spring:url value="{ownerId}/pets/{petId}/visits/new" var="visitUrl">
92+
<spring:param name="ownerId" value="${owner.id}"/>
8593
<spring:param name="petId" value="${pet.id}"/>
8694
</spring:url>
87-
<a href="${visitUrl}">Add Visit</a>
95+
<a href="${fn:escapeXml(visitUrl)}">Add Visit</a>
8896
</td>
8997
</tr>
9098
</table>

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/owners.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<spring:url value="owners/{ownerId}" var="ownerUrl">
2020
<spring:param name="ownerId" value="${owner.id}"/>
2121
</spring:url>
22-
<a href="${ownerUrl}">${owner.firstName} ${owner.lastName}</a>
22+
<a href="${fn:escapeXml(ownerUrl)}">${owner.firstName} ${owner.lastName}</a>
2323
</td>
2424
<td>${owner.address}</td>
2525
<td>${owner.city}</td>

‎org.springframework.samples.petclinic/src/main/webapp/WEB-INF/jsp/welcome.jsp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<%@ include file="/WEB-INF/jsp/includes.jsp" %>
22
<%@ include file="/WEB-INF/jsp/header.jsp" %>
33

4-
<img src="<spring:url value="/images/pets.png"/>" align="right" style="position:relative;right:30px;">
4+
<img src="<spring:url value="/images/pets.png" escapeXml="true" />" align="right" style="position:relative;right:30px;">
55
<h2><fmt:message key="welcome"/></h2>
66

77
<ul>
8-
<li><a href="<spring:url value="/clinic/owners/form"/>">Find owner</a></li>
9-
<li><a href="<spring:url value="/clinic/vets"/>">Display all veterinarians</a></li>
10-
<li><a href="<spring:url value="/html/petclinic.html"/>">Tutorial</a></li>
8+
<li><a href="<spring:url value="/clinic/owners/form" escapeXml="true" />">Find owner</a></li>
9+
<li><a href="<spring:url value="/clinic/vets" escapeXml="true" />">Display all veterinarians</a></li>
10+
<li><a href="<spring:url value="/html/petclinic.html" escapeXml="true" />">Tutorial</a></li>
1111
</ul>
1212

1313
<p>&nbsp;</p>

0 commit comments

Comments
 (0)