Author: markt
Date: Wed Apr 12 08:39:22 2017
New Revision: 1791090
URL: http://svn.apache.org/viewvc?rev=1791090&view=rev
Log:
Review of r1791068 by kkolinko
Class.getConstructor().newInstance() is a better replacement for
Class.newInstance() than Class.getDeclaredConstructor().newInstance()
Modified:
tomcat/trunk/java/javax/el/ExpressionFactory.java
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
tomcat/trunk/java/org/apache/catalina/connector/Connector.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
Modified: tomcat/trunk/java/javax/el/ExpressionFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ExpressionFactory.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ExpressionFactory.java (original)
+++ tomcat/trunk/java/javax/el/ExpressionFactory.java Wed Apr 12 08:39:22 2017
@@ -169,7 +169,7 @@ public abstract class ExpressionFactory
}
}
if (constructor == null) {
- result = (ExpressionFactory)
clazz.getDeclaredConstructor().newInstance();
+ result = (ExpressionFactory)
clazz.getConstructor().newInstance();
} else {
result =
(ExpressionFactory) constructor.newInstance(properties);
Modified:
tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
(original)
+++ tomcat/trunk/java/javax/security/auth/message/config/AuthConfigFactory.java
Wed Apr 12 08:39:22 2017
@@ -73,7 +73,7 @@ public abstract class AuthConfigFactory
// should not be used since that would trigger a memory
leak
// in container environments.
Class<?> clazz = Class.forName(className);
- return (AuthConfigFactory)
clazz.getDeclaredConstructor().newInstance();
+ return (AuthConfigFactory)
clazz.getConstructor().newInstance();
}
});
} catch (PrivilegedActionException e) {
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Wed Apr 12
08:39:22 2017
@@ -51,7 +51,7 @@ public abstract class ContainerProvider
Class<WebSocketContainer> clazz =
(Class<WebSocketContainer>) Class.forName(
DEFAULT_PROVIDER_CLASS_NAME);
- result = clazz.getDeclaredConstructor().newInstance();
+ result = clazz.getConstructor().newInstance();
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException |
IllegalArgumentException | InvocationTargetException |
NoSuchMethodException |
SecurityException e) {
Modified: tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java Wed Apr
12 08:39:22 2017
@@ -176,7 +176,7 @@ public interface ServerEndpointConfig ex
Class<Configurator> clazz =
(Class<Configurator>) Class.forName(
DEFAULT_IMPL_CLASSNAME);
- result = clazz.getDeclaredConstructor().newInstance();
+ result = clazz.getConstructor().newInstance();
} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException |
IllegalArgumentException | InvocationTargetException |
NoSuchMethodException | SecurityException e) {
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/authenticator/jaspic/SimpleServerAuthConfig.java
Wed Apr 12 08:39:22 2017
@@ -115,7 +115,7 @@ public class SimpleServerAuthConfig impl
try {
Class<?> clazz = Class.forName(moduleClassName);
ServerAuthModule module =
- (ServerAuthModule)
clazz.getDeclaredConstructor().newInstance();
+ (ServerAuthModule)
clazz.getConstructor().newInstance();
module.initialize(null, null, handler,
mergedProperties);
modules.add(module);
} catch (ClassNotFoundException |
InstantiationException |
Modified: tomcat/trunk/java/org/apache/catalina/connector/Connector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Connector.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Connector.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Connector.java Wed Apr 12
08:39:22 2017
@@ -97,7 +97,7 @@ public class Connector extends Lifecycle
ProtocolHandler p = null;
try {
Class<?> clazz = Class.forName(protocolHandlerClassName);
- p = (ProtocolHandler) clazz.getDeclaredConstructor().newInstance();
+ p = (ProtocolHandler) clazz.getConstructor().newInstance();
} catch (Exception e) {
log.error(sm.getString(
"coyoteConnector.protocolHandlerInstantiationFailed"), e);
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Wed Apr 12
08:39:22 2017
@@ -1962,7 +1962,7 @@ public class Request implements HttpServ
// Do not go through the instance manager for internal Tomcat
classes since they don't
// need injection
if
(InternalHttpUpgradeHandler.class.isAssignableFrom(httpUpgradeHandlerClass)) {
- handler =
httpUpgradeHandlerClass.getDeclaredConstructor().newInstance();
+ handler =
httpUpgradeHandlerClass.getConstructor().newInstance();
} else {
instanceManager = getContext().getInstanceManager();
handler = (T)
instanceManager.newInstance(httpUpgradeHandlerClass);
Modified: tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java Wed
Apr 12 08:39:22 2017
@@ -109,7 +109,7 @@ public class DefaultInstanceManager impl
public Object newInstance(Class<?> clazz) throws IllegalAccessException,
InvocationTargetException, NamingException, InstantiationException,
IllegalArgumentException, NoSuchMethodException, SecurityException
{
- return newInstance(clazz.getDeclaredConstructor().newInstance(),
clazz);
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
@@ -117,7 +117,7 @@ public class DefaultInstanceManager impl
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException, IllegalArgumentException,
NoSuchMethodException, SecurityException {
Class<?> clazz = loadClassMaybePrivileged(className, classLoader);
- return newInstance(clazz.getDeclaredConstructor().newInstance(),
clazz);
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
@@ -126,7 +126,7 @@ public class DefaultInstanceManager impl
InstantiationException, ClassNotFoundException,
IllegalArgumentException,
NoSuchMethodException, SecurityException {
Class<?> clazz = classLoader.loadClass(className);
- return newInstance(clazz.getDeclaredConstructor().newInstance(),
clazz);
+ return newInstance(clazz.getConstructor().newInstance(), clazz);
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Wed Apr 12
08:39:22 2017
@@ -1351,7 +1351,7 @@ public class StandardContext extends Con
if (this.charsetMapper == null) {
try {
Class<?> clazz = Class.forName(charsetMapperClass);
- this.charsetMapper = (CharsetMapper)
clazz.getDeclaredConstructor().newInstance();
+ this.charsetMapper = (CharsetMapper)
clazz.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
this.charsetMapper = new CharsetMapper();
@@ -3264,7 +3264,7 @@ public class StandardContext extends Con
Wrapper wrapper = null;
if (wrapperClass != null) {
try {
- wrapper = (Wrapper)
wrapperClass.getDeclaredConstructor().newInstance();
+ wrapper = (Wrapper)
wrapperClass.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error("createWrapper", t);
@@ -3279,7 +3279,7 @@ public class StandardContext extends Con
try {
Class<?> clazz = Class.forName(wrapperLifecycles[i]);
LifecycleListener listener =
- (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ (LifecycleListener)
clazz.getConstructor().newInstance();
wrapper.addLifecycleListener(listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -3294,7 +3294,7 @@ public class StandardContext extends Con
try {
Class<?> clazz = Class.forName(wrapperListeners[i]);
ContainerListener listener =
- (ContainerListener)
clazz.getDeclaredConstructor().newInstance();
+ (ContainerListener)
clazz.getConstructor().newInstance();
wrapper.addContainerListener(listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Wed Apr 12
08:39:22 2017
@@ -859,7 +859,7 @@ public class StandardHost extends Contai
}
if(!found) {
Valve valve =
- (Valve)
Class.forName(errorValve).getDeclaredConstructor().newInstance();
+ (Valve)
Class.forName(errorValve).getConstructor().newInstance();
getPipeline().addValve(valve);
}
} catch (Throwable t) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java?rev=1791090&r1=1791089&r2=1791090&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestSlowQueryComparator.java
Wed Apr 12 08:39:22 2017
@@ -111,8 +111,7 @@ public class TestSlowQueryComparator {
SecurityException, NoSuchMethodException {
Class<?> comparatorClass = Class
.forName("org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport$QueryStatsComparator");
- Constructor<?> comparatorConstructor = comparatorClass
- .getDeclaredConstructor();
+ Constructor<?> comparatorConstructor =
comparatorClass.getConstructor();
comparatorConstructor.setAccessible(true);
@SuppressWarnings("unchecked")
Comparator<QueryStats> queryStatsComparator = (Comparator<QueryStats>)
comparatorConstructor
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
