Author: markt
Date: Sat Dec 27 10:40:24 2008
New Revision: 729652
URL: http://svn.apache.org/viewvc?rev=729652&view=rev
Log:
Generics changes for o.a.c.authenticator
Remove unnecessary casts identified by Eclipse
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java?rev=729652&r1=729651&r2=729652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/AuthenticatorBase.java
Sat Dec 27 10:40:24 2008
@@ -630,7 +630,7 @@
if (this.random == null) {
try {
- Class clazz = Class.forName(randomClass);
+ Class<?> clazz = Class.forName(randomClass);
this.random = (Random) clazz.newInstance();
long seed = System.currentTimeMillis();
char entropy[] = getEntropy().toCharArray();
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=729652&r1=729651&r2=729652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Sat Dec 27 10:40:24 2008
@@ -395,34 +395,34 @@
// Modify our current request to reflect the original one
request.clearCookies();
- Iterator cookies = saved.getCookies();
+ Iterator<Cookie> cookies = saved.getCookies();
while (cookies.hasNext()) {
- request.addCookie((Cookie) cookies.next());
+ request.addCookie(cookies.next());
}
MimeHeaders rmh = request.getCoyoteRequest().getMimeHeaders();
rmh.recycle();
boolean cachable = "GET".equalsIgnoreCase(saved.getMethod()) ||
"HEAD".equalsIgnoreCase(saved.getMethod());
- Iterator names = saved.getHeaderNames();
+ Iterator<String> names = saved.getHeaderNames();
while (names.hasNext()) {
- String name = (String) names.next();
+ String name = names.next();
// The browser isn't expecting this conditional reposponse now.
// Assuming that it can quietly recover from an unexpected 412.
// BZ 43687
if(!("If-Modified-Since".equalsIgnoreCase(name) ||
(cachable && "If-None-Match".equalsIgnoreCase(name)))) {
- Iterator values = saved.getHeaderValues(name);
+ Iterator<String> values = saved.getHeaderValues(name);
while (values.hasNext()) {
- rmh.addValue(name).setString( (String)values.next() );
+ rmh.addValue(name).setString(values.next());
}
}
}
request.clearLocales();
- Iterator locales = saved.getLocales();
+ Iterator<Locale> locales = saved.getLocales();
while (locales.hasNext()) {
- request.addLocale((Locale) locales.next());
+ request.addLocale(locales.next());
}
request.getCoyoteRequest().getParameters().recycle();
@@ -478,18 +478,18 @@
for (int i = 0; i < cookies.length; i++)
saved.addCookie(cookies[i]);
}
- Enumeration names = request.getHeaderNames();
+ Enumeration<String> names = request.getHeaderNames();
while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- Enumeration values = request.getHeaders(name);
+ String name = names.nextElement();
+ Enumeration<String> values = request.getHeaders(name);
while (values.hasMoreElements()) {
- String value = (String) values.nextElement();
+ String value = values.nextElement();
saved.addHeader(name, value);
}
}
- Enumeration locales = request.getLocales();
+ Enumeration<Locale> locales = request.getLocales();
while (locales.hasMoreElements()) {
- Locale locale = (Locale) locales.nextElement();
+ Locale locale = locales.nextElement();
saved.addLocale(locale);
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?rev=729652&r1=729651&r2=729652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java Sat
Dec 27 10:40:24 2008
@@ -54,7 +54,7 @@
cookies.add(cookie);
}
- public Iterator getCookies() {
+ public Iterator<Cookie> getCookies() {
return (cookies.iterator());
}
@@ -69,7 +69,7 @@
new HashMap<String,ArrayList<String>>();
public void addHeader(String name, String value) {
- ArrayList<String> values = (ArrayList<String>) headers.get(name);
+ ArrayList<String> values = headers.get(name);
if (values == null) {
values = new ArrayList<String>();
headers.put(name, values);
@@ -77,14 +77,14 @@
values.add(value);
}
- public Iterator getHeaderNames() {
+ public Iterator<String> getHeaderNames() {
return (headers.keySet().iterator());
}
- public Iterator getHeaderValues(String name) {
- ArrayList values = (ArrayList) headers.get(name);
+ public Iterator<String> getHeaderValues(String name) {
+ ArrayList<String> values = headers.get(name);
if (values == null)
- return ((new ArrayList()).iterator());
+ return ((new ArrayList<String>()).iterator());
else
return (values.iterator());
}
@@ -99,7 +99,7 @@
locales.add(locale);
}
- public Iterator getLocales() {
+ public Iterator<Locale> getLocales() {
return (locales.iterator());
}
@@ -131,12 +131,12 @@
parameters.put(name, values);
}
- public Iterator getParameterNames() {
+ public Iterator<String> getParameterNames() {
return (parameters.keySet().iterator());
}
public String[] getParameterValues(String name) {
- return ((String[]) parameters.get(name));
+ return parameters.get(name);
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=729652&r1=729651&r2=729652&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java Sat
Dec 27 10:40:24 2008
@@ -313,7 +313,7 @@
String ssoId = null;
synchronized (reverse) {
- ssoId = (String) reverse.get(session);
+ ssoId = reverse.get(session);
}
if (ssoId == null)
return;
@@ -489,7 +489,7 @@
Session sessions[] = sso.findSessions();
if ( sessions == null || sessions.length == 0 ) {
synchronized (cache) {
- sso = (SingleSignOnEntry) cache.remove(ssoId);
+ sso = cache.remove(ssoId);
}
}
@@ -510,7 +510,7 @@
// Look up and remove the corresponding SingleSignOnEntry
SingleSignOnEntry sso = null;
synchronized (cache) {
- sso = (SingleSignOnEntry) cache.remove(ssoId);
+ sso = cache.remove(ssoId);
}
if (sso == null)
@@ -661,7 +661,7 @@
protected SingleSignOnEntry lookup(String ssoId) {
synchronized (cache) {
- return ((SingleSignOnEntry) cache.get(ssoId));
+ return cache.get(ssoId);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
