Update of
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security
In directory
james.mmbase.org:/tmp/cvs-serv30736/cmsc/security/src/java/com/finalist/cmsc/security
Modified Files:
SecurityUtil.java ThreadLocalAuthenticate.java Role.java
Log Message:
CMSC-907 Code Quality with PMD
Add final modifier to Util classes
Add final modifier to Logger instances
Change Boolean, Integer and Long instantiation to valueOf calls
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security
See also: http://www.mmbase.org/jira/browse/CMSC-907
Index: SecurityUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/SecurityUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SecurityUtil.java 12 Apr 2008 14:26:08 -0000 1.12
+++ SecurityUtil.java 16 May 2008 11:46:34 -0000 1.13
@@ -24,11 +24,11 @@
import com.finalist.cmsc.util.NameUtil;
-public class SecurityUtil {
+public final class SecurityUtil {
/** MMbase logging system */
- private static Logger log =
Logging.getLoggerInstance(SecurityUtil.class.getName());
+ private static final Logger log =
Logging.getLoggerInstance(SecurityUtil.class.getName());
private static final String CMSC_USERROLES = "cmsc.userroles.";
@@ -106,10 +106,10 @@
if (name.startsWith("role_")) {
String role = request.getParameter(name);
if (!role.equals("-1")) {
- roles.put( new Integer(name.substring(5)), new UserRole(
Integer.parseInt(role),false));
+ roles.put( Integer.valueOf(name.substring(5)), new UserRole(
Integer.parseInt(role),false));
}
else {
- roles.put( new Integer(name.substring(5)), null);
+ roles.put( Integer.valueOf(name.substring(5)), null);
}
}
}
@@ -244,7 +244,7 @@
RelationList list = group.getRelations(ROLEREL,
cloud.getNodeManager(managerName), DESTINATION);
for (RelationIterator iter = list.relationIterator();
iter.hasNext();) {
Relation rolerel = iter.nextRelation();
- Integer channelNumber = new
Integer(rolerel.getDestination().getNumber());
+ Integer channelNumber =
Integer.valueOf(rolerel.getDestination().getNumber());
if (rights.containsKey(channelNumber)) {
rolesDone.add(channelNumber);
UserRole role = rights.get(channelNumber);
Index: ThreadLocalAuthenticate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/ThreadLocalAuthenticate.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ThreadLocalAuthenticate.java 26 Nov 2007 11:43:41 -0000 1.3
+++ ThreadLocalAuthenticate.java 16 May 2008 11:46:34 -0000 1.4
@@ -15,7 +15,7 @@
* @author Jeoffrey Bakker, Finalist IT Group
*/
public class ThreadLocalAuthenticate extends Authenticate {
- private static Logger log =
Logging.getLoggerInstance(ThreadLocalAuthenticate.class);
+ private static final Logger log =
Logging.getLoggerInstance(ThreadLocalAuthenticate.class);
public static ThreadLocal<String> context = new ThreadLocal<String>();
Index: Role.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/Role.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- Role.java 10 May 2008 16:31:23 -0000 1.4
+++ Role.java 16 May 2008 11:46:34 -0000 1.5
@@ -14,7 +14,7 @@
import org.apache.commons.lang.StringUtils;
-public class Role {
+public final class Role {
public static final Role NONE = new Role(0, "none"); // DENY all rights
public static final Role WRITER = new Role(1, "writer");
@@ -53,10 +53,12 @@
@Override
public boolean equals(Object other) {
- if (other == null)
+ if (other == null) {
return false;
- if (other == this)
+ }
+ if (other == this) {
return true;
+ }
if (other instanceof Role) {
return this.id == ((Role) other).id;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
