Author: markt
Date: Thu Oct 5 18:19:57 2017
New Revision: 1811220
URL: http://svn.apache.org/viewvc?rev=1811220&view=rev
Log:
getDeclaredConstructor() -> getConstructor()
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
tomcat/trunk/java/org/apache/juli/FileHandler.java
tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilterBase.java
Thu Oct 5 18:19:57 2017
@@ -78,7 +78,7 @@ public abstract class CsrfPreventionFilt
try {
Class<?> clazz = Class.forName(randomClass);
- randomSource = (Random)
clazz.getDeclaredConstructor().newInstance();
+ randomSource = (Random) clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
ServletException se = new ServletException(sm.getString(
"csrfPrevention.invalidRandomClass", randomClass), e);
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/ClusterManagerBase.java
Thu Oct 5 18:19:57 2017
@@ -153,7 +153,7 @@ public abstract class ClusterManagerBase
copy.setSecureRandomAlgorithm(getSecureRandomAlgorithm());
if (getSessionIdGenerator() != null) {
try {
- SessionIdGenerator copyIdGenerator =
sessionIdGeneratorClass.getDeclaredConstructor().newInstance();
+ SessionIdGenerator copyIdGenerator =
sessionIdGeneratorClass.getConstructor().newInstance();
copyIdGenerator.setSessionIdLength(getSessionIdGenerator().getSessionIdLength());
copyIdGenerator.setJvmRoute(getSessionIdGenerator().getJvmRoute());
copy.setSessionIdGenerator(copyIdGenerator);
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Thu
Oct 5 18:19:57 2017
@@ -1576,7 +1576,7 @@ public abstract class WebappClassLoaderB
Class<?> lpClass =
defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
classBytes, 0, offset,
this.getClass().getProtectionDomain());
- Object obj = lpClass.getDeclaredConstructor().newInstance();
+ Object obj = lpClass.getConstructor().newInstance();
@SuppressWarnings("unchecked")
List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java Thu Oct
5 18:19:57 2017
@@ -39,7 +39,7 @@ public abstract class BaseCatalinaMBean<
protected static Object newInstance(String type) throws MBeanException {
try {
- return Class.forName(type).getDeclaredConstructor().newInstance();
+ return Class.forName(type).getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new MBeanException(e);
}
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Thu Oct 5
18:19:57 2017
@@ -631,7 +631,7 @@ public class MBeanFactory {
throw new IllegalArgumentException();
}
- Valve valve = (Valve)
Class.forName(className).getDeclaredConstructor().newInstance();
+ Valve valve = (Valve)
Class.forName(className).getConstructor().newInstance();
container.getPipeline().addValve(valve);
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Thu
Oct 5 18:19:57 2017
@@ -243,7 +243,7 @@ public class JAASMemoryLoginModule exten
if (option instanceof String) {
try {
Class<?> clazz = Class.forName((String) option);
- credentialHandler = (CredentialHandler)
clazz.getDeclaredConstructor().newInstance();
+ credentialHandler = (CredentialHandler)
clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new IllegalArgumentException(e);
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Oct 5
18:19:57 2017
@@ -639,7 +639,7 @@ public class JDBCRealm
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.getDeclaredConstructor().newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
throw new SQLException(e.getMessage(), e);
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Thu Oct 5
18:19:57 2017
@@ -1247,7 +1247,7 @@ public class JNDIRealm extends RealmBase
private Object constructInstance(String className)
throws ReflectiveOperationException {
Class<?> clazz = Class.forName(className);
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
}
// ---------------------------------------------------------- Realm Methods
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Oct 5
18:19:57 2017
@@ -1402,7 +1402,7 @@ public abstract class RealmBase extends
if (handlerClassName == null) {
for (Class<? extends DigestCredentialHandlerBase> clazz :
credentialHandlerClasses) {
try {
- handler = clazz.getDeclaredConstructor().newInstance();
+ handler = clazz.getConstructor().newInstance();
if (IntrospectionUtils.setProperty(handler, "algorithm",
algorithm)) {
break;
}
@@ -1414,7 +1414,7 @@ public abstract class RealmBase extends
} else {
try {
Class<?> clazz = Class.forName(handlerClassName);
- handler = (DigestCredentialHandlerBase)
clazz.getDeclaredConstructor().newInstance();
+ handler = (DigestCredentialHandlerBase)
clazz.getConstructor().newInstance();
IntrospectionUtils.setProperty(handler, "algorithm",
algorithm);
} catch (ReflectiveOperationException e) {
throw new RuntimeException(e);
@@ -1547,7 +1547,7 @@ public abstract class RealmBase extends
try {
@SuppressWarnings("unchecked")
Class<? extends X509UsernameRetriever> clazz = (Class<? extends
X509UsernameRetriever>)Class.forName(className);
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new
LifecycleException(sm.getString("realmBase.createUsernameRetriever.newInstance",
className), e);
} catch (ClassCastException e) {
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityClassLoad.java Thu
Oct 5 18:19:57 2017
@@ -115,7 +115,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "http11.Constants");
// Make sure system property is read at this point
Class<?> clazz = loader.loadClass(basePackage + "Constants");
- clazz.getDeclaredConstructor().newInstance();
+ clazz.getConstructor().newInstance();
loader.loadClass(basePackage + "http2.Stream$PrivilegedPush");
}
@@ -178,7 +178,7 @@ public final class SecurityClassLoad {
loader.loadClass(basePackage + "util.http.NamesEnumerator");
// Make sure system property is read at this point
Class<?> clazz = loader.loadClass(basePackage +
"util.http.FastHttpDateFormat");
- clazz.getDeclaredConstructor().newInstance();
+ clazz.getConstructor().newInstance();
loader.loadClass(basePackage + "util.http.parser.HttpParser");
loader.loadClass(basePackage + "util.http.parser.MediaType");
loader.loadClass(basePackage + "util.http.parser.MediaTypeCache");
Modified: tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/JDBCStore.java Thu Oct 5
18:19:57 2017
@@ -920,7 +920,7 @@ public class JDBCStore extends StoreBase
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.getDeclaredConstructor().newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
manager.getContext().getLogger().error(
sm.getString(getStoreName() +
".checkConnectionClassNotFoundException",
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Thu Oct 5
18:19:57 2017
@@ -377,7 +377,7 @@ public abstract class ManagerBase extend
return sessionIdGenerator;
} else if (sessionIdGeneratorClass != null) {
try {
- sessionIdGenerator =
sessionIdGeneratorClass.getDeclaredConstructor().newInstance();
+ sessionIdGenerator =
sessionIdGeneratorClass.getConstructor().newInstance();
return sessionIdGenerator;
} catch(ReflectiveOperationException ex) {
// Ignore
Modified: tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Bootstrap.java Thu Oct 5
18:19:57 2017
@@ -263,10 +263,8 @@ public final class Bootstrap {
// Load our startup class and call its process() method
if (log.isDebugEnabled())
log.debug("Loading startup class");
- Class<?> startupClass =
- catalinaLoader.loadClass
- ("org.apache.catalina.startup.Catalina");
- Object startupInstance =
startupClass.getDeclaredConstructor().newInstance();
+ Class<?> startupClass =
catalinaLoader.loadClass("org.apache.catalina.startup.Catalina");
+ Object startupInstance = startupClass.getConstructor().newInstance();
// Set the shared extensions class loader
if (log.isDebugEnabled())
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Thu Oct 5
18:19:57 2017
@@ -399,7 +399,7 @@ public class ContextConfig implements Li
// Instantiate and install an Authenticator of the requested class
try {
Class<?> authenticatorClass = Class.forName(authenticatorName);
- authenticator = (Valve)
authenticatorClass.getDeclaredConstructor().newInstance();
+ authenticator = (Valve)
authenticatorClass.getConstructor().newInstance();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
log.error(sm.getString(
Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Thu Oct 5
18:19:57 2017
@@ -583,8 +583,7 @@ public class HostConfig implements Lifec
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setConfigFile(contextXml.toURI().toURL());
@@ -891,8 +890,7 @@ public class HostConfig implements Lifec
cn.getPath(), Constants.ApplicationContextXml,
new File(host.getConfigBaseFile(), cn.getBaseName() +
".xml")));
} else {
- context = (Context) Class.forName(
- contextClass).getDeclaredConstructor().newInstance();
+ context = (Context)
Class.forName(contextClass).getConstructor().newInstance();
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
@@ -968,8 +966,7 @@ public class HostConfig implements Lifec
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setName(cn.getName());
@@ -1120,13 +1117,11 @@ public class HostConfig implements Lifec
cn.getPath(), xml, xmlCopy));
context = new FailedContext();
} else {
- context = (Context) Class.forName(
- contextClass).getDeclaredConstructor().newInstance();
+ context = (Context)
Class.forName(contextClass).getConstructor().newInstance();
}
Class<?> clazz = Class.forName(host.getConfigClass());
- LifecycleListener listener =
- (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
context.setName(cn.getName());
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LifecycleListenerRule.java
Thu Oct 5 18:19:57 2017
@@ -124,8 +124,7 @@ public class LifecycleListenerRule exten
// Instantiate a new LifecycleListener implementation object
Class<?> clazz = Class.forName(className);
- LifecycleListener listener =
- (LifecycleListener) clazz.getDeclaredConstructor().newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
// Add this LifecycleListener to our associated component
c.addLifecycleListener(listener);
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Thu Oct 5
18:19:57 2017
@@ -598,7 +598,7 @@ public class Tomcat {
LifecycleListener listener = null;
try {
Class<?> clazz = Class.forName(getHost().getConfigClass());
- listener = (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ listener = (LifecycleListener)
clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
// Wrap in IAE since we can't easily change the method signature to
// to throw the specific checked exceptions
@@ -1030,7 +1030,7 @@ public class Tomcat {
if (singleThreadModel) {
Servlet instance;
try {
- instance =
existing.getClass().getDeclaredConstructor().newInstance();
+ instance =
existing.getClass().getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new ServletException(e);
}
Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Thu Oct 5
18:19:57 2017
@@ -289,7 +289,7 @@ public final class UserConfig
UserDatabase database = null;
try {
Class<?> clazz = Class.forName(userClass);
- database = (UserDatabase)
clazz.getDeclaredConstructor().newInstance();
+ database = (UserDatabase) clazz.getConstructor().newInstance();
database.setUserConfig(this);
} catch (Exception e) {
host.getLogger().error(sm.getString("userConfig.database"), e);
@@ -340,12 +340,11 @@ public final class UserConfig
// Deploy the web application for this user
try {
Class<?> clazz = Class.forName(contextClass);
- Context context = (Context)
clazz.getDeclaredConstructor().newInstance();
+ Context context = (Context) clazz.getConstructor().newInstance();
context.setPath(contextPath);
context.setDocBase(app.toString());
clazz = Class.forName(configClass);
- LifecycleListener listener =
- (LifecycleListener)
clazz.getDeclaredConstructor().newInstance();
+ LifecycleListener listener = (LifecycleListener)
clazz.getConstructor().newInstance();
context.addLifecycleListener(listener);
host.addChild(context);
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Thu
Oct 5 18:19:57 2017
@@ -186,7 +186,7 @@ public class WebappServiceLoader<T> {
for (String serviceClass : servicesFound) {
try {
Class<?> clazz = Class.forName(serviceClass, true, loader);
-
services.add(serviceType.cast(clazz.getDeclaredConstructor().newInstance()));
+
services.add(serviceType.cast(clazz.getConstructor().newInstance()));
} catch (ReflectiveOperationException | ClassCastException e) {
throw new IOException(e);
}
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Thu
Oct 5 18:19:57 2017
@@ -321,7 +321,7 @@ public class StoreAppender {
* @throws ReflectiveOperationException Error creating a new instance
*/
public Object defaultInstance(Object bean) throws
ReflectiveOperationException {
- return bean.getClass().getDeclaredConstructor().newInstance();
+ return bean.getClass().getConstructor().newInstance();
}
/**
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java
Thu Oct 5 18:19:57 2017
@@ -84,7 +84,7 @@ public class StoreConfigLifecycleListene
try {
Class<?> clazz = Class.forName(getStoreConfigClass(), true, this
.getClass().getClassLoader());
- storeConfig = (IStoreConfig)
clazz.getDeclaredConstructor().newInstance();
+ storeConfig = (IStoreConfig) clazz.getConstructor().newInstance();
if (null == getStoreRegistry())
// default Loading
loader.load();
Modified:
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java Thu
Oct 5 18:19:57 2017
@@ -118,6 +118,6 @@ public class StoreFactoryRule extends Ru
className = value;
}
Class<?> clazz = Class.forName(className);
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
}
}
\ No newline at end of file
Modified: tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/SessionIdGeneratorBase.java Thu
Oct 5 18:19:57 2017
@@ -220,7 +220,7 @@ public abstract class SessionIdGenerator
try {
// Construct and seed a new random number generator
Class<?> clazz = Class.forName(secureRandomClass);
- result = (SecureRandom)
clazz.getDeclaredConstructor().newInstance();
+ result = (SecureRandom) clazz.getConstructor().newInstance();
} catch (Exception e) {
log.error(sm.getString("sessionIdGeneratorBase.random",
secureRandomClass), e);
Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Thu
Oct 5 18:19:57 2017
@@ -568,7 +568,7 @@ public final class JDBCAccessLogValve ex
if (driver == null) {
try {
Class<?> clazz = Class.forName(driverName);
- driver = (Driver) clazz.getDeclaredConstructor().newInstance();
+ driver = (Driver) clazz.getConstructor().newInstance();
} catch (Throwable e) {
ExceptionUtils.handleThrowable(e);
throw new SQLException(e.getMessage(), e);
Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Thu
Oct 5 18:19:57 2017
@@ -651,7 +651,7 @@ public class RewriteValve extends ValveB
RewriteMap map = null;
try {
map = (RewriteMap) (Class.forName(
-
rewriteMapClassName).getDeclaredConstructor().newInstance());
+
rewriteMapClassName).getConstructor().newInstance());
} catch (Exception e) {
throw new IllegalArgumentException("Invalid map className:
" + line);
}
Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu Oct 5
18:19:57 2017
@@ -242,7 +242,7 @@ public class JspCompilationContext {
protected Compiler createCompiler(String className) {
Compiler compiler = null;
try {
- compiler = (Compiler)
Class.forName(className).getDeclaredConstructor().newInstance();
+ compiler = (Compiler)
Class.forName(className).getConstructor().newInstance();
} catch (NoClassDefFoundError | ClassNotFoundException e) {
if (log.isDebugEnabled()) {
log.debug(Localizer.getMessage("jsp.error.compiler"), e);
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELInterpreterFactory.java Thu
Oct 5 18:19:57 2017
@@ -85,7 +85,7 @@ public class ELInterpreterFactory {
private static ELInterpreter createInstance(ServletContext context,
String className) throws Exception {
return (ELInterpreter) context.getClassLoader().loadClass(
- className).getDeclaredConstructor().newInstance();
+ className).getConstructor().newInstance();
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Thu Oct
5 18:19:57 2017
@@ -593,7 +593,7 @@ class TagFileProcessor {
// Dependent list. The only reliable dependency information
// can only be obtained from the tag instance.
try {
- Object tagIns =
tagClazz.getDeclaredConstructor().newInstance();
+ Object tagIns =
tagClazz.getConstructor().newInstance();
if (tagIns instanceof JspSourceDependent) {
for (Entry<String, Long> entry :
((JspSourceDependent)
tagIns).getDependants().entrySet()) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Thu
Oct 5 18:19:57 2017
@@ -290,7 +290,7 @@ class TagLibraryInfoImpl extends TagLibr
if (teiClassName != null && !teiClassName.isEmpty()) {
try {
Class<?> teiClass =
ctxt.getClassLoader().loadClass(teiClassName);
- tei = (TagExtraInfo)
teiClass.getDeclaredConstructor().newInstance();
+ tei = (TagExtraInfo) teiClass.getConstructor().newInstance();
} catch (Exception e) {
err.jspError(e, "jsp.error.teiclass.instantiation",
teiClassName);
}
@@ -346,8 +346,7 @@ class TagLibraryInfoImpl extends TagLibr
try {
Class<?> tlvClass =
ctxt.getClassLoader().loadClass(validatorClass);
- TagLibraryValidator tlv =
- (TagLibraryValidator)
tlvClass.getDeclaredConstructor().newInstance();
+ TagLibraryValidator tlv = (TagLibraryValidator)
tlvClass.getConstructor().newInstance();
tlv.setInitParameters(initParams);
return tlv;
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagPluginManager.java Thu Oct
5 18:19:57 2017
@@ -123,7 +123,7 @@ public class TagPluginManager {
String tagClass = entry.getKey();
String pluginName = entry.getValue();
Class<?> pluginClass =
ctxt.getClassLoader().loadClass(pluginName);
- TagPlugin plugin = (TagPlugin)
pluginClass.getDeclaredConstructor().newInstance();
+ TagPlugin plugin = (TagPlugin)
pluginClass.getConstructor().newInstance();
tagPlugins.put(tagClass, plugin);
} catch (Exception e) {
err.jspError(e);
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Thu Oct
5 18:19:57 2017
@@ -783,8 +783,7 @@ public class JspRuntimeLibrary {
throws JasperException
{
try {
- PropertyEditor pe =
-
(PropertyEditor)propertyEditorClass.getDeclaredConstructor().newInstance();
+ PropertyEditor pe =
(PropertyEditor)propertyEditorClass.getConstructor().newInstance();
pe.setAsText(attrValue);
return pe.getValue();
} catch (Exception ex) {
Modified: tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java Thu Oct 5
18:19:57 2017
@@ -47,7 +47,7 @@ public class TagHandlerPool {
if (tpClassName != null) {
try {
Class<?> c = Class.forName(tpClassName);
- result = (TagHandlerPool)
c.getDeclaredConstructor().newInstance();
+ result = (TagHandlerPool) c.getConstructor().newInstance();
} catch (Exception e) {
e.printStackTrace();
result = null;
@@ -112,7 +112,7 @@ public class TagHandlerPool {
return (Tag) instanceManager.newInstance(
handlerClass.getName(), handlerClass.getClassLoader());
} else {
- Tag instance =
handlerClass.getDeclaredConstructor().newInstance();
+ Tag instance = handlerClass.getConstructor().newInstance();
instanceManager.newInstance(instance);
return instance;
}
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Oct 5
18:19:57 2017
@@ -579,7 +579,7 @@ public class ClassLoaderLogManager exten
try {
this.prefix.set(prefix);
Handler handler = (Handler) classLoader.loadClass(
-
handlerClassName).getDeclaredConstructor().newInstance();
+ handlerClassName).getConstructor().newInstance();
// The specification strongly implies all configuration
should be done
// during the creation of the handler object.
// This includes setting level, filter, formatter and
encoding.
Modified: tomcat/trunk/java/org/apache/juli/FileHandler.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/FileHandler.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/FileHandler.java (original)
+++ tomcat/trunk/java/org/apache/juli/FileHandler.java Thu Oct 5 18:19:57 2017
@@ -424,7 +424,7 @@ public class FileHandler extends Handler
String filterName = getProperty(className + ".filter", null);
if (filterName != null) {
try {
- setFilter((Filter)
cl.loadClass(filterName).getDeclaredConstructor().newInstance());
+ setFilter((Filter)
cl.loadClass(filterName).getConstructor().newInstance());
} catch (Exception e) {
// Ignore
}
@@ -435,7 +435,7 @@ public class FileHandler extends Handler
if (formatterName != null) {
try {
setFormatter((Formatter) cl.loadClass(
- formatterName).getDeclaredConstructor().newInstance());
+ formatterName).getConstructor().newInstance());
} catch (Exception e) {
// Ignore and fallback to defaults
setFormatter(new OneLineFormatter());
Modified: tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/DirectJDKLog.java Thu Oct 5
18:19:57 2017
@@ -42,12 +42,12 @@ class DirectJDKLog implements Log {
// default configuration - it sucks. Let's override at least the
// formatter for the console
try {
-
Class.forName(SIMPLE_CFG).getDeclaredConstructor().newInstance();
+ Class.forName(SIMPLE_CFG).getConstructor().newInstance();
} catch( Throwable t ) {
}
try {
Formatter fmt= (Formatter) Class.forName(System.getProperty(
- FORMATTER,
SIMPLE_FMT)).getDeclaredConstructor().newInstance();
+ FORMATTER, SIMPLE_FMT)).getConstructor().newInstance();
// it is also possible that the user modified
jre/lib/logging.properties -
// but that's really stupid in most cases
Logger root=Logger.getLogger("");
Modified: tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/BeanFactory.java Thu Oct 5
18:19:57 2017
@@ -145,7 +145,7 @@ public class BeanFactory
BeanInfo bi = Introspector.getBeanInfo(beanClass);
PropertyDescriptor[] pda = bi.getPropertyDescriptors();
- Object bean = beanClass.getDeclaredConstructor().newInstance();
+ Object bean = beanClass.getConstructor().newInstance();
/* Look for properties with explicitly configured setter */
RefAddr ra = ref.get("forceString");
Modified: tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/EjbFactory.java Thu Oct 5
18:19:57 2017
@@ -44,7 +44,7 @@ public class EjbFactory extends FactoryB
"javax.ejb.Factory", Constants.OPENEJB_EJB_FACTORY);
try {
factory = (ObjectFactory)
-
Class.forName(javaxEjbFactoryClassName).getDeclaredConstructor().newInstance();
+
Class.forName(javaxEjbFactoryClassName).getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified: tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/FactoryBase.java Thu Oct 5
18:19:57 2017
@@ -69,7 +69,7 @@ public abstract class FactoryBase implem
throw ex;
}
try {
- factory = (ObjectFactory)
factoryClass.getDeclaredConstructor().newInstance();
+ factory = (ObjectFactory)
factoryClass.getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified: tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/ResourceFactory.java Thu Oct 5
18:19:57 2017
@@ -45,7 +45,7 @@ public class ResourceFactory extends Fac
Constants.DBCP_DATASOURCE_FACTORY);
try {
factory = (ObjectFactory) Class.forName(
-
javaxSqlDataSourceFactoryClassName).getDeclaredConstructor().newInstance();
+
javaxSqlDataSourceFactoryClassName).getConstructor().newInstance();
} catch (Exception e) {
NamingException ex = new NamingException(
"Could not create resource factory instance");
@@ -58,7 +58,7 @@ public class ResourceFactory extends Fac
"org.apache.naming.factory.MailSessionFactory");
try {
factory = (ObjectFactory) Class.forName(
-
javaxMailSessionFactoryClassName).getDeclaredConstructor().newInstance();
+
javaxMailSessionFactoryClassName).getConstructor().newInstance();
} catch(Throwable t) {
if (t instanceof NamingException) {
throw (NamingException) t;
Modified: tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/SimpleInstanceManager.java Thu Oct 5
18:19:57 2017
@@ -33,7 +33,7 @@ public class SimpleInstanceManager imple
@Override
public Object newInstance(Class<?> clazz) throws IllegalAccessException,
InvocationTargetException, NamingException,
InstantiationException, NoSuchMethodException {
- return prepareInstance(clazz.getDeclaredConstructor().newInstance());
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
@@ -41,7 +41,7 @@ public class SimpleInstanceManager imple
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException, NoSuchMethodException {
Class<?> clazz =
Thread.currentThread().getContextClassLoader().loadClass(className);
- return prepareInstance(clazz.getDeclaredConstructor().newInstance());
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
@@ -49,7 +49,7 @@ public class SimpleInstanceManager imple
InvocationTargetException, NamingException, InstantiationException,
ClassNotFoundException, NoSuchMethodException {
Class<?> clazz = classLoader.loadClass(fqcn);
- return prepareInstance(clazz.getDeclaredConstructor().newInstance());
+ return prepareInstance(clazz.getConstructor().newInstance());
}
@Override
Modified: tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java Thu Oct
5 18:19:57 2017
@@ -2153,7 +2153,7 @@ public class BasicDataSource implements
// Usage of DriverManager is not possible, as it does not
// respect the ContextClassLoader
// N.B. This cast may cause ClassCastException which is
handled below
- driverToUse = (Driver)
driverFromCCL.getDeclaredConstructor().newInstance();
+ driverToUse = (Driver)
driverFromCCL.getConstructor().newInstance();
if (!driverToUse.acceptsURL(url)) {
throw new SQLException("No suitable driver", "08001");
}
Modified:
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/dbcp/pool2/impl/BaseGenericObjectPool.java
Thu Oct 5 18:19:57 2017
@@ -605,7 +605,7 @@ public abstract class BaseGenericObjectP
} catch (final ClassNotFoundException e) {
clazz = Class.forName(evictionPolicyClassName);
}
- final Object policy = clazz.getDeclaredConstructor().newInstance();
+ final Object policy = clazz.getConstructor().newInstance();
if (policy instanceof EvictionPolicy<?>) {
@SuppressWarnings("unchecked") // safe, because we just
checked the class
final
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Thu Oct 5
18:19:57 2017
@@ -95,7 +95,7 @@ public class Digester extends DefaultHan
try {
Class<?> clazz = Class.forName(className, true, cls[i]);
source = (IntrospectionUtils.PropertySource)
- clazz.getDeclaredConstructor().newInstance();
+ clazz.getConstructor().newInstance();
break;
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
Modified:
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Thu
Oct 5 18:19:57 2017
@@ -114,7 +114,7 @@ public class ObjectCreateRule extends Ru
// Instantiate the new object and push it on the context stack
Class<?> clazz = digester.getClassLoader().loadClass(realClassName);
- Object instance = clazz.getDeclaredConstructor().newInstance();
+ Object instance = clazz.getConstructor().newInstance();
digester.push(instance);
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Thu Oct
5 18:19:57 2017
@@ -318,7 +318,7 @@ public class ManagedBean implements java
}
try {
// Stupid - this will set the default minfo first....
- mbean = (BaseModelMBean)
clazz.getDeclaredConstructor().newInstance();
+ mbean = (BaseModelMBean) clazz.getConstructor().newInstance();
} catch (RuntimeOperationsException e) {
throw e;
} catch (Exception e) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Thu Oct 5
18:19:57 2017
@@ -711,7 +711,7 @@ public class Registry implements Registr
}
Class<?> c = Class.forName(type);
- ModelerSource
ds=(ModelerSource)c.getDeclaredConstructor().newInstance();
+ ModelerSource ds=(ModelerSource)c.getConstructor().newInstance();
return ds;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLImplementation.java Thu Oct
5 18:19:57 2017
@@ -53,7 +53,7 @@ public abstract class SSLImplementation
try {
Class<?> clazz = Class.forName(className);
- return (SSLImplementation)
clazz.getDeclaredConstructor().newInstance();
+ return (SSLImplementation) clazz.getConstructor().newInstance();
} catch (Exception e) {
String msg = sm.getString("sslImplementation.cnfe", className);
if (logger.isDebugEnabled()) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSEUtil.java Thu Oct 5
18:19:57 2017
@@ -290,7 +290,7 @@ public class JSSEUtil extends SSLUtilBas
throw new InstantiationException(sm.getString(
"jsse.invalidTrustManagerClassName", className));
}
- Object trustManagerObject =
clazz.getDeclaredConstructor().newInstance();
+ Object trustManagerObject = clazz.getConstructor().newInstance();
TrustManager trustManager = (TrustManager) trustManagerObject;
return new TrustManager[]{ trustManager };
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java Thu
Oct 5 18:19:57 2017
@@ -42,6 +42,7 @@ import org.apache.tomcat.JarScanner;
import org.apache.tomcat.JarScannerCallback;
import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.buf.UriUtil;
+import org.apache.tomcat.util.compat.JreCompat;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -225,78 +226,91 @@ public class StandardJarScanner implemen
// Scan the classpath
if (isScanClassPath()) {
- if (log.isTraceEnabled()) {
- log.trace(sm.getString("jarScan.classloaderStart"));
- }
+ doScanClassPath(scanType, context, callback, processedURLs);
+ }
+ }
- ClassLoader stopLoader = null;
- if (!isScanBootstrapClassPath()) {
- // Stop when we reach the bootstrap class loader
- stopLoader = ClassLoader.getSystemClassLoader().getParent();
- }
- ClassLoader classLoader = context.getClassLoader();
+ protected void doScanClassPath(JarScanType scanType, ServletContext
context,
+ JarScannerCallback callback, Set<URL> processedURLs) {
+ if (log.isTraceEnabled()) {
+ log.trace(sm.getString("jarScan.classloaderStart"));
+ }
+
+ ClassLoader stopLoader = null;
+ if (!isScanBootstrapClassPath()) {
+ // Stop when we reach the bootstrap class loader
+ stopLoader = ClassLoader.getSystemClassLoader().getParent();
+ }
+
+ ClassLoader classLoader = context.getClassLoader();
- // JARs are treated as application provided until the common class
- // loader is reached.
- boolean isWebapp = true;
-
- while (classLoader != null && classLoader != stopLoader) {
- if (classLoader instanceof URLClassLoader) {
- if (isWebapp) {
- isWebapp = isWebappClassLoader(classLoader);
+ // JARs are treated as application provided until the common class
+ // loader is reached.
+ boolean isWebapp = true;
+
+ while (classLoader != null && classLoader != stopLoader) {
+ if (classLoader instanceof URLClassLoader) {
+ if (isWebapp) {
+ isWebapp = isWebappClassLoader(classLoader);
+ }
+
+ // Use a Deque so URLs can be removed as they are processed
+ // and new URLs can be added as they are discovered during
+ // processing.
+ Deque<URL> classPathUrlsToProcess = new LinkedList<>();
+ classPathUrlsToProcess.addAll(
+ Arrays.asList(((URLClassLoader)
classLoader).getURLs()));
+
+ while (!classPathUrlsToProcess.isEmpty()) {
+ URL url = classPathUrlsToProcess.pop();
+
+ if (processedURLs.contains(url)) {
+ // Skip this URL it has already been processed
+ continue;
}
- // Use a Deque so URLs can be removed as they are processed
- // and new URLs can be added as they are discovered during
- // processing.
- Deque<URL> classPathUrlsToProcess = new LinkedList<>();
- classPathUrlsToProcess.addAll(
- Arrays.asList(((URLClassLoader)
classLoader).getURLs()));
-
- while (!classPathUrlsToProcess.isEmpty()) {
- URL url = classPathUrlsToProcess.pop();
-
- if (processedURLs.contains(url)) {
- // Skip this URL it has already been processed
- continue;
+ // TODO: Java 9 support. Details are TBD. It will depend
+ // on the extent to which Java 8 supports the
+ // Java 9 file formats since this code MUST run on
+ // Java 8.
+ ClassPathEntry cpe = new ClassPathEntry(url);
+
+ // JARs are scanned unless the filter says not to.
+ // Directories are scanned for pluggability scans or
+ // if scanAllDirectories is enabled unless the
+ // filter says not to.
+ if ((cpe.isJar() ||
+ scanType == JarScanType.PLUGGABILITY ||
+ isScanAllDirectories()) &&
+ getJarScanFilter().check(scanType,
+ cpe.getName())) {
+ if (log.isDebugEnabled()) {
+
log.debug(sm.getString("jarScan.classloaderJarScan", url));
}
-
- // TODO: Java 9 support. Details are TBD. It will
depend
- // on the extent to which Java 8 supports the
- // Java 9 file formats since this code MUST run
on
- // Java 8.
- ClassPathEntry cpe = new ClassPathEntry(url);
-
- // JARs are scanned unless the filter says not to.
- // Directories are scanned for pluggability scans or
- // if scanAllDirectories is enabled unless the
- // filter says not to.
- if ((cpe.isJar() ||
- scanType == JarScanType.PLUGGABILITY ||
- isScanAllDirectories()) &&
- getJarScanFilter().check(scanType,
- cpe.getName())) {
- if (log.isDebugEnabled()) {
-
log.debug(sm.getString("jarScan.classloaderJarScan", url));
- }
- try {
- processedURLs.add(url);
- process(scanType, callback, url, null,
isWebapp, classPathUrlsToProcess);
- } catch (IOException ioe) {
-
log.warn(sm.getString("jarScan.classloaderFail", url), ioe);
- }
- } else {
- // JAR / directory has been skipped
- if (log.isTraceEnabled()) {
-
log.trace(sm.getString("jarScan.classloaderJarNoScan", url));
- }
+ try {
+ processedURLs.add(url);
+ process(scanType, callback, url, null, isWebapp,
classPathUrlsToProcess);
+ } catch (IOException ioe) {
+ log.warn(sm.getString("jarScan.classloaderFail",
url), ioe);
+ }
+ } else {
+ // JAR / directory has been skipped
+ if (log.isTraceEnabled()) {
+
log.trace(sm.getString("jarScan.classloaderJarNoScan", url));
}
}
}
- classLoader = classLoader.getParent();
}
+ classLoader = classLoader.getParent();
}
+
+ if (JreCompat.isJre9Available()) {
+ // The application and platform class loaders are not instances of
+ // URLClassLoader
+
+ }
+
}
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Thu Oct 5 18:19:57
2017
@@ -342,7 +342,7 @@ public class Util {
@SuppressWarnings("unused")
Decoder instance;
try {
- instance =
decoderClazz.getDeclaredConstructor().newInstance();
+ instance = decoderClazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new DeploymentException(
sm.getString("pojoMethodMapping.invalidDecoder",
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java
Thu Oct 5 18:19:57 2017
@@ -676,7 +676,7 @@ public abstract class WsRemoteEndpointIm
endpointConfig.getEncoders()) {
Encoder instance;
try {
- instance = encoderClazz.getDeclaredConstructor().newInstance();
+ instance = encoderClazz.getConstructor().newInstance();
instance.init(endpointConfig);
} catch (ReflectiveOperationException e) {
throw new DeploymentException(
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java Thu
Oct 5 18:19:57 2017
@@ -132,7 +132,7 @@ public class WsWebSocketContainer implem
if (!ClientEndpointConfig.Configurator.class.equals(
configuratorClazz)) {
try {
- configurator =
configuratorClazz.getDeclaredConstructor().newInstance();
+ configurator =
configuratorClazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new DeploymentException(sm.getString(
"wsWebSocketContainer.defaultConfiguratorFail"), e);
@@ -159,7 +159,7 @@ public class WsWebSocketContainer implem
Object pojo;
try {
- pojo =
annotatedEndpointClass.getDeclaredConstructor().newInstance();
+ pojo = annotatedEndpointClass.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new DeploymentException(sm.getString(
"wsWebSocketContainer.endpointCreateFail",
@@ -177,7 +177,7 @@ public class WsWebSocketContainer implem
Endpoint endpoint;
try {
- endpoint = clazz.getDeclaredConstructor().newInstance();
+ endpoint = clazz.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new DeploymentException(sm.getString(
"wsWebSocketContainer.endpointCreateFail",
clazz.getName()),
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeBinary.java
Thu Oct 5 18:19:57 2017
@@ -66,14 +66,13 @@ public class PojoMessageHandlerWholeBina
if (decoderClazzes != null) {
for (Class<? extends Decoder> decoderClazz : decoderClazzes) {
if (Binary.class.isAssignableFrom(decoderClazz)) {
- Binary<?> decoder =
- (Binary<?>)
decoderClazz.getDeclaredConstructor().newInstance();
+ Binary<?> decoder = (Binary<?>)
decoderClazz.getConstructor().newInstance();
decoder.init(config);
decoders.add(decoder);
} else if (BinaryStream.class.isAssignableFrom(
decoderClazz)) {
BinaryStream<?> decoder = (BinaryStream<?>)
-
decoderClazz.getDeclaredConstructor().newInstance();
+ decoderClazz.getConstructor().newInstance();
decoder.init(config);
decoders.add(decoder);
} else {
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerWholeText.java
Thu Oct 5 18:19:57 2017
@@ -75,14 +75,13 @@ public class PojoMessageHandlerWholeText
if (decoderClazzes != null) {
for (Class<? extends Decoder> decoderClazz : decoderClazzes) {
if (Text.class.isAssignableFrom(decoderClazz)) {
- Text<?> decoder =
- (Text<?>)
decoderClazz.getDeclaredConstructor().newInstance();
+ Text<?> decoder = (Text<?>)
decoderClazz.getConstructor().newInstance();
decoder.init(config);
decoders.add(decoder);
} else if (TextStream.class.isAssignableFrom(
decoderClazz)) {
TextStream<?> decoder =
- (TextStream<?>)
decoderClazz.getDeclaredConstructor().newInstance();
+ (TextStream<?>)
decoderClazz.getConstructor().newInstance();
decoder.init(config);
decoders.add(decoder);
} else {
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java
Thu Oct 5 18:19:57 2017
@@ -33,7 +33,7 @@ public class DefaultServerEndpointConfig
public <T> T getEndpointInstance(Class<T> clazz)
throws InstantiationException {
try {
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
} catch (InstantiationException e) {
throw e;
} catch (ReflectiveOperationException e) {
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsSci.java Thu Oct 5
18:19:57 2017
@@ -72,7 +72,7 @@ public class WsSci implements ServletCon
}
if (ServerApplicationConfig.class.isAssignableFrom(clazz)) {
serverApplicationConfigs.add(
- (ServerApplicationConfig)
clazz.getDeclaredConstructor().newInstance());
+ (ServerApplicationConfig)
clazz.getConstructor().newInstance());
}
if (Endpoint.class.isAssignableFrom(clazz)) {
@SuppressWarnings("unchecked")
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/server/WsServerContainer.java
Thu Oct 5 18:19:57 2017
@@ -214,7 +214,7 @@ public class WsServerContainer extends W
Configurator configurator = null;
if (!configuratorClazz.equals(Configurator.class)) {
try {
- configurator =
annotation.configurator().getDeclaredConstructor().newInstance();
+ configurator =
annotation.configurator().getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new DeploymentException(sm.getString(
"serverContainer.configuratorFail",
@@ -416,7 +416,7 @@ public class WsServerContainer extends W
@SuppressWarnings("unused")
Encoder instance;
try {
- encoder.getDeclaredConstructor().newInstance();
+ encoder.getConstructor().newInstance();
} catch(ReflectiveOperationException e) {
throw new DeploymentException(sm.getString(
"serverContainer.encoderFail", encoder.getName()), e);
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/naming/GenericNamingResourcesFactory.java
Thu Oct 5 18:19:57 2017
@@ -63,7 +63,7 @@ public class GenericNamingResourcesFacto
ClassLoaderUtil.loadClass(
type,
GenericNamingResourcesFactory.class.getClassLoader(),
-
Thread.currentThread().getContextClassLoader()).getDeclaredConstructor().newInstance();
+
Thread.currentThread().getContextClassLoader()).getConstructor().newInstance();
while (refs.hasMoreElements()) {
RefAddr addr = refs.nextElement();
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Oct 5 18:19:57 2017
@@ -302,7 +302,7 @@ public class ConnectionPool {
for (int i=proxies.length-1; i>=0; i--) {
try {
//create a new instance
- JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getDeclaredConstructor().newInstance();
+ JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getConstructor().newInstance();
//configure properties
interceptor.setProperties(proxies[i].getProperties());
//setup the chain
@@ -415,7 +415,7 @@ public class ConnectionPool {
PoolProperties.InterceptorDefinition[] proxies =
getPoolProperties().getJdbcInterceptorsAsArray();
for (int i=0; i<proxies.length; i++) {
try {
- JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getDeclaredConstructor().newInstance();
+ JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getConstructor().newInstance();
interceptor.setProperties(proxies[i].getProperties());
interceptor.poolClosed(this);
}catch (Exception x) {
@@ -462,7 +462,7 @@ public class ConnectionPool {
if (log.isDebugEnabled()) {
log.debug("Creating interceptor instance of
class:"+proxies[i].getInterceptorClass());
}
- JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getDeclaredConstructor().newInstance();
+ JdbcInterceptor interceptor =
proxies[i].getInterceptorClass().getConstructor().newInstance();
interceptor.setProperties(proxies[i].getProperties());
interceptor.poolStarted(this);
}catch (Exception x) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Thu Oct 5 18:19:57 2017
@@ -773,7 +773,7 @@ public class PoolProperties implements P
PoolProperties.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
);
- validator = validatorClass.getDeclaredConstructor().newInstance();
+ validator = validatorClass.getConstructor().newInstance();
} catch (ClassNotFoundException e) {
log.warn("The class "+className+" cannot be found.", e);
} catch (ClassCastException e) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Thu Oct 5 18:19:57 2017
@@ -273,7 +273,7 @@ public class PooledConnection {
poolProperties.getDriverClassName(),
PooledConnection.class.getClassLoader(),
Thread.currentThread().getContextClassLoader()
- ).getDeclaredConstructor().newInstance();
+ ).getConstructor().newInstance();
}
}
} catch (java.lang.Exception cn) {
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderThreadLocalMemoryLeak.java
Thu Oct 5 18:19:57 2017
@@ -196,7 +196,7 @@ public class TestWebappClassLoaderThread
"org.apache.tomcat.unittest." + name, classBytes, 0,
offset, cl.getClass().getProtectionDomain());
// Make sure we can create an instance
- Object obj = lpClass.getDeclaredConstructor().newInstance();
+ Object obj = lpClass.getConstructor().newInstance();
obj.toString();
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/loader/TestWebappClassLoaderWeaving.java
Thu Oct 5 18:19:57 2017
@@ -307,7 +307,7 @@ public class TestWebappClassLoaderWeavin
Method m = c.getMethod("doMethod");
- Object o = c.getDeclaredConstructor().newInstance();
+ Object o = c.getConstructor().newInstance();
return (String) m.invoke(o);
}
Modified: tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/demos/ChannelCreator.java Thu
Oct 5 18:19:57 2017
@@ -171,7 +171,7 @@ public class ChannelCreator {
System.out.println("Creating receiver class="+receiver);
Class<?> cl = Class.forName(receiver, true,
ChannelCreator.class.getClassLoader());
- ReceiverBase rx =
(ReceiverBase)cl.getDeclaredConstructor().newInstance();
+ ReceiverBase rx = (ReceiverBase)cl.getConstructor().newInstance();
rx.setAddress(bind);
rx.setPort(port);
rx.setSelectorTimeout(tcpseltimeout);
@@ -186,7 +186,7 @@ public class ChannelCreator {
ReplicationTransmitter ps = new ReplicationTransmitter();
System.out.println("Creating transport class="+transport);
MultiPointSender sender = (MultiPointSender)Class.forName(
-
transport,true,ChannelCreator.class.getClassLoader()).getDeclaredConstructor().newInstance();
+
transport,true,ChannelCreator.class.getClassLoader()).getConstructor().newInstance();
sender.setTimeout(acktimeout);
sender.setMaxRetryAttempts(2);
sender.setRxBufSize(43800);
Modified: tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java?rev=1811220&r1=1811219&r2=1811220&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java (original)
+++ tomcat/trunk/test/org/apache/naming/resources/TesterFactory.java Thu Oct 5
18:19:57 2017
@@ -41,7 +41,7 @@ public class TesterFactory implements Ob
ClassLoader cl =
Thread.currentThread().getContextClassLoader();
Class<?> clazz =
cl.loadClass("org.apache.naming.resources.TesterObject");
- return clazz.getDeclaredConstructor().newInstance();
+ return clazz.getConstructor().newInstance();
}
}
return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
