Code reformat.

This commit is contained in:
Erik C. Thauvin 2021-03-17 19:18:56 -07:00
parent a64147959f
commit e8e421b159
8 changed files with 12 additions and 16 deletions

View file

@ -87,7 +87,7 @@ public final class Reasons {
* @param statusCode The status code. * @param statusCode The status code.
* @return The reason phrase, or <code>null</code>. * @return The reason phrase, or <code>null</code>.
*/ */
@SuppressWarnings({ "WeakerAccess" }) @SuppressWarnings({"WeakerAccess"})
public static String getReasonPhrase(final String statusCode) { public static String getReasonPhrase(final String statusCode) {
return REASON_PHRASES.get(statusCode); return REASON_PHRASES.get(statusCode);
} }

View file

@ -52,8 +52,7 @@ public class CauseTag extends XmlSupport {
@Override @Override
public void doTag() throws IOException { public void doTag() throws IOException {
final PageContext pageContext = (PageContext) getJspContext(); final PageContext pageContext = (PageContext) getJspContext();
@SuppressWarnings("PMD.CloseResource") @SuppressWarnings("PMD.CloseResource") final JspWriter out = pageContext.getOut();
final JspWriter out = pageContext.getOut();
String cause; String cause;

View file

@ -51,8 +51,7 @@ public class CodeTag extends SimpleTagSupport {
@Override @Override
public void doTag() throws IOException { public void doTag() throws IOException {
final PageContext pageContext = (PageContext) getJspContext(); final PageContext pageContext = (PageContext) getJspContext();
@SuppressWarnings("PMD.CloseResource") @SuppressWarnings("PMD.CloseResource") final JspWriter out = pageContext.getOut();
final JspWriter out = pageContext.getOut();
out.write(String.valueOf(pageContext.getErrorData().getStatusCode())); out.write(String.valueOf(pageContext.getErrorData().getStatusCode()));
} }

View file

@ -52,8 +52,7 @@ public class MessageTag extends XmlSupport {
@Override @Override
public void doTag() throws IOException { public void doTag() throws IOException {
final PageContext pageContext = (PageContext) getJspContext(); final PageContext pageContext = (PageContext) getJspContext();
@SuppressWarnings("PMD.CloseResource") @SuppressWarnings("PMD.CloseResource") final JspWriter out = pageContext.getOut();
final JspWriter out = pageContext.getOut();
final String message = (String) pageContext.getRequest().getAttribute( final String message = (String) pageContext.getRequest().getAttribute(
javax.servlet.RequestDispatcher.ERROR_MESSAGE); javax.servlet.RequestDispatcher.ERROR_MESSAGE);

View file

@ -56,15 +56,14 @@ public class ReasonTag extends XmlSupport {
@Override @Override
public void doTag() { public void doTag() {
final PageContext pageContext = (PageContext) getJspContext(); final PageContext pageContext = (PageContext) getJspContext();
@SuppressWarnings("PMD.CloseResource") @SuppressWarnings("PMD.CloseResource") final JspWriter out = pageContext.getOut();
final JspWriter out = pageContext.getOut();
try { try {
if (statusCode > -1) { if (statusCode > -1) {
Utils.outWrite(out, Reasons.getReasonPhrase(statusCode), defaultValue, escapeXml); Utils.outWrite(out, Reasons.getReasonPhrase(statusCode), defaultValue, escapeXml);
} else { } else {
Utils.outWrite(out, Reasons.getReasonPhrase(pageContext.getErrorData().getStatusCode()), defaultValue, Utils.outWrite(out, Reasons.getReasonPhrase(pageContext.getErrorData().getStatusCode()), defaultValue,
escapeXml); escapeXml);
} }
} catch (IOException ignore) { } catch (IOException ignore) {
// Ignore. // Ignore.

View file

@ -51,13 +51,13 @@ import static org.testng.Assert.assertTrue;
* @created 2019-05-06 * @created 2019-05-06
* @since 1.0 * @since 1.0
*/ */
@SuppressFBWarnings({ "DM_DEFAULT_ENCODING", "ITU_INAPPROPRIATE_TOSTRING_USE" }) @SuppressFBWarnings({"DM_DEFAULT_ENCODING", "ITU_INAPPROPRIATE_TOSTRING_USE"})
public class ReasonsMainTest { public class ReasonsMainTest {
private final PrintStream originalOut = System.out; private final PrintStream originalOut = System.out;
private final ByteArrayOutputStream outContent = new ByteArrayOutputStream(); private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
@AfterTest @AfterTest
public void restoreStreams() { public void restoreStreams() {
System.setOut(originalOut); System.setOut(originalOut);
} }

View file

@ -52,7 +52,7 @@ public class ReasonsTest {
for (final String key : bundle.keySet()) { for (final String key : bundle.keySet()) {
assertEquals(bundle.getString(key), Reasons.getReasonPhrase(key), "getReasonPhrase(" + key + ')'); assertEquals(bundle.getString(key), Reasons.getReasonPhrase(key), "getReasonPhrase(" + key + ')');
assertEquals(bundle.getString(key), Reasons.getReasonPhrase(Integer.parseInt(key)), assertEquals(bundle.getString(key), Reasons.getReasonPhrase(Integer.parseInt(key)),
"getReasonPhrase(int: " + key + ')'); "getReasonPhrase(int: " + key + ')');
} }
} }

View file

@ -52,9 +52,9 @@ public class UtilsTest {
public void testEscapeXml() { public void testEscapeXml() {
assertEquals(Utils.escapeXml( assertEquals(Utils.escapeXml(
"This is a test. We wan't to make sure that everything is <encoded> according the \"encoding\" " "This is a test. We wan't to make sure that everything is <encoded> according the \"encoding\" "
+ "parameter & value."), + "parameter & value."),
"This is a test. We wan&#039;t to make sure that everything is &lt;encoded&gt; according the " "This is a test. We wan&#039;t to make sure that everything is &lt;encoded&gt; according the "
+ "&#034;encoding&#034; parameter &amp; value."); + "&#034;encoding&#034; parameter &amp; value.");
} }
@SuppressWarnings("PMD.AvoidDuplicateLiterals") @SuppressWarnings("PMD.AvoidDuplicateLiterals")