Author: markt
Date: Fri Dec 26 11:55:01 2008
New Revision: 729529
URL: http://svn.apache.org/viewvc?rev=729529&view=rev
Log:
o.a.c.realm generics changes
Also fix some eclipse warnings
Modified:
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.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/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Fri Dec 26
11:55:01 2008
@@ -505,7 +505,7 @@
* Return the roles associated with the given user name.
* @param username Username for which roles should be retrieved
*/
- protected ArrayList getRoles(String username) {
+ protected ArrayList<String> getRoles(String username) {
Connection dbConnection = null;
Modified: tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java?rev=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/GenericPrincipal.java Fri Dec
26 11:55:01 2008
@@ -91,7 +91,7 @@
this.userPrincipal = userPrincipal;
if (roles != null) {
this.roles = new String[roles.size()];
- this.roles = (String[]) roles.toArray(this.roles);
+ this.roles = roles.toArray(this.roles);
if (this.roles.length > 0)
Arrays.sort(this.roles);
}
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=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASMemoryLoginModule.java Fri
Dec 26 11:55:01 2008
@@ -38,7 +38,6 @@
import javax.security.auth.spi.LoginModule;
import org.apache.catalina.Context;
-import org.apache.catalina.Realm;
import org.apache.catalina.authenticator.Constants;
import org.apache.catalina.connector.Request;
import org.apache.catalina.deploy.SecurityConstraint;
@@ -78,7 +77,7 @@
* @version $Revision$ $Date$
*/
-public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule,
Realm {
+public class JAASMemoryLoginModule extends MemoryRealm implements LoginModule {
// We need to extend MemoryRealm to avoid class cast
private static Log log = LogFactory.getLog(JAASMemoryLoginModule.class);
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=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Dec 26
11:55:01 2008
@@ -273,7 +273,7 @@
for (int i=0; i<classNames.length; i++) {
if (classNames[i].length()==0) continue;
try {
- Class principalClass = Class.forName(classNames[i], false,
+ Class<?> principalClass = Class.forName(classNames[i], false,
loader);
if (Principal.class.isAssignableFrom(principalClass)) {
classNamesList.add(classNames[i]);
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=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Fri Dec 26
11:55:01 2008
@@ -444,7 +444,7 @@
try {
preparedCredentials.close();
} catch (Throwable f) {
- ;
+ // Ignore
}
this.preparedCredentials = null;
@@ -452,7 +452,7 @@
try {
preparedRoles.close();
} catch (Throwable f) {
- ;
+ // Ignore
}
this.preparedRoles = null;
@@ -686,7 +686,7 @@
// Instantiate our database driver if necessary
if (driver == null) {
try {
- Class clazz = Class.forName(driverName);
+ Class<?> clazz = Class.forName(driverName);
driver = (Driver) clazz.newInstance();
} catch (Throwable e) {
throw new SQLException(e.getMessage());
@@ -713,7 +713,7 @@
*/
protected void release(Connection dbConnection) {
- ; // NO-OP since we are not pooling anything
+ // NO-OP since we are not pooling anything
}
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=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Fri Dec 26
11:55:01 2008
@@ -1294,7 +1294,7 @@
attrIds = new String[0];
constraints.setReturningAttributes(attrIds);
- NamingEnumeration results =
+ NamingEnumeration<SearchResult> results =
context.search(userBase, filter, constraints);
@@ -1311,7 +1311,7 @@
}
// Get result for the first entry found
- SearchResult result = (SearchResult)results.next();
+ SearchResult result = results.next();
// Check no further entries were found
try {
@@ -1587,12 +1587,13 @@
" with filter expression '" + filter + "'");
}
// Searching groups that assign the given group
- NamingEnumeration results = context.search(roleBase, filter,
controls);
+ NamingEnumeration<SearchResult> results =
+ context.search(roleBase, filter, controls);
if (results != null) {
// Iterate over the resulting groups
try {
while (results.hasMore()) {
- SearchResult result = (SearchResult) results.next();
+ SearchResult result = results.next();
Attributes attrs = result.getAttributes();
if (attrs == null)
continue;
@@ -1645,13 +1646,9 @@
list.add(commonRole);
if (containerLog.isTraceEnabled()) {
- if (list != null) {
- containerLog.trace(" Found " + list.size() + " user internal
roles");
- for (int i=0; i<list.size(); i++)
- containerLog.trace( " Found user internal role " +
list.get(i));
- } else {
- containerLog.trace(" Found no user internal roles");
- }
+ containerLog.trace(" Found " + list.size() + " user internal
roles");
+ for (int i=0; i<list.size(); i++)
+ containerLog.trace( " Found user internal role " +
list.get(i));
}
// Are we configured to do role searches?
@@ -1668,7 +1665,7 @@
controls.setReturningAttributes(new String[] {roleName});
// Perform the configured search and process the results
- NamingEnumeration results =
+ NamingEnumeration<SearchResult> results =
context.search(roleBase, filter, controls);
if (results == null)
return (list); // Should never happen, but just in case ...
@@ -1676,7 +1673,7 @@
HashMap<String, String> groupMap = new HashMap<String, String>();
try {
while (results.hasMore()) {
- SearchResult result = (SearchResult) results.next();
+ SearchResult result = results.next();
Attributes attrs = result.getAttributes();
if (attrs == null)
continue;
@@ -1778,7 +1775,7 @@
Attribute attr = attrs.get(attrId);
if (attr == null)
return (values);
- NamingEnumeration e = attr.getAll();
+ NamingEnumeration<?> e = attr.getAll();
try {
while(e.hasMore()) {
String value = (String)e.next();
@@ -1969,7 +1966,7 @@
*
* @return java.util.Hashtable the configuration for the directory context.
*/
- protected Hashtable getDirectoryContextEnvironment() {
+ protected Hashtable<String,String> getDirectoryContextEnvironment() {
Hashtable<String,String> env = new Hashtable<String,String>();
@@ -2008,7 +2005,7 @@
*/
protected void release(DirContext context) {
- ; // NO-OP since we are not pooling anything
+ // NO-OP since we are not pooling anything
}
@@ -2092,7 +2089,7 @@
startingPoint = endParenLoc+1;
startParenLoc = userPatternString.indexOf('(', startingPoint);
}
- return (String[])pathList.toArray(new String[] {});
+ return pathList.toArray(new String[] {});
}
return null;
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Fri Dec 26
11:55:01 2008
@@ -144,8 +144,7 @@
*/
public Principal authenticate(String username, String credentials) {
- GenericPrincipal principal =
- (GenericPrincipal) principals.get(username);
+ GenericPrincipal principal = principals.get(username);
boolean validated = false;
if (principal != null) {
@@ -238,8 +237,7 @@
*/
protected String getPassword(String username) {
- GenericPrincipal principal =
- (GenericPrincipal) principals.get(username);
+ GenericPrincipal principal = principals.get(username);
if (principal != null) {
return (principal.getPassword());
} else {
@@ -254,7 +252,7 @@
*/
protected Principal getPrincipal(String username) {
- return (Principal) principals.get(username);
+ return principals.get(username);
}
@@ -263,7 +261,7 @@
*
* @return The principals, keyed by user name (a String)
*/
- protected Map getPrincipals() {
+ protected Map<String,GenericPrincipal> getPrincipals() {
return principals;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java?rev=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Dec 26
11:55:01 2008
@@ -107,6 +107,7 @@
* Construct a new instance of this <code>Rule</code>.
*/
public MemoryUserRule() {
+ // No initialisation required
}
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=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Dec 26
11:55:01 2008
@@ -446,6 +446,7 @@
* throwables will be caught and logged.
*/
public void backgroundProcess() {
+ // NOOP in base class
}
@@ -1332,12 +1333,15 @@
}
public void postRegister(Boolean registrationDone) {
+ // NOOP in base class
}
public void preDeregister() throws Exception {
+ // NOOP in base class
}
public void postDeregister() {
+ // NOOP in base class
}
protected boolean initialized=false;
Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=729529&r1=729528&r2=729529&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Fri Dec
26 11:55:01 2008
@@ -165,9 +165,9 @@
if(user.isInRole(dbrole)) {
return true;
}
- Iterator groups = user.getGroups();
+ Iterator<Group> groups = user.getGroups();
while(groups.hasNext()) {
- Group group = (Group)groups.next();
+ Group group = groups.next();
if(group.isInRole(dbrole)) {
return true;
}
@@ -215,17 +215,17 @@
}
List<String> roles = new ArrayList<String>();
- Iterator uroles = user.getRoles();
+ Iterator<Role> uroles = user.getRoles();
while(uroles.hasNext()) {
- Role role = (Role)uroles.next();
+ Role role = uroles.next();
roles.add(role.getName());
}
- Iterator groups = user.getGroups();
+ Iterator<Group> groups = user.getGroups();
while(groups.hasNext()) {
- Group group = (Group)groups.next();
+ Group group = groups.next();
uroles = group.getRoles();
while(uroles.hasNext()) {
- Role role = (Role)uroles.next();
+ Role role = uroles.next();
roles.add(role.getName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
