Author: markt
Date: Sun Jul 15 19:12:31 2012
New Revision: 1361761
URL: http://svn.apache.org/viewvc?rev=1361761&view=rev
Log:
Code clean-up for o.a.catalina.mbeans
- Add final prompted by UCDetector
- Java 7 use of <>
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Sun Jul 15
19:12:31 2012
@@ -282,7 +282,7 @@ public class ContainerMBean extends Base
*/
public String[] findLifecycleListenerNames() throws MBeanException {
Container container = null;
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
try {
container = (Container) getManagedResource();
@@ -309,7 +309,7 @@ public class ContainerMBean extends Base
*/
public String[] findContainerListenerNames() throws MBeanException {
Container container = null;
- List<String> result = new ArrayList<String>();
+ List<String> result = new ArrayList<>();
try {
container = (Container) getManagedResource();
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
Sun Jul 15 19:12:31 2012
@@ -65,7 +65,7 @@ public class GlobalResourcesLifecycleLis
/**
* The configuration information registry for our managed beans.
*/
- protected static Registry registry = MBeanUtils.createRegistry();
+ protected static final Registry registry = MBeanUtils.createRegistry();
// ---------------------------------------------- LifecycleListener Methods
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Sun Jul 15
19:12:31 2012
@@ -70,14 +70,13 @@ public class GroupMBean extends BaseMode
/**
* The configuration information registry for our managed beans.
*/
- protected Registry registry = MBeanUtils.createRegistry();
+ protected final Registry registry = MBeanUtils.createRegistry();
/**
* The <code>ManagedBean</code> information describing this MBean.
*/
- protected ManagedBean managed =
- registry.findManagedBean("Group");
+ protected final ManagedBean managed = registry.findManagedBean("Group");
// ------------------------------------------------------------- Attributes
@@ -89,7 +88,7 @@ public class GroupMBean extends BaseMode
public String[] getRoles() {
Group group = (Group) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<Role> roles = group.getRoles();
while (roles.hasNext()) {
Role role = null;
@@ -116,7 +115,7 @@ public class GroupMBean extends BaseMode
public String[] getUsers() {
Group group = (Group) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<User> users = group.getUsers();
while (users.hasNext()) {
User user = null;
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/mbeans/JmxRemoteLifecycleListener.java
Sun Jul 15 19:12:31 2012
@@ -182,7 +182,7 @@ public class JmxRemoteLifecycleListener
System.setProperty("java.rmi.server.randomIDs", "true");
// Create the environment
- HashMap<String,Object> env = new HashMap<String,Object>();
+ HashMap<String,Object> env = new HashMap<>();
RMIClientSocketFactory csf = null;
RMIServerSocketFactory ssf = null;
@@ -294,7 +294,7 @@ public class JmxRemoteLifecycleListener
private static final String FORCED_HOST = "localhost";
- private RMIClientSocketFactory factory = null;
+ private final RMIClientSocketFactory factory;
public RmiClientLocalhostSocketFactory(RMIClientSocketFactory
theFactory) {
factory = theFactory;
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=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Sun Jul 15
19:12:31 2012
@@ -66,7 +66,7 @@ public class MBeanFactory {
/**
* The <code>MBeanServer</code> for this application.
*/
- private static MBeanServer mserver = MBeanUtils.createServer();
+ private static final MBeanServer mserver = MBeanUtils.createServer();
// ----------------------------------------------------------- Constructors
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
Sun Jul 15 19:12:31 2012
@@ -71,34 +71,34 @@ public class MemoryUserDatabaseMBean ext
/**
* The configuration information registry for our managed beans.
*/
- protected Registry registry = MBeanUtils.createRegistry();
+ protected final Registry registry = MBeanUtils.createRegistry();
/**
* The <code>ManagedBean</code> information describing this MBean.
*/
- protected ManagedBean managed =
+ protected final ManagedBean managed =
registry.findManagedBean("MemoryUserDatabase");
/**
* The <code>ManagedBean</code> information describing Group MBeans.
*/
- protected ManagedBean managedGroup =
+ protected final ManagedBean managedGroup =
registry.findManagedBean("Group");
/**
* The <code>ManagedBean</code> information describing Group MBeans.
*/
- protected ManagedBean managedRole =
+ protected final ManagedBean managedRole =
registry.findManagedBean("Role");
/**
* The <code>ManagedBean</code> information describing User MBeans.
*/
- protected ManagedBean managedUser =
+ protected final ManagedBean managedUser =
registry.findManagedBean("User");
@@ -111,7 +111,7 @@ public class MemoryUserDatabaseMBean ext
public String[] getGroups() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<Group> groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
@@ -128,7 +128,7 @@ public class MemoryUserDatabaseMBean ext
public String[] getRoles() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<Role> roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
@@ -145,7 +145,7 @@ public class MemoryUserDatabaseMBean ext
public String[] getUsers() {
UserDatabase database = (UserDatabase) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<User> users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Sun
Jul 15 19:12:31 2012
@@ -68,13 +68,13 @@ public class NamingResourcesMBean extend
/**
* The configuration information registry for our managed beans.
*/
- protected Registry registry = MBeanUtils.createRegistry();
+ protected final Registry registry = MBeanUtils.createRegistry();
/**
* The <code>ManagedBean</code> information describing this MBean.
*/
- protected ManagedBean managed =
+ protected final ManagedBean managed =
registry.findManagedBean("NamingResources");
// ------------------------------------------------------------- Attributes
@@ -87,7 +87,7 @@ public class NamingResourcesMBean extend
public String[] getEnvironments() {
ContextEnvironment[] envs =
((NamingResources)this.resource).findEnvironments();
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < envs.length; i++) {
try {
ObjectName oname =
@@ -113,7 +113,7 @@ public class NamingResourcesMBean extend
ContextResource[] resources =
((NamingResources)this.resource).findResources();
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < resources.length; i++) {
try {
ObjectName oname =
@@ -139,7 +139,7 @@ public class NamingResourcesMBean extend
ContextResourceLink[] resourceLinks =
((NamingResources)this.resource).findResourceLinks();
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
for (int i = 0; i < resourceLinks.length; i++) {
try {
ObjectName oname =
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java Sun Jul 15
19:12:31 2012
@@ -63,13 +63,13 @@ public class RoleMBean extends BaseModel
/**
* The configuration information registry for our managed beans.
*/
- protected Registry registry = MBeanUtils.createRegistry();
+ protected final Registry registry = MBeanUtils.createRegistry();
/**
* The <code>ManagedBean</code> information describing this MBean.
*/
- protected ManagedBean managed = registry.findManagedBean("Role");
+ protected final ManagedBean managed = registry.findManagedBean("Role");
// ------------------------------------------------------------- Attributes
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java?rev=1361761&r1=1361760&r2=1361761&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java Sun Jul 15
19:12:31 2012
@@ -70,13 +70,13 @@ public class UserMBean extends BaseModel
/**
* The configuration information registry for our managed beans.
*/
- protected Registry registry = MBeanUtils.createRegistry();
+ protected final Registry registry = MBeanUtils.createRegistry();
/**
* The <code>ManagedBean</code> information describing this MBean.
*/
- protected ManagedBean managed =
+ protected final ManagedBean managed =
registry.findManagedBean("User");
@@ -89,7 +89,7 @@ public class UserMBean extends BaseModel
public String[] getGroups() {
User user = (User) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<Group> groups = user.getGroups();
while (groups.hasNext()) {
Group group = null;
@@ -116,7 +116,7 @@ public class UserMBean extends BaseModel
public String[] getRoles() {
User user = (User) this.resource;
- ArrayList<String> results = new ArrayList<String>();
+ ArrayList<String> results = new ArrayList<>();
Iterator<Role> roles = user.getRoles();
while (roles.hasNext()) {
Role role = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
