You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2020/04/11 09:39:00 UTC
[tomcat-taglibs-standard] branch master updated (b283d88 -> 4d3880e)
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git.
from b283d88 move from javax to jakarta namespace
new 9df0299 use StringBuilder instead of StringBuffer
new 4d3880e minor changes as the code is now java 1.8
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../standard/tag/common/core/ImportSupport.java | 8 +++----
.../standard/tag/common/core/ParamSupport.java | 10 ++++-----
.../standard/tag/common/core/SetSupport.java | 6 +-----
.../standard/tag/common/core/UrlSupport.java | 4 +++-
.../taglibs/standard/tag/common/core/Util.java | 3 ++-
.../standard/tag/common/fmt/BundleSupport.java | 25 ++++++++--------------
.../standard/tag/common/fmt/FormatDateSupport.java | 2 +-
.../tag/common/fmt/FormatNumberSupport.java | 21 +++---------------
.../standard/tag/common/sql/UpdateTagSupport.java | 12 +----------
.../standard/tag/common/xml/JSTLVariableStack.java | 2 +-
.../standard/tag/common/xml/ParseSupport.java | 10 ++-------
.../standard/tag/common/xml/TransformSupport.java | 10 ++-------
.../apache/taglibs/standard/tlv/JstlBaseTLV.java | 11 ++--------
.../taglibs/standard/util/ExpressionUtil.java | 4 ++--
.../org/apache/taglibs/standard/util/XmlUtil.java | 6 +-----
.../lang/jstl/BinaryOperatorExpression.java | 2 +-
.../taglibs/standard/lang/jstl/ComplexValue.java | 2 +-
.../taglibs/standard/lang/jstl/ELEvaluator.java | 6 +++---
.../standard/lang/jstl/ExpressionString.java | 4 ++--
.../standard/lang/jstl/FunctionInvocation.java | 2 +-
.../taglibs/standard/lang/jstl/StringLiteral.java | 4 ++--
.../lang/jstl/UnaryOperatorExpression.java | 2 +-
.../standard/lang/jstl/parser/ParseException.java | 2 +-
.../standard/lang/jstl/parser/TokenMgrError.java | 2 +-
.../taglibs/standard/examples/beans/Address.java | 2 +-
.../taglibs/standard/examples/beans/Customer.java | 2 +-
.../standard/examples/taglib/Functions.java | 2 +-
27 files changed, 54 insertions(+), 112 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 01/02: use StringBuilder instead of
StringBuffer
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
commit 9df029915390a516a59233b2bcecebdd921a822f
Author: olivier lamy <ol...@apache.org>
AuthorDate: Sat Apr 11 11:29:11 2020 +1000
use StringBuilder instead of StringBuffer
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../org/apache/taglibs/standard/tag/common/core/ImportSupport.java | 4 ++--
.../org/apache/taglibs/standard/tag/common/core/ParamSupport.java | 4 ++--
.../apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java | 6 +++---
.../org/apache/taglibs/standard/lang/jstl/ExpressionString.java | 4 ++--
.../org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java | 2 +-
.../java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java | 4 ++--
.../apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java | 2 +-
.../apache/taglibs/standard/lang/jstl/parser/ParseException.java | 2 +-
.../org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java | 2 +-
.../java/org/apache/taglibs/standard/examples/beans/Address.java | 2 +-
.../java/org/apache/taglibs/standard/examples/beans/Customer.java | 2 +-
.../java/org/apache/taglibs/standard/examples/taglib/Functions.java | 2 +-
14 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
index 681fa3e..57fbd54 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -240,7 +240,7 @@ public abstract class ImportSupport extends BodyTagSupport
if (isAbsoluteUrl) {
// for absolute URLs, delegate to our peer
BufferedReader r = new BufferedReader(acquireReader());
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
int i;
// under JIT, testing seems to show this simple loop is as fast
@@ -574,7 +574,7 @@ public abstract class ImportSupport extends BodyTagSupport
* and either EOS or a subsequent ';' (exclusive).
*/
public static String stripSession(String url) {
- StringBuffer u = new StringBuffer(url);
+ StringBuilder u = new StringBuilder(url);
int sessionStart;
while ((sessionStart = u.toString().indexOf(";jsessionid=")) != -1) {
int sessionEnd = u.toString().indexOf(";", sessionStart + 1);
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
index a2dd06d..b7ae13f 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
@@ -170,7 +170,7 @@ public abstract class ParamSupport extends BodyTagSupport {
// Collections.reverse(this.values);
// build a string from the parameter list
- StringBuffer newParams = new StringBuffer();
+ StringBuilder newParams = new StringBuilder();
for (int i = 0; i < names.size(); i++) {
newParams.append(names.get(i) + "=" + values.get(i));
if (i < (names.size() - 1)) {
@@ -184,7 +184,7 @@ public abstract class ParamSupport extends BodyTagSupport {
if (questionMark == -1) {
return (url + "?" + newParams);
} else {
- StringBuffer workingUrl = new StringBuffer(url);
+ StringBuilder workingUrl = new StringBuilder(url);
workingUrl.insert(questionMark + 1, (newParams + "&"));
return workingUrl.toString();
}
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
index 26db108..f8fa551 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/BinaryOperatorExpression.java
@@ -91,7 +91,7 @@ public class BinaryOperatorExpression
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("(");
buf.append(mExpression.getExpressionString());
for (int i = 0; i < mOperators.size(); i++) {
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
index 23a66a2..39e544b 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ComplexValue.java
@@ -79,7 +79,7 @@ public class ComplexValue
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append(mPrefix.getExpressionString());
for (int i = 0; mSuffixes != null && i < mSuffixes.size(); i++) {
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
index 43299ba..0afe6ef 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ELEvaluator.java
@@ -407,7 +407,7 @@ public class ELEvaluator {
static String formatParseException(String pExpressionString,
ParseException pExc) {
// Generate the String of expected tokens
- StringBuffer expectedBuf = new StringBuffer();
+ StringBuilder expectedBuf = new StringBuilder();
int maxSize = 0;
boolean printedOne = false;
@@ -431,7 +431,7 @@ public class ELEvaluator {
String expected = expectedBuf.toString();
// Generate the String of encountered tokens
- StringBuffer encounteredBuf = new StringBuffer();
+ StringBuilder encounteredBuf = new StringBuilder();
Token tok = pExc.currentToken.next;
for (int i = 0; i < maxSize; i++) {
if (i != 0) {
@@ -463,7 +463,7 @@ public class ELEvaluator {
* literal.
*/
static String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i)) {
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
index 1dfe71f..cae523f 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/ExpressionString.java
@@ -65,7 +65,7 @@ public class ExpressionString {
String defaultPrefix,
Logger pLogger)
throws ELException {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < mElements.length; i++) {
Object elem = mElements[i];
if (elem instanceof String) {
@@ -91,7 +91,7 @@ public class ExpressionString {
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < mElements.length; i++) {
Object elem = mElements[i];
if (elem instanceof String) {
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
index d99a797..117196e 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/FunctionInvocation.java
@@ -73,7 +73,7 @@ public class FunctionInvocation
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer b = new StringBuffer();
+ StringBuilder b = new StringBuilder();
b.append(functionName);
b.append("(");
Iterator i = argumentList.iterator();
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
index 4200d08..3940d10 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/StringLiteral.java
@@ -59,7 +59,7 @@ public class StringLiteral
* Parses the given token into the literal value
*/
public static String getValueFromToken(String pToken) {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int len = pToken.length() - 1;
boolean escaping = false;
for (int i = 1; i < len; i++) {
@@ -91,7 +91,7 @@ public class StringLiteral
// Escaping is needed
else {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append('\"');
int len = pValue.length();
for (int i = 0; i < len; i++) {
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
index 833721e..a4fc419 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/UnaryOperatorExpression.java
@@ -92,7 +92,7 @@ public class UnaryOperatorExpression
* Returns the expression in the expression language syntax
*/
public String getExpressionString() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
buf.append("(");
if (mOperator != null) {
buf.append(mOperator.getOperatorSymbol());
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
index 38df170..16ebc59 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/ParseException.java
@@ -146,7 +146,7 @@ public class ParseException extends Exception {
* string literal.
*/
protected String add_escapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
diff --git a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
index f58e11d..b96927e 100644
--- a/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
+++ b/jstlel/src/main/java/org/apache/taglibs/standard/lang/jstl/parser/TokenMgrError.java
@@ -39,7 +39,7 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
index cb3b455..18b9e87 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Address.java
@@ -189,7 +189,7 @@ public class Address {
* Return a String representation of this object.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append(line1).append(" ");
sb.append(city).append(" ");
sb.append(country);
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
index 5f7fe6c..106e6a4 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/beans/Customer.java
@@ -237,7 +237,7 @@ public class Customer {
* Return a String representation of this object.
*/
public String toString() {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
sb.append("[").append(key).append("] ");
sb.append(getLastName()).append(", ");
sb.append(getFirstName()).append(" ");
diff --git a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
index 5bf0e37..dd5b923 100644
--- a/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
+++ b/standard-examples/src/main/java/org/apache/taglibs/standard/examples/taglib/Functions.java
@@ -62,7 +62,7 @@ public class Functions {
}
*/
try {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
int count = Array.getLength(obj);
for (int i = 0; i < count; i++) {
buf.append(Array.get(obj, i).toString());
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat-taglibs-standard] 02/02: minor changes as the code is now
java 1.8
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-taglibs-standard.git
commit 4d3880e52f4e9db00e1e91a3e9593b48a84072fe
Author: olivier lamy <ol...@apache.org>
AuthorDate: Sat Apr 11 19:38:43 2020 +1000
minor changes as the code is now java 1.8
Signed-off-by: olivier lamy <ol...@apache.org>
---
.../standard/tag/common/core/ImportSupport.java | 4 +---
.../standard/tag/common/core/ParamSupport.java | 6 +++---
.../standard/tag/common/core/SetSupport.java | 6 +-----
.../standard/tag/common/core/UrlSupport.java | 4 +++-
.../taglibs/standard/tag/common/core/Util.java | 3 ++-
.../standard/tag/common/fmt/BundleSupport.java | 25 ++++++++--------------
.../standard/tag/common/fmt/FormatDateSupport.java | 2 +-
.../tag/common/fmt/FormatNumberSupport.java | 21 +++---------------
.../standard/tag/common/sql/UpdateTagSupport.java | 12 +----------
.../standard/tag/common/xml/JSTLVariableStack.java | 2 +-
.../standard/tag/common/xml/ParseSupport.java | 10 ++-------
.../standard/tag/common/xml/TransformSupport.java | 10 ++-------
.../apache/taglibs/standard/tlv/JstlBaseTLV.java | 11 ++--------
.../taglibs/standard/util/ExpressionUtil.java | 4 ++--
.../org/apache/taglibs/standard/util/XmlUtil.java | 6 +-----
15 files changed, 34 insertions(+), 92 deletions(-)
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
index 57fbd54..d4c5cb2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java
@@ -299,9 +299,7 @@ public abstract class ImportSupport extends BodyTagSupport
// spec mandates specific error handling from include()
try {
rd.include(pageContext.getRequest(), irw);
- } catch (IOException ex) {
- throw new JspException(ex);
- } catch (RuntimeException ex) {
+ } catch (IOException | RuntimeException ex) {
throw new JspException(ex);
} catch (ServletException ex) {
Throwable rc = ex.getRootCause();
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
index b7ae13f..83923ad 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ParamSupport.java
@@ -127,8 +127,8 @@ public abstract class ParamSupport extends BodyTagSupport {
//*********************************
// Private state
- private List names = new LinkedList();
- private List values = new LinkedList();
+ private List<String> names = new LinkedList();
+ private List<String> values = new LinkedList();
private boolean done = false;
//*********************************
@@ -172,7 +172,7 @@ public abstract class ParamSupport extends BodyTagSupport {
// build a string from the parameter list
StringBuilder newParams = new StringBuilder();
for (int i = 0; i < names.size(); i++) {
- newParams.append(names.get(i) + "=" + values.get(i));
+ newParams.append(names.get(i)).append('=').append(values.get(i));
if (i < (names.size() - 1)) {
newParams.append("&");
}
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
index c309e13..7f4c0a8 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/SetSupport.java
@@ -231,11 +231,7 @@ public abstract class SetSupport extends BodyTagSupport {
}
try {
m.invoke(target, convertToExpectedType(result, m));
- } catch (ELException ex) {
- throw new JspTagException(ex);
- } catch (IllegalAccessException ex) {
- throw new JspTagException(ex);
- } catch (InvocationTargetException ex) {
+ } catch (ELException|IllegalAccessException|InvocationTargetException ex) {
throw new JspTagException(ex);
}
return;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
index 20c0a7c..3ea2bcb 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/UrlSupport.java
@@ -27,6 +27,8 @@ import jakarta.servlet.jsp.tagext.BodyTagSupport;
import org.apache.taglibs.standard.resources.Resources;
import org.apache.taglibs.standard.util.UrlUtil;
+import java.io.IOException;
+
/**
* <p>Support for tag handlers for <url>, the URL creation
* and rewriting tag in JSTL 1.0.</p>
@@ -123,7 +125,7 @@ public abstract class UrlSupport extends BodyTagSupport
} else {
try {
pageContext.getOut().print(result);
- } catch (java.io.IOException ex) {
+ } catch (IOException ex) {
throw new JspTagException(ex.toString(), ex);
}
}
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
index 3af5743..25b54ec 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/Util.java
@@ -18,6 +18,7 @@
package org.apache.taglibs.standard.tag.common.core;
import java.text.DateFormat;
+import java.util.Collections;
import java.util.Enumeration;
import java.util.Vector;
@@ -159,7 +160,7 @@ public class Util {
// No header for "accept-language". Simply return
// a new empty enumeration.
// System.out.println("Null accept-language");
- return new Vector().elements();
+ return Collections.emptyEnumeration();
} else if (values.hasMoreElements()) {
// At least one "accept-language". Simply return
// the enumeration returned by request.getLocales().
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
index 2128414..a6b2bd3 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
@@ -113,7 +113,6 @@ public abstract class BundleSupport extends BodyTagSupport {
* @param pc Page in which to look up the default I18N localization context
*/
public static LocalizationContext getLocalizationContext(PageContext pc) {
- LocalizationContext locCtxt = null;
Object obj = Config.find(pc, Config.FMT_LOCALIZATION_CONTEXT);
if (obj == null) {
@@ -121,13 +120,11 @@ public abstract class BundleSupport extends BodyTagSupport {
}
if (obj instanceof LocalizationContext) {
- locCtxt = (LocalizationContext) obj;
- } else {
- // localization context is a bundle basename
- locCtxt = getLocalizationContext(pc, (String) obj);
+ return (LocalizationContext) obj;
}
+ // localization context is a bundle basename
+ return getLocalizationContext(pc, (String) obj);
- return locCtxt;
}
/**
@@ -230,7 +227,6 @@ public abstract class BundleSupport extends BodyTagSupport {
private static LocalizationContext findMatch(PageContext pageContext,
String basename) {
- LocalizationContext locCtxt = null;
// Determine locale from client's browser settings.
@@ -239,12 +235,11 @@ public abstract class BundleSupport extends BodyTagSupport {
Locale pref = (Locale) enum_.nextElement();
ResourceBundle match = findMatch(basename, pref);
if (match != null) {
- locCtxt = new LocalizationContext(match, pref);
- break;
+ return new LocalizationContext(match, pref);
}
}
- return locCtxt;
+ return null;
}
/*
@@ -315,18 +310,16 @@ public abstract class BundleSupport extends BodyTagSupport {
}
private static ClassLoader getClassLoaderCheckingPrivilege() {
- ClassLoader cl;
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
- cl = Thread.currentThread().getContextClassLoader();
- } else {
- cl = java.security.AccessController.doPrivileged(
+ return Thread.currentThread().getContextClassLoader();
+ }
+ return java.security.AccessController.doPrivileged(
new java.security.PrivilegedAction<ClassLoader>() {
public ClassLoader run() {
return Thread.currentThread().getContextClassLoader();
}
});
- }
- return cl;
+
}
}
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
index 0ba48f4..816e040 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatDateSupport.java
@@ -127,7 +127,7 @@ public abstract class FormatDateSupport extends TagSupport {
// Set time zone
TimeZone tz = null;
if ((timeZone instanceof String)
- && ((String) timeZone).equals("")) {
+ && timeZone.equals("")) {
timeZone = null;
}
if (timeZone != null) {
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
index 42b933b..09b76d6 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/fmt/FormatNumberSupport.java
@@ -22,6 +22,7 @@ import java.lang.reflect.Method;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
+import java.util.Currency;
import java.util.Locale;
import jakarta.servlet.jsp.JspException;
@@ -319,25 +320,9 @@ public abstract class FormatNumberSupport extends BodyTagSupport {
}
if (code != null) {
- Object[] methodArgs = new Object[1];
+ Currency currency = Currency.getInstance( code );
+ formatter.setCurrency( currency );
- /*
- * java.util.Currency.getInstance()
- */
- Method m = currencyClass.getMethod("getInstance",
- GET_INSTANCE_PARAM_TYPES);
- methodArgs[0] = code;
- Object currency = m.invoke(null, methodArgs);
-
- /*
- * java.text.NumberFormat.setCurrency()
- */
- Class[] paramTypes = new Class[1];
- paramTypes[0] = currencyClass;
- Class numberFormatClass = Class.forName("java.text.NumberFormat");
- m = numberFormatClass.getMethod("setCurrency", paramTypes);
- methodArgs[0] = currency;
- m.invoke(formatter, methodArgs);
} else {
/*
* Let potential ClassCastException propagate up (will almost
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
index 7b58b67..8d9e900 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
@@ -152,22 +152,12 @@ public abstract class UpdateTagSupport extends BodyTagSupport
}
int result = 0;
- PreparedStatement ps = null;
- try {
- ps = conn.prepareStatement(sqlStatement);
+ try (PreparedStatement ps = conn.prepareStatement(sqlStatement)) {
setParameters(ps, parameters);
result = ps.executeUpdate();
}
catch (Throwable e) {
throw new JspException(sqlStatement + ": " + e.getMessage(), e);
- } finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException sqe) {
- throw new JspException(sqe.getMessage(), sqe);
- }
- }
}
if (var != null) {
pageContext.setAttribute(var, new Integer(result), scope);
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
index 4e771c7..b9a3121 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/JSTLVariableStack.java
@@ -59,7 +59,7 @@ public class JSTLVariableStack extends VariableStack {
// map prefixes to scopes
private static final Map<String, Scope> SCOPES;
static {
- SCOPES = new HashMap<String, Scope>(8);
+ SCOPES = new HashMap<>(8);
SCOPES.put(PARAM_PREFIX, Scope.PARAM);
SCOPES.put(HEADER_PREFIX, Scope.HEADER);
SCOPES.put(COOKIE_PREFIX, Scope.COOKIE);
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
index 15a0bc5..d320314 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/ParseSupport.java
@@ -157,11 +157,7 @@ public abstract class ParseSupport extends BodyTagSupport {
return o;
} catch (IOException e) {
throw new JspException(e);
- } catch (SAXException e) {
- throw new JspException(e);
- } catch (TransformerConfigurationException e) {
- throw new JspException(e);
- } catch (ParserConfigurationException e) {
+ } catch (SAXException|TransformerConfigurationException|ParserConfigurationException e) {
throw new JspException(e);
}
}
@@ -174,9 +170,7 @@ public abstract class ParseSupport extends BodyTagSupport {
DocumentBuilder db = XmlUtil.newDocumentBuilder();
db.setEntityResolver(entityResolver);
return db.parse(s);
- } catch (SAXException e) {
- throw new JspException(e);
- } catch (IOException e) {
+ } catch (SAXException|IOException e) {
throw new JspException(e);
}
}
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
index a6ec0a8..aeae91b 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/xml/TransformSupport.java
@@ -114,9 +114,7 @@ public abstract class TransformSupport extends BodyTagSupport {
} else {
throw new JspTagException(Resources.getMessage("TRANSFORM_XSLT_UNSUPPORTED_TYPE", xslt.getClass()));
}
- } catch (SAXException e) {
- throw new JspException(e);
- } catch (ParserConfigurationException e) {
+ } catch (SAXException|ParserConfigurationException e) {
throw new JspException(e);
}
@@ -151,11 +149,7 @@ public abstract class TransformSupport extends BodyTagSupport {
t.transform(source, out);
}
return EVAL_PAGE;
- } catch (TransformerException ex) {
- throw new JspException(ex);
- } catch (SAXException e) {
- throw new JspException(e);
- } catch (ParserConfigurationException e) {
+ } catch (TransformerException|SAXException|ParserConfigurationException e) {
throw new JspException(e);
} finally {
t = null;
diff --git a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
index ad5a16c..c51bc16 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/tlv/JstlBaseTLV.java
@@ -170,11 +170,7 @@ public abstract class JstlBaseTLV extends TagLibraryValidator {
return vmFromVector(messageVector);
}
- } catch (SAXException ex) {
- return vmFromString(ex.toString());
- } catch (IOException ex) {
- return vmFromString(ex.toString());
- } catch (ParserConfigurationException ex) {
+ } catch (SAXException|IOException|ParserConfigurationException ex) {
return vmFromString(ex.toString());
}
}
@@ -279,10 +275,7 @@ public abstract class JstlBaseTLV extends TagLibraryValidator {
// returns true if the 'var' attribute is empty
protected boolean hasEmptyVar(Attributes a) {
- if ("".equals(a.getValue(VAR))) {
- return true;
- }
- return false;
+ return "".equals(a.getValue(VAR));
}
// returns true if the 'scope' attribute is present without 'var'
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
index af2fcbe..e726985 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/ExpressionUtil.java
@@ -74,7 +74,7 @@ public class ExpressionUtil {
return fallback;
}
Boolean result = (Boolean) expression.getValue(pageContext.getELContext());
- return result == null ? fallback : result.booleanValue();
+ return result == null ? fallback : result;
}
public static int evaluate(ValueExpression expression, PageContext pageContext, int fallback) {
@@ -82,6 +82,6 @@ public class ExpressionUtil {
return fallback;
}
Integer result = (Integer) expression.getValue(pageContext.getELContext());
- return result == null ? fallback : result.intValue();
+ return result == null ? fallback : result;
}
}
diff --git a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
index f2db9b5..2efc8d2 100644
--- a/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
+++ b/impl/src/main/java/org/apache/taglibs/standard/util/XmlUtil.java
@@ -104,11 +104,7 @@ public class XmlUtil {
}, RuntimeException.class);
SAXPARSER_FACTORY.setNamespaceAware(true);
SAXPARSER_FACTORY.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
- } catch (ParserConfigurationException e) {
- throw new ExceptionInInitializerError(e);
- } catch (SAXNotRecognizedException e) {
- throw new ExceptionInInitializerError(e);
- } catch (SAXNotSupportedException e) {
+ } catch (ParserConfigurationException|SAXNotRecognizedException|SAXNotSupportedException e) {
throw new ExceptionInInitializerError(e);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org