Author: markt
Date: Thu Aug 8 18:07:43 2013
New Revision: 1511907
URL: http://svn.apache.org/r1511907
Log:
Switch from ignoring unavoidable generics warnings in Eclipse to
explicitly using @SuppressWarnings
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/javax/el/StandardELContext.java
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.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/interceptor/StatementCache.java
tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Aug 8 18:07:43 2013
@@ -558,9 +558,7 @@
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
- <!-- Uncomment this to show unchecked warnings:
<compilerarg value="-Xlint:unchecked"/>
- -->
<include name="org/apache/tomcat/buildutil/CheckEol*" />
</javac>
@@ -613,9 +611,7 @@
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
- <!-- Uncomment this to show unchecked warnings:
<compilerarg value="-Xlint:unchecked"/>
- -->
<classpath refid="compile.classpath" />
<exclude name="org/apache/naming/factory/webservices/**" />
<exclude name="org/apache/tomcat/spdy/NetSupportJava7*"
unless="npn.exists"/>
Modified: tomcat/trunk/java/javax/el/StandardELContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/StandardELContext.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/StandardELContext.java (original)
+++ tomcat/trunk/java/javax/el/StandardELContext.java Thu Aug 8 18:07:43 2013
@@ -75,7 +75,8 @@ public class StandardELContext extends E
// Can't use Class<?> because API needs to match specification
@Override
- public void putContext(Class key, Object contextObject) {
+ public void putContext(@SuppressWarnings("rawtypes") Class key,
+ Object contextObject) {
if (wrappedContext == null) {
super.putContext(key, contextObject);
} else {
@@ -84,7 +85,7 @@ public class StandardELContext extends E
}
@Override
- public Object getContext(Class key) {
+ public Object getContext(@SuppressWarnings("rawtypes") Class key) {
if (wrappedContext == null) {
return super.getContext(key);
} else {
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Thu Aug 8
18:07:43 2013
@@ -44,6 +44,7 @@ public abstract class ContainerProvider
// Fall-back. Also used by unit tests
if (result == null) {
try {
+ @SuppressWarnings("unchecked")
Class<WebSocketContainer> clazz =
(Class<WebSocketContainer>) Class.forName(
DEFAULT_PROVIDER_CLASS_NAME);
Modified: tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java
(original)
+++ tomcat/trunk/java/javax/websocket/server/ServerEndpointConfig.java Thu Aug
8 18:07:43 2013
@@ -170,6 +170,7 @@ public interface ServerEndpointConfig ex
// Fall-back. Also used by unit tests
if (result == null) {
try {
+ @SuppressWarnings("unchecked")
Class<Configurator> clazz =
(Class<Configurator>) Class.forName(
DEFAULT_IMPL_CLASSNAME);
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=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Thu Aug 8
18:07:43 2013
@@ -1876,6 +1876,7 @@ public class Request
*
* @since Servlet 3.1
*/
+ @SuppressWarnings("unchecked")
@Override
public <T extends HttpUpgradeHandler> T upgrade(
Class<T> httpUpgradeHandlerClass) throws java.io.IOException,
ServletException {
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Thu Aug
8 18:07:43 2013
@@ -926,6 +926,7 @@ public class ApplicationContext
public <T extends Filter> T createFilter(Class<T> c)
throws ServletException {
try {
+ @SuppressWarnings("unchecked")
T filter = (T)
context.getInstanceManager().newInstance(c.getName());
return filter;
} catch (IllegalAccessException e) {
@@ -1068,6 +1069,7 @@ public class ApplicationContext
public <T extends Servlet> T createServlet(Class<T> c)
throws ServletException {
try {
+ @SuppressWarnings("unchecked")
T servlet = (T)
context.getInstanceManager().newInstance(c.getName());
context.dynamicServletCreated(servlet);
return servlet;
@@ -1295,6 +1297,7 @@ public class ApplicationContext
public <T extends EventListener> T createListener(Class<T> c)
throws ServletException {
try {
+ @SuppressWarnings("unchecked")
T listener =
(T) context.getInstanceManager().newInstance(c);
if (listener instanceof ServletContextListener ||
Modified: tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/AsyncContextImpl.java Thu Aug 8
18:07:43 2013
@@ -282,6 +282,7 @@ public class AsyncContextImpl implements
listeners.add(wrapper);
}
+ @SuppressWarnings("unchecked")
@Override
public <T extends AsyncListener> T createListener(Class<T> clazz)
throws ServletException {
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Thu
Aug 8 18:07:43 2013
@@ -176,6 +176,7 @@ public class CsrfPreventionFilter extend
HttpSession session = req.getSession(false);
+ @SuppressWarnings("unchecked")
LruCache<String> nonceCache = (session == null) ? null
: (LruCache<String>) session.getAttribute(
Constants.CSRF_NONCE_SESSION_ATTR_NAME);
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Aug
8 18:07:43 2013
@@ -1800,6 +1800,7 @@ public class WebappClassLoader
defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
classBytes, 0, offset,
this.getClass().getProtectionDomain());
Object obj = lpClass.newInstance();
+ @SuppressWarnings("unchecked")
List<String> driverNames = (List<String>) obj.getClass().getMethod(
"clearJdbcDriverRegistrations").invoke(obj);
for (String name : driverNames) {
@@ -1828,6 +1829,7 @@ public class WebappClassLoader
private final void clearReferencesStaticFinal() {
+ @SuppressWarnings("unchecked")
Collection<ResourceEntry> values =
((HashMap<String,ResourceEntry>) resourceEntries.clone()).values();
Iterator<ResourceEntry> loadedClasses = values.iterator();
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Thu Aug 8
18:07:43 2013
@@ -629,6 +629,7 @@ public class JAASRealm extends RealmBase
URL resource = Thread.currentThread().getContextClassLoader().
getResource(configFile);
URI uri = resource.toURI();
+ @SuppressWarnings("unchecked")
Class<Configuration> sunConfigFile = (Class<Configuration>)
Class.forName("com.sun.security.auth.login.ConfigFile");
Constructor<Configuration> constructor =
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=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Thu Aug 8
18:07:43 2013
@@ -1415,6 +1415,7 @@ public abstract class RealmBase extends
return new X509SubjectDnRetriever();
try {
+ @SuppressWarnings("unchecked")
Class<? extends X509UsernameRetriever> clazz = (Class<? extends
X509UsernameRetriever>)Class.forName(className);
return clazz.newInstance();
} catch (ClassNotFoundException 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=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/WebappServiceLoader.java Thu
Aug 8 18:07:43 2013
@@ -82,6 +82,7 @@ public class WebappServiceLoader<T> {
// if the ServletContext has ORDERED_LIBS, then use that to specify the
// set of JARs from WEB-INF/lib that should be used for loading
services
+ @SuppressWarnings("unchecked")
List<String> orderedLibs =
(List<String>)
context.getAttribute(ServletContext.ORDERED_LIBS);
if (orderedLibs != null) {
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TwoPhaseCommitInterceptor.java
Thu Aug 8 18:07:43 2013
@@ -116,6 +116,7 @@ public class TwoPhaseCommitInterceptor e
public void heartbeat() {
try {
long now = System.currentTimeMillis();
+ @SuppressWarnings("unchecked")
Map.Entry<UniqueId,MapEntry>[] entries =
messages.entrySet().toArray(new Map.Entry[messages.size()]);
for (int i=0; i<entries.length; i++ ) {
MapEntry entry = entries[i].getValue();
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/Membership.java Thu
Aug 8 18:07:43 2013
@@ -69,6 +69,7 @@ public class Membership implements Clone
public Object clone() {
synchronized (membersLock) {
Membership clone = new Membership(local, memberComparator);
+ @SuppressWarnings("unchecked")
final HashMap<Member, MbrEntry> tmpclone = (HashMap<Member,
MbrEntry>) map.clone();
clone.map = tmpclone;
clone.members = new Member[members.length];
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
Thu Aug 8 18:07:43 2013
@@ -377,6 +377,7 @@ public abstract class AbstractReplicated
public Member[] getMapMembersExcl(Member[] exclude) {
synchronized (mapMembers) {
+ @SuppressWarnings("unchecked")
HashMap<Member, Long> list = (HashMap<Member,
Long>)mapMembers.clone();
for (int i=0; i<exclude.length;i++) list.remove(exclude[i]);
return getMapMembers(list);
@@ -1007,6 +1008,7 @@ public abstract class AbstractReplicated
public void putAll(Map<? extends K, ? extends V> m) {
Iterator<?> i = m.entrySet().iterator();
while ( i.hasNext() ) {
+ @SuppressWarnings("unchecked")
Map.Entry<K,V> entry = (Map.Entry<K,V>) i.next();
put(entry.getKey(),entry.getValue());
}
@@ -1247,6 +1249,7 @@ public abstract class AbstractReplicated
* @throws IOException
* @throws ClassNotFoundException
*/
+ @SuppressWarnings("unchecked")
public void apply(byte[] data, int offset, int length, boolean diff)
throws IOException, ClassNotFoundException {
if (isDiffable() && diff) {
ReplicatedMapEntry rentry = (ReplicatedMapEntry) value;
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/MultipointBioSender.java
Thu Aug 8 18:07:43 2013
@@ -139,6 +139,7 @@ public class MultipointBioSender extends
@Override
public boolean keepalive() {
boolean result = false;
+ @SuppressWarnings("unchecked")
Map.Entry<Member,BioSender>[] entries =
bioSenders.entrySet().toArray(new Map.Entry[bioSenders.size()]);
for ( int i=0; i<entries.length; i++ ) {
BioSender sender = entries[i].getValue();
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
Aug 8 18:07:43 2013
@@ -790,6 +790,7 @@ public abstract class AbstractHttp11Proc
InputFilter savedBody = new SavedRequestInputFilter(body);
savedBody.setRequest(request);
+ @SuppressWarnings("unchecked")
AbstractInputBuffer<S> internalBuffer = (AbstractInputBuffer<S>)
request.getInputBuffer();
internalBuffer.addActiveFilter(savedBody);
Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Protocol.java Thu
Aug 8 18:07:43 2013
@@ -177,6 +177,7 @@ public abstract class AbstractHttp11Prot
}
protected NpnHandler<S> npnHandler;
+ @SuppressWarnings("unchecked")
public void setNpnHandler(String impl) {
try {
Class<?> c = Class.forName(impl);
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Thu Aug 8
18:07:43 2013
@@ -59,7 +59,7 @@ public final class EvaluationContext ext
@Override
// Can't use Class<?> because API needs to match specification in
superclass
- public Object getContext(Class key) {
+ public Object getContext(@SuppressWarnings("rawtypes") Class key) {
return elContext.getContext(key);
}
@@ -75,7 +75,8 @@ public final class EvaluationContext ext
@Override
// Can't use Class<?> because API needs to match specification in
superclass
- public void putContext(Class key, Object contextObject) {
+ public void putContext(@SuppressWarnings("rawtypes") Class key,
+ Object contextObject) {
elContext.putContext(key, contextObject);
}
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu Aug 8
18:07:43 2013
@@ -80,6 +80,7 @@ public class FunctionMapperImpl extends
*
* @see java.io.Externalizable#readExternal(java.io.ObjectInput)
*/
+ @SuppressWarnings("unchecked")
@Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java Thu Aug 8
18:07:43 2013
@@ -52,6 +52,7 @@ public class VariableMapperImpl extends
}
}
+ @SuppressWarnings("unchecked")
@Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Thu Aug 8
18:07:43 2013
@@ -55,7 +55,7 @@ public final class ELContextWrapper exte
}
@Override
- public Object getContext(Class key) {
+ public Object getContext(@SuppressWarnings("rawtypes") Class key) {
return this.target.getContext(key);
}
@@ -70,7 +70,8 @@ public final class ELContextWrapper exte
}
@Override
- public void putContext(Class key, Object contextObject) throws
NullPointerException {
+ public void putContext(@SuppressWarnings("rawtypes") Class key,
+ Object contextObject) throws NullPointerException {
this.target.putContext(key, contextObject);
}
Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Thu Aug
8 18:07:43 2013
@@ -35,7 +35,8 @@ public final class ExpressionEvaluatorIm
}
@Override
- public Expression parseExpression(String expression, Class expectedType,
+ public Expression parseExpression(String expression,
+ @SuppressWarnings("rawtypes") Class expectedType,
FunctionMapper fMapper) throws ELException {
try {
ELContextImpl ctx =
@@ -51,7 +52,8 @@ public final class ExpressionEvaluatorIm
}
@Override
- public Object evaluate(String expression, Class expectedType,
+ public Object evaluate(String expression,
+ @SuppressWarnings("rawtypes") Class expectedType,
VariableResolver vResolver, FunctionMapper fMapper)
throws ELException {
return this.parseExpression(expression, expectedType,
fMapper).evaluate(vResolver);
Modified:
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
(original)
+++ tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceProxy.java
Thu Aug 8 18:07:43 2013
@@ -103,7 +103,8 @@ public class ServiceProxy implements Inv
String nameString = name.getLocalPart();
Class<?> serviceendpointClass = (Class<?>) args[1];
- for (Iterator<QName> ports = service.getPorts(); ports.hasNext();) {
+ for (@SuppressWarnings("unchecked")
+ Iterator<QName> ports = service.getPorts(); ports.hasNext();) {
QName portName = ports.next();
String portnameString = portName.getLocalPart();
if (portnameString.equals(nameString)) {
Modified:
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
(original)
+++
tomcat/trunk/java/org/apache/naming/factory/webservices/ServiceRefFactory.java
Thu Aug 8 18:07:43 2013
@@ -176,6 +176,7 @@ public class ServiceRefFactory implement
Definition def = reader.readWSDL((new
URL(wsdlRefAddr)).toExternalForm());
javax.wsdl.Service wsdlservice =
def.getService(serviceQname);
+ @SuppressWarnings("unchecked")
Map<String,?> ports = wsdlservice.getPorts();
Method m =
serviceInterfaceClass.getMethod("setEndpointAddress",
new Class[] { java.lang.String.class,
@@ -327,6 +328,7 @@ public class ServiceRefFactory implement
*/
private String getSOAPLocation(Port port) {
String endpoint = null;
+ @SuppressWarnings("unchecked")
List<ExtensibilityElement> extensions =
port.getExtensibilityElements();
for (Iterator<ExtensibilityElement> i = extensions.iterator();
i.hasNext();) {
@@ -343,6 +345,7 @@ public class ServiceRefFactory implement
private void initHandlerChain(QName portName, HandlerRegistry
handlerRegistry,
HandlerInfo handlerInfo, ArrayList<String> soaprolesToAdd) {
HandlerChain handlerChain = (HandlerChain)
handlerRegistry.getHandlerChain(portName);
+ @SuppressWarnings("unchecked")
Iterator<Handler> iter = handlerChain.iterator();
while (iter.hasNext()) {
Handler handler = iter.next();
Modified:
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.java
Thu Aug 8 18:07:43 2013
@@ -243,6 +243,7 @@ public class ManagedConcurrentWeakHashMa
return new Map.Entry<K, V>() {
private final Map.Entry<Key, V> en = it.next();
+ @SuppressWarnings("unchecked")
@Override
public K getKey() {
return (K) en.getKey().get();
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=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Thu Aug 8 18:07:43
2013
@@ -197,6 +197,7 @@ public class Util {
}
// Interface not found on this class. Look at the superclass.
+ @SuppressWarnings("unchecked")
Class<? extends T> superClazz =
(Class<? extends T>) clazz.getSuperclass();
@@ -368,6 +369,7 @@ public class Util {
try {
List<Class<? extends Decoder>> decoders =
endpointConfig.getDecoders();
+ @SuppressWarnings("unchecked")
List<DecoderEntry> decoderEntries = getDecoders(
decoders.toArray(new Class[decoders.size()]));
decoderMatch = new DecoderMatch(target, decoderEntries);
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointServer.java
Thu Aug 8 18:07:43 2013
@@ -56,6 +56,7 @@ public class PojoEndpointServer extends
}
setPojo(pojo);
+ @SuppressWarnings("unchecked")
Map<String,String> pathParameters =
(Map<String, String>) sec.getUserProperties().get(
POJO_PATH_PARAM_KEY);
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=1511907&r1=1511906&r2=1511907&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 Aug 8 18:07:43 2013
@@ -754,6 +754,7 @@ public class PoolProperties implements P
}
try {
+ @SuppressWarnings("unchecked")
Class<Validator> validatorClass =
(Class<Validator>)Class.forName(className);
validator = validatorClass.newInstance();
} catch (ClassNotFoundException e) {
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Thu Aug 8 18:07:43 2013
@@ -128,6 +128,7 @@ public class StatementCache extends Stat
@Override
public void disconnected(ConnectionPool parent, PooledConnection con,
boolean finalizing) {
+ @SuppressWarnings("unchecked")
ConcurrentHashMap<String,CachedStatement> statements =
(ConcurrentHashMap<String,CachedStatement>)con.getAttributes().get(STATEMENT_CACHE_ATTR);
@@ -182,12 +183,14 @@ public class StatementCache extends Stat
}
public CachedStatement isCached(String sql) {
+ @SuppressWarnings("unchecked")
ConcurrentHashMap<String,CachedStatement> cache =
(ConcurrentHashMap<String,CachedStatement>)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
return cache.get(sql);
}
public boolean cacheStatement(CachedStatement proxy) {
+ @SuppressWarnings("unchecked")
ConcurrentHashMap<String,CachedStatement> cache =
(ConcurrentHashMap<String,CachedStatement>)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
if (proxy.getSql()==null) {
@@ -207,6 +210,7 @@ public class StatementCache extends Stat
}
public boolean removeStatement(CachedStatement proxy) {
+ @SuppressWarnings("unchecked")
ConcurrentHashMap<String,CachedStatement> cache =
(ConcurrentHashMap<String,CachedStatement>)pcon.getAttributes().get(STATEMENT_CACHE_ATTR);
if (cache.remove(proxy.getSql()) != null) {
Modified: tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt
(original)
+++ tomcat/trunk/res/ide-support/eclipse/java-compiler-errors-warnings.txt Thu
Aug 8 18:07:43 2013
@@ -67,7 +67,7 @@ Unnecessary code
Generic types
- All - W
- [x] Ignore unavoidable generic type problems
+ [ ] Ignore unavoidable generic type problems
Annotations
- All - W
Modified:
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/core/TestStandardContextResources.java
Thu Aug 8 18:07:43 2013
@@ -88,6 +88,7 @@ public class TestStandardContextResource
// For BZ 54391. Relative ordering is specified in resources2.jar.
// It is not absolute-ordering, so there may be other jars in the list
+ @SuppressWarnings("unchecked")
List<String> orderedLibs = (List<String>) ctx.getServletContext()
.getAttribute(ServletContext.ORDERED_LIBS);
if (orderedLibs.size() > 2) {
Modified:
tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/filters/TestCsrfPreventionFilter.java
Thu Aug 8 18:07:43 2013
@@ -83,6 +83,7 @@ public class TestCsrfPreventionFilter ex
ByteArrayInputStream bais =
new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
+ @SuppressWarnings("unchecked")
LruCache<String> cache2 = (LruCache<String>) ois.readObject();
cache2.add("key7");
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java?rev=1511907&r1=1511906&r2=1511907&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsRemoteEndpoint.java Thu
Aug 8 18:07:43 2013
@@ -114,6 +114,7 @@ public class TestWsRemoteEndpoint extend
Assert.assertTrue(latchResult);
+ @SuppressWarnings("unchecked")
List<String> messages = (List<String>) handler.getMessages();
int offset = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
