Skip to content

Commit bf6ebbf

Browse files
arturobernalgarturobernalg
committed
Use try-with-resources.
1 parent 37bf553 commit bf6ebbf

19 files changed

+229
-201
lines changed

‎jspwiki-main/src/main/java/org/apache/wiki/search/LuceneSearchProvider.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -498,8 +498,9 @@ public Collection< SearchResult > findPages( final String query, final int flags
498498

499499
String[] fragments = new String[ 0 ];
500500
if( text != null && highlighter != null ) {
501-
final TokenStream tokenStream = getLuceneAnalyzer().tokenStream( LUCENE_PAGE_CONTENTS, new StringReader( text ) );
502-
fragments = highlighter.getBestFragments( tokenStream, text, MAX_FRAGMENTS );
501+
try (TokenStream tokenStream = getLuceneAnalyzer().tokenStream(LUCENE_PAGE_CONTENTS, new StringReader(text))) {
502+
fragments = highlighter.getBestFragments(tokenStream, text, MAX_FRAGMENTS);
503+
}
503504
}
504505

505506
final SearchResult result = new SearchResultImpl( page, score, fragments );

‎jspwiki-main/src/main/java/org/apache/wiki/tags/AttachmentsIteratorTag.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public final int doStartTag() {
108108
public final int doAfterBody() {
109109
if( bodyContent != null ) {
110110
try {
111-
final JspWriter out = getPreviousOut();
111+
JspWriter out = getPreviousOut();
112112
out.print(bodyContent.getString());
113113
bodyContent.clearBody();
114114
} catch( final IOException e ) {

‎jspwiki-main/src/main/java/org/apache/wiki/tags/DiffLinkTag.java‎

Lines changed: 41 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -93,52 +93,53 @@ public final int doWikiStartTag() throws IOException {
9393
}
9494
}
9595

96-
final JspWriter out = pageContext.getOut();
96+
try (JspWriter out = pageContext.getOut()) {
9797

98-
int r1;
99-
int r2;
98+
int r1;
99+
int r2;
100100

101-
// In case the page does not exist, we fail silently.
102-
if( !engine.getManager( PageManager.class ).wikiPageExists( pageName ) ) {
103-
return SKIP_BODY;
104-
}
105-
106-
if( VER_LATEST.equals( getVersion() ) ) {
107-
final Page latest = engine.getManager( PageManager.class ).getPage( pageName, WikiProvider.LATEST_VERSION );
108-
if( latest == null ) {
109-
// This may occur if matchEnglishPlurals is on, and we access the wrong page name
101+
// In case the page does not exist, we fail silently.
102+
if (!engine.getManager(PageManager.class).wikiPageExists(pageName)) {
110103
return SKIP_BODY;
111104
}
112-
r1 = latest.getVersion();
113-
} else if( VER_PREVIOUS.equals( getVersion() ) ) {
114-
r1 = m_wikiContext.getPage().getVersion() - 1;
115-
r1 = Math.max( r1, 1 );
116-
} else if( VER_CURRENT.equals( getVersion() ) ) {
117-
r1 = m_wikiContext.getPage().getVersion();
118-
} else {
119-
r1 = Integer.parseInt( getVersion() );
120-
}
121105

122-
if( VER_LATEST.equals( getNewVersion() ) ) {
123-
final Page latest = engine.getManager( PageManager.class ).getPage( pageName, WikiProvider.LATEST_VERSION );
124-
r2 = latest.getVersion();
125-
} else if( VER_PREVIOUS.equals( getNewVersion() ) ) {
126-
r2 = m_wikiContext.getPage().getVersion() - 1;
127-
r2 = Math.max( r2, 1 );
128-
} else if( VER_CURRENT.equals( getNewVersion() ) ) {
129-
r2 = m_wikiContext.getPage().getVersion();
130-
} else {
131-
r2 = Integer.parseInt( getNewVersion() );
132-
}
106+
if (VER_LATEST.equals(getVersion())) {
107+
final Page latest = engine.getManager(PageManager.class).getPage(pageName, WikiProvider.LATEST_VERSION);
108+
if (latest == null) {
109+
// This may occur if matchEnglishPlurals is on, and we access the wrong page name
110+
return SKIP_BODY;
111+
}
112+
r1 = latest.getVersion();
113+
} else if (VER_PREVIOUS.equals(getVersion())) {
114+
r1 = m_wikiContext.getPage().getVersion() - 1;
115+
r1 = Math.max(r1, 1);
116+
} else if (VER_CURRENT.equals(getVersion())) {
117+
r1 = m_wikiContext.getPage().getVersion();
118+
} else {
119+
r1 = Integer.parseInt(getVersion());
120+
}
133121

134-
final String url = m_wikiContext.getURL( ContextEnum.PAGE_DIFF.getRequestContext(), pageName, "r1="+r1+"&amp;r2="+r2 );
135-
switch( m_format ) {
136-
case ANCHOR:
137-
out.print("<a href=\""+url+"\">");
138-
break;
139-
case URL:
140-
out.print( url );
141-
break;
122+
if (VER_LATEST.equals(getNewVersion())) {
123+
final Page latest = engine.getManager(PageManager.class).getPage(pageName, WikiProvider.LATEST_VERSION);
124+
r2 = latest.getVersion();
125+
} else if (VER_PREVIOUS.equals(getNewVersion())) {
126+
r2 = m_wikiContext.getPage().getVersion() - 1;
127+
r2 = Math.max(r2, 1);
128+
} else if (VER_CURRENT.equals(getNewVersion())) {
129+
r2 = m_wikiContext.getPage().getVersion();
130+
} else {
131+
r2 = Integer.parseInt(getNewVersion());
132+
}
133+
134+
final String url = m_wikiContext.getURL(ContextEnum.PAGE_DIFF.getRequestContext(), pageName, "r1=" + r1 + "&amp;r2=" + r2);
135+
switch (m_format) {
136+
case ANCHOR:
137+
out.print("<a href=\"" + url + "\">");
138+
break;
139+
case URL:
140+
out.print(url);
141+
break;
142+
}
142143
}
143144

144145
return EVAL_BODY_INCLUDE;

‎jspwiki-main/src/main/java/org/apache/wiki/tags/EditLinkTag.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,16 @@ public final int doWikiStartTag() throws IOException {
111111
//
112112
// Finally, print out the correct link, according to what user commanded.
113113
//
114-
final JspWriter out = pageContext.getOut();
115-
switch( m_format ) {
116-
case ANCHOR:
117-
out.print( "<a href=\"" + m_wikiContext.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), pageName, versionString ) +
118-
"\" accesskey=\"" + m_accesskey + "\" title=\"" + m_title + "\">" );
119-
break;
120-
case URL:
121-
out.print( m_wikiContext.getURL( ContextEnum.PAGE_EDIT.getRequestContext(), pageName, versionString ) );
122-
break;
114+
try (JspWriter out = pageContext.getOut()) {
115+
switch (m_format) {
116+
case ANCHOR:
117+
out.print("<a href=\"" + m_wikiContext.getURL(ContextEnum.PAGE_EDIT.getRequestContext(), pageName, versionString) +
118+
"\" accesskey=\"" + m_accesskey + "\" title=\"" + m_title + "\">");
119+
break;
120+
case URL:
121+
out.print(m_wikiContext.getURL(ContextEnum.PAGE_EDIT.getRequestContext(), pageName, versionString));
122+
break;
123+
}
123124
}
124125

125126
return EVAL_BODY_INCLUDE;

‎jspwiki-main/src/main/java/org/apache/wiki/tags/HistoryIteratorTag.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ public final int doStartTag() {
8989
public final int doAfterBody() {
9090
if( bodyContent != null ) {
9191
try {
92-
final JspWriter out = getPreviousOut();
93-
out.print(bodyContent.getString());
92+
try (JspWriter out = getPreviousOut()) {
93+
out.print(bodyContent.getString());
94+
}
9495
bodyContent.clearBody();
9596
} catch( final IOException e ) {
9697
LOG.error("Unable to get inner tag text", e);

‎jspwiki-main/src/main/java/org/apache/wiki/tags/InsertDiffTag.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,15 @@ public final int doWikiStartTag() throws IOException {
9696
LOG.debug("Request diff between version "+verold+" and "+vernew);
9797

9898
if( ctx.getPage() != null ) {
99-
final JspWriter out = pageContext.getOut();
100-
final String diff = engine.getManager( DifferenceManager.class ).getDiff( ctx, vernew, verold);
99+
try (JspWriter out = pageContext.getOut()) {
100+
final String diff = engine.getManager(DifferenceManager.class).getDiff(ctx, vernew, verold);
101101

102-
if( diff.isEmpty() ) {
103-
return EVAL_BODY_INCLUDE;
104-
}
102+
if (diff.isEmpty()) {
103+
return EVAL_BODY_INCLUDE;
104+
}
105105

106-
out.write( diff );
106+
out.write(diff);
107+
}
107108
}
108109

109110
return SKIP_BODY;

‎jspwiki-main/src/main/java/org/apache/wiki/tags/InsertPageTag.java‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,20 @@ public final int doWikiStartTag() throws IOException, ProviderException {
110110

111111
LOG.debug("Inserting page "+insertedPage);
112112

113-
final JspWriter out = pageContext.getOut();
114-
final Page oldPage = m_wikiContext.setRealPage( insertedPage );
115-
116-
switch( m_mode ) {
117-
case HTML: out.print( engine.getManager( RenderingManager.class ).getHTML( m_wikiContext, insertedPage ) ); break;
118-
case PLAIN: out.print( engine.getManager( PageManager.class ).getText( insertedPage ) ); break;
113+
final Page oldPage;
114+
try (JspWriter out = pageContext.getOut()) {
115+
oldPage = m_wikiContext.setRealPage(insertedPage);
116+
117+
switch (m_mode) {
118+
case HTML:
119+
out.print(engine.getManager(RenderingManager.class).getHTML(m_wikiContext, insertedPage));
120+
break;
121+
case PLAIN:
122+
out.print(engine.getManager(PageManager.class).getText(insertedPage));
123+
break;
124+
}
119125
}
120-
126+
121127
m_wikiContext.setRealPage( oldPage );
122128
}
123129

‎jspwiki-main/src/main/java/org/apache/wiki/tags/IteratorTag.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ public int doEndTag() {
131131
public int doAfterBody() {
132132
if( bodyContent != null ) {
133133
try {
134-
final JspWriter out = getPreviousOut();
135-
out.print( bodyContent.getString() );
134+
try (JspWriter out = getPreviousOut()) {
135+
out.print(bodyContent.getString());
136+
}
136137
bodyContent.clearBody();
137138
} catch( final IOException e ) {
138139
LOG.error( "Unable to get inner tag text", e );

‎jspwiki-main/src/main/java/org/apache/wiki/tags/LinkTag.java‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -335,41 +335,42 @@ public int doWikiStartTag() throws Exception {
335335
public int doEndTag() {
336336
try {
337337
final Engine engine = m_wikiContext.getEngine();
338-
final JspWriter out = pageContext.getOut();
339-
final String url = figureOutURL();
338+
try (JspWriter out = pageContext.getOut()) {
339+
final String url = figureOutURL();
340340

341-
final StringBuilder sb = new StringBuilder( 20 );
341+
final StringBuilder sb = new StringBuilder(20);
342342

343-
sb.append( (m_cssClass != null) ? "class=\""+m_cssClass+"\" " : "" );
344-
sb.append( (m_style != null) ? "style=\""+m_style+"\" " : "" );
345-
sb.append( (m_target != null ) ? "target=\""+m_target+"\" " : "" );
346-
sb.append( (m_title != null ) ? "title=\""+m_title+"\" " : "" );
347-
sb.append( (m_rel != null ) ? "rel=\""+m_rel+"\" " : "" );
348-
sb.append( (m_accesskey != null) ? "accesskey=\""+m_accesskey+"\" " : "" );
349-
sb.append( (m_tabindex != null) ? "tabindex=\""+m_tabindex+"\" " : "" );
343+
sb.append((m_cssClass != null) ? "class=\"" + m_cssClass + "\" " : "");
344+
sb.append((m_style != null) ? "style=\"" + m_style + "\" " : "");
345+
sb.append((m_target != null) ? "target=\"" + m_target + "\" " : "");
346+
sb.append((m_title != null) ? "title=\"" + m_title + "\" " : "");
347+
sb.append((m_rel != null) ? "rel=\"" + m_rel + "\" " : "");
348+
sb.append((m_accesskey != null) ? "accesskey=\"" + m_accesskey + "\" " : "");
349+
sb.append((m_tabindex != null) ? "tabindex=\"" + m_tabindex + "\" " : "");
350350

351-
if( engine.getManager( PageManager.class ).getPage( m_pageName ) instanceof Attachment ) {
352-
sb.append( engine.getManager( AttachmentManager.class ).forceDownload( m_pageName ) ? "download " : "" );
353-
}
351+
if (engine.getManager(PageManager.class).getPage(m_pageName) instanceof Attachment) {
352+
sb.append(engine.getManager(AttachmentManager.class).forceDownload(m_pageName) ? "download " : "");
353+
}
354354

355-
switch( m_format ) {
356-
case URL:
357-
out.print( url );
358-
break;
359-
default:
360-
case ANCHOR:
361-
out.print("<a "+ sb +" href=\""+url+"\">");
362-
break;
363-
}
355+
switch (m_format) {
356+
case URL:
357+
out.print(url);
358+
break;
359+
default:
360+
case ANCHOR:
361+
out.print("<a " + sb + " href=\"" + url + "\">");
362+
break;
363+
}
364364

365-
// Add any explicit body content. This is not the intended use of LinkTag, but happens to be the way it has worked previously.
366-
if( m_bodyContent != null ) {
367-
final String linktext = m_bodyContent.getString().trim();
368-
out.write( linktext );
369-
}
365+
// Add any explicit body content. This is not the intended use of LinkTag, but happens to be the way it has worked previously.
366+
if (m_bodyContent != null) {
367+
final String linktext = m_bodyContent.getString().trim();
368+
out.write(linktext);
369+
}
370370

371-
// Finish off by closing opened anchor
372-
if( m_format == ANCHOR ) out.print("</a>");
371+
// Finish off by closing opened anchor
372+
if (m_format == ANCHOR) out.print("</a>");
373+
}
373374
} catch( final Exception e ) {
374375
// Yes, we want to catch all exceptions here, including RuntimeExceptions
375376
LOG.error( "Tag failed", e );

‎jspwiki-main/src/main/java/org/apache/wiki/tags/LinkToTag.java‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -88,42 +88,43 @@ public int doWikiStartTag() throws IOException {
8888
}
8989
}
9090

91-
final JspWriter out = pageContext.getOut();
92-
final String url;
93-
final String linkclass;
94-
String forceDownload = "";
91+
try (JspWriter out = pageContext.getOut()) {
92+
final String url;
93+
final String linkclass;
94+
String forceDownload = "";
9595

96-
if( isattachment ) {
97-
url = m_wikiContext.getURL( ContextEnum.PAGE_ATTACH.getRequestContext(), pageName, ( getVersion() != null ) ? "version=" + getVersion() : null );
98-
linkclass = "attachment";
96+
if (isattachment) {
97+
url = m_wikiContext.getURL(ContextEnum.PAGE_ATTACH.getRequestContext(), pageName, (getVersion() != null) ? "version=" + getVersion() : null);
98+
linkclass = "attachment";
9999

100-
if( m_wikiContext.getEngine().getManager( AttachmentManager.class ).forceDownload( pageName ) ) {
101-
forceDownload = "download ";
102-
}
100+
if (m_wikiContext.getEngine().getManager(AttachmentManager.class).forceDownload(pageName)) {
101+
forceDownload = "download ";
102+
}
103103

104-
} else {
105-
final StringBuilder params = new StringBuilder();
106-
if( getVersion() != null ) {
107-
params.append( "version=" ).append( getVersion() );
108-
}
109-
if( getTemplate() != null ) {
110-
params.append( params.length() > 0 ? "&amp;" : "" ).append( "skin=" ).append( getTemplate() );
104+
} else {
105+
final StringBuilder params = new StringBuilder();
106+
if (getVersion() != null) {
107+
params.append("version=").append(getVersion());
108+
}
109+
if (getTemplate() != null) {
110+
params.append(params.length() > 0 ? "&amp;" : "").append("skin=").append(getTemplate());
111+
}
112+
113+
url = m_wikiContext.getURL(ContextEnum.PAGE_VIEW.getRequestContext(), pageName, params.toString());
114+
linkclass = "wikipage";
111115
}
112116

113-
url = m_wikiContext.getURL( ContextEnum.PAGE_VIEW.getRequestContext(), pageName, params.toString() );
114-
linkclass = "wikipage";
115-
}
116-
117-
switch( m_format ) {
118-
case ANCHOR:
119-
out.print( "<a class=\"" + linkclass +
120-
"\" href=\"" + url +
121-
"\" accesskey=\"" + m_accesskey +
122-
"\" title=\"" + m_title + "\" " + forceDownload + ">" );
123-
break;
124-
case URL:
125-
out.print( url );
126-
break;
117+
switch (m_format) {
118+
case ANCHOR:
119+
out.print("<a class=\"" + linkclass +
120+
"\" href=\"" + url +
121+
"\" accesskey=\"" + m_accesskey +
122+
"\" title=\"" + m_title + "\" " + forceDownload + ">");
123+
break;
124+
case URL:
125+
out.print(url);
126+
break;
127+
}
127128
}
128129

129130
return EVAL_BODY_INCLUDE;

0 commit comments

Comments
 (0)