Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Thu Feb 7 22:53:33 2019 @@ -14,17 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.mbeans; - import java.util.ArrayList; import java.util.Iterator; -import javax.management.MBeanException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.RuntimeOperationsException; import org.apache.catalina.Group; import org.apache.catalina.Role; @@ -42,30 +38,8 @@ import org.apache.tomcat.util.modeler.Re */ public class MemoryUserDatabaseMBean extends BaseModelMBean { - - // ----------------------------------------------------------- Constructors - - - /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public MemoryUserDatabaseMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } - - // ----------------------------------------------------- Instance Variables - /** * The configuration information registry for our managed beans. */ @@ -75,39 +49,33 @@ public class MemoryUserDatabaseMBean ext /** * The <code>ManagedBean</code> information describing this MBean. */ - protected final ManagedBean managed = - registry.findManagedBean("MemoryUserDatabase"); + protected final ManagedBean managed = registry.findManagedBean("MemoryUserDatabase"); /** * The <code>ManagedBean</code> information describing Group MBeans. */ - protected final ManagedBean managedGroup = - registry.findManagedBean("Group"); + protected final ManagedBean managedGroup = registry.findManagedBean("Group"); /** * The <code>ManagedBean</code> information describing Group MBeans. */ - protected final ManagedBean managedRole = - registry.findManagedBean("Role"); + protected final ManagedBean managedRole = registry.findManagedBean("Role"); /** * The <code>ManagedBean</code> information describing User MBeans. */ - protected final ManagedBean managedUser = - registry.findManagedBean("User"); + protected final ManagedBean managedUser = registry.findManagedBean("User"); // ------------------------------------------------------------- Attributes - /** * @return the MBean Names of all groups defined in this database. */ public String[] getGroups() { - UserDatabase database = (UserDatabase) this.resource; ArrayList<String> results = new ArrayList<>(); Iterator<Group> groups = database.getGroups(); @@ -116,7 +84,6 @@ public class MemoryUserDatabaseMBean ext results.add(findGroup(group.getGroupname())); } return results.toArray(new String[results.size()]); - } @@ -124,7 +91,6 @@ public class MemoryUserDatabaseMBean ext * @return the MBean Names of all roles defined in this database. */ public String[] getRoles() { - UserDatabase database = (UserDatabase) this.resource; ArrayList<String> results = new ArrayList<>(); Iterator<Role> roles = database.getRoles(); @@ -133,7 +99,6 @@ public class MemoryUserDatabaseMBean ext results.add(findRole(role.getRolename())); } return results.toArray(new String[results.size()]); - } @@ -141,7 +106,6 @@ public class MemoryUserDatabaseMBean ext * @return the MBean Names of all users defined in this database. */ public String[] getUsers() { - UserDatabase database = (UserDatabase) this.resource; ArrayList<String> results = new ArrayList<>(); Iterator<User> users = database.getUsers(); @@ -150,13 +114,11 @@ public class MemoryUserDatabaseMBean ext results.add(findUser(user.getUsername())); } return results.toArray(new String[results.size()]); - } // ------------------------------------------------------------- Operations - /** * Create a new Group and return the corresponding MBean Name. * @@ -165,19 +127,17 @@ public class MemoryUserDatabaseMBean ext * @return the new group object name */ public String createGroup(String groupname, String description) { - UserDatabase database = (UserDatabase) this.resource; Group group = database.createGroup(groupname, description); try { MBeanUtils.createMBean(group); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception creating group [" + groupname + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception creating group [" + groupname + "] MBean"); iae.initCause(e); throw iae; } - return (findGroup(groupname)); - + return findGroup(groupname); } @@ -189,19 +149,17 @@ public class MemoryUserDatabaseMBean ext * @return the new role object name */ public String createRole(String rolename, String description) { - UserDatabase database = (UserDatabase) this.resource; Role role = database.createRole(rolename, description); try { MBeanUtils.createMBean(role); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception creating role [" + rolename + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception creating role [" + rolename + "] MBean"); iae.initCause(e); throw iae; } - return (findRole(rolename)); - + return findRole(rolename); } @@ -213,21 +171,18 @@ public class MemoryUserDatabaseMBean ext * @param fullName Full name for the new user * @return the new user object name */ - public String createUser(String username, String password, - String fullName) { - + public String createUser(String username, String password, String fullName) { UserDatabase database = (UserDatabase) this.resource; User user = database.createUser(username, password, fullName); try { MBeanUtils.createMBean(user); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception creating user [" + username + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception creating user [" + username + "] MBean"); iae.initCause(e); throw iae; } - return (findUser(username)); - + return findUser(username); } @@ -239,23 +194,20 @@ public class MemoryUserDatabaseMBean ext * @return the group object name */ public String findGroup(String groupname) { - UserDatabase database = (UserDatabase) this.resource; Group group = database.findGroup(groupname); if (group == null) { - return (null); + return null; } try { - ObjectName oname = - MBeanUtils.createObjectName(managedGroup.getDomain(), group); - return (oname.toString()); + ObjectName oname = MBeanUtils.createObjectName(managedGroup.getDomain(), group); + return oname.toString(); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for group [" + groupname + "]"); + IllegalArgumentException iae = new IllegalArgumentException( + "Cannot create object name for group [" + groupname + "]"); iae.initCause(e); throw iae; } - } @@ -267,19 +219,17 @@ public class MemoryUserDatabaseMBean ext * @return the role object name */ public String findRole(String rolename) { - UserDatabase database = (UserDatabase) this.resource; Role role = database.findRole(rolename); if (role == null) { - return (null); + return null; } try { - ObjectName oname = - MBeanUtils.createObjectName(managedRole.getDomain(), role); - return (oname.toString()); + ObjectName oname = MBeanUtils.createObjectName(managedRole.getDomain(), role); + return oname.toString(); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for role [" + rolename + "]"); + IllegalArgumentException iae = new IllegalArgumentException( + "Cannot create object name for role [" + rolename + "]"); iae.initCause(e); throw iae; } @@ -295,23 +245,20 @@ public class MemoryUserDatabaseMBean ext * @return the user object name */ public String findUser(String username) { - UserDatabase database = (UserDatabase) this.resource; User user = database.findUser(username); if (user == null) { - return (null); + return null; } try { - ObjectName oname = - MBeanUtils.createObjectName(managedUser.getDomain(), user); - return (oname.toString()); + ObjectName oname = MBeanUtils.createObjectName(managedUser.getDomain(), user); + return oname.toString(); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for user [" + username + "]"); + IllegalArgumentException iae = new IllegalArgumentException( + "Cannot create object name for user [" + username + "]"); iae.initCause(e); throw iae; } - } @@ -321,7 +268,6 @@ public class MemoryUserDatabaseMBean ext * @param groupname Group name to remove */ public void removeGroup(String groupname) { - UserDatabase database = (UserDatabase) this.resource; Group group = database.findGroup(groupname); if (group == null) { @@ -331,12 +277,11 @@ public class MemoryUserDatabaseMBean ext MBeanUtils.destroyMBean(group); database.removeGroup(group); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception destroying group [" + groupname + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception destroying group [" + groupname + "] MBean"); iae.initCause(e); throw iae; } - } @@ -346,7 +291,6 @@ public class MemoryUserDatabaseMBean ext * @param rolename Role name to remove */ public void removeRole(String rolename) { - UserDatabase database = (UserDatabase) this.resource; Role role = database.findRole(rolename); if (role == null) { @@ -356,12 +300,11 @@ public class MemoryUserDatabaseMBean ext MBeanUtils.destroyMBean(role); database.removeRole(role); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception destroying role [" + rolename + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception destroying role [" + rolename + "] MBean"); iae.initCause(e); throw iae; } - } @@ -371,7 +314,6 @@ public class MemoryUserDatabaseMBean ext * @param username User name to remove */ public void removeUser(String username) { - UserDatabase database = (UserDatabase) this.resource; User user = database.findUser(username); if (user == null) { @@ -381,13 +323,10 @@ public class MemoryUserDatabaseMBean ext MBeanUtils.destroyMBean(user); database.removeUser(user); } catch (Exception e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Exception destroying user [" + username + "] MBean"); + IllegalArgumentException iae = new IllegalArgumentException( + "Exception destroying user [" + username + "] MBean"); iae.initCause(e); throw iae; } - } - - }
Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Thu Feb 7 22:53:33 2019 @@ -14,15 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.mbeans; import java.util.ArrayList; -import javax.management.MBeanException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.RuntimeOperationsException; import org.apache.catalina.deploy.NamingResourcesImpl; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; @@ -40,27 +37,6 @@ import org.apache.tomcat.util.modeler.Re */ public class NamingResourcesMBean extends BaseModelMBean { - - // ----------------------------------------------------------- Constructors - - - /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public NamingResourcesMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } - - // ----------------------------------------------------- Instance Variables /** @@ -72,11 +48,10 @@ public class NamingResourcesMBean extend /** * The <code>ManagedBean</code> information describing this MBean. */ - protected final ManagedBean managed = - registry.findManagedBean("NamingResources"); + protected final ManagedBean managed = registry.findManagedBean("NamingResources"); - // ------------------------------------------------------------- Attributes + // ------------------------------------------------------------- Attributes /** * Return the MBean Names of the set of defined environment entries for @@ -84,23 +59,20 @@ public class NamingResourcesMBean extend * @return an array of object names as strings */ public String[] getEnvironments() { - ContextEnvironment[] envs = - ((NamingResourcesImpl)this.resource).findEnvironments(); + ContextEnvironment[] envs = ((NamingResourcesImpl)this.resource).findEnvironments(); ArrayList<String> results = new ArrayList<>(); for (int i = 0; i < envs.length; i++) { try { - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), envs[i]); + ObjectName oname = MBeanUtils.createObjectName(managed.getDomain(), envs[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for environment " + envs[i]); + IllegalArgumentException iae = new IllegalArgumentException ( + "Cannot create object name for environment " + envs[i]); iae.initCause(e); throw iae; } } return results.toArray(new String[results.size()]); - } @@ -110,24 +82,20 @@ public class NamingResourcesMBean extend * @return an array of object names as strings */ public String[] getResources() { - - ContextResource[] resources = - ((NamingResourcesImpl)this.resource).findResources(); + ContextResource[] resources = ((NamingResourcesImpl)this.resource).findResources(); ArrayList<String> results = new ArrayList<>(); for (int i = 0; i < resources.length; i++) { try { - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resources[i]); + ObjectName oname = MBeanUtils.createObjectName(managed.getDomain(), resources[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for resource " + resources[i]); + IllegalArgumentException iae = new IllegalArgumentException( + "Cannot create object name for resource " + resources[i]); iae.initCause(e); throw iae; } } return results.toArray(new String[results.size()]); - } @@ -137,28 +105,26 @@ public class NamingResourcesMBean extend * @return an array of object names as strings */ public String[] getResourceLinks() { - ContextResourceLink[] resourceLinks = - ((NamingResourcesImpl)this.resource).findResourceLinks(); + ((NamingResourcesImpl)this.resource).findResourceLinks(); ArrayList<String> results = new ArrayList<>(); for (int i = 0; i < resourceLinks.length; i++) { try { ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resourceLinks[i]); + MBeanUtils.createObjectName(managed.getDomain(), resourceLinks[i]); results.add(oname.toString()); } catch (MalformedObjectNameException e) { - IllegalArgumentException iae = new IllegalArgumentException - ("Cannot create object name for resource " + resourceLinks[i]); + IllegalArgumentException iae = new IllegalArgumentException( + "Cannot create object name for resource " + resourceLinks[i]); iae.initCause(e); throw iae; } } return results.toArray(new String[results.size()]); - } - // ------------------------------------------------------------- Operations + // ------------------------------------------------------------- Operations /** * Add an environment entry for this web application. @@ -170,7 +136,7 @@ public class NamingResourcesMBean extend * @throws MalformedObjectNameException if the object name was invalid */ public String addEnvironment(String envName, String type, String value) - throws MalformedObjectNameException { + throws MalformedObjectNameException { NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource; if (nresources == null) { @@ -178,8 +144,8 @@ public class NamingResourcesMBean extend } ContextEnvironment env = nresources.findEnvironment(envName); if (env != null) { - throw new IllegalArgumentException - ("Invalid environment name - already exists '" + envName + "'"); + throw new IllegalArgumentException( + "Invalid environment name - already exists '" + envName + "'"); } env = new ContextEnvironment(); env.setName(envName); @@ -189,10 +155,8 @@ public class NamingResourcesMBean extend // Return the corresponding MBean name ManagedBean managed = registry.findManagedBean("ContextEnvironment"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), env); - return (oname.toString()); - + ObjectName oname = MBeanUtils.createObjectName(managed.getDomain(), env); + return oname.toString(); } @@ -205,7 +169,7 @@ public class NamingResourcesMBean extend * @throws MalformedObjectNameException if the object name was invalid */ public String addResource(String resourceName, String type) - throws MalformedObjectNameException { + throws MalformedObjectNameException { NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource; if (nresources == null) { @@ -213,8 +177,8 @@ public class NamingResourcesMBean extend } ContextResource resource = nresources.findResource(resourceName); if (resource != null) { - throw new IllegalArgumentException - ("Invalid resource name - already exists'" + resourceName + "'"); + throw new IllegalArgumentException( + "Invalid resource name - already exists'" + resourceName + "'"); } resource = new ContextResource(); resource.setName(resourceName); @@ -223,9 +187,8 @@ public class NamingResourcesMBean extend // Return the corresponding MBean name ManagedBean managed = registry.findManagedBean("ContextResource"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resource); - return (oname.toString()); + ObjectName oname = MBeanUtils.createObjectName(managed.getDomain(), resource); + return oname.toString(); } @@ -247,9 +210,8 @@ public class NamingResourcesMBean extend ContextResourceLink resourceLink = nresources.findResourceLink(resourceLinkName); if (resourceLink != null) { - throw new IllegalArgumentException - ("Invalid resource link name - already exists'" + - resourceLinkName + "'"); + throw new IllegalArgumentException( + "Invalid resource link name - already exists'" + resourceLinkName + "'"); } resourceLink = new ContextResourceLink(); resourceLink.setName(resourceLinkName); @@ -258,9 +220,8 @@ public class NamingResourcesMBean extend // Return the corresponding MBean name ManagedBean managed = registry.findManagedBean("ContextResourceLink"); - ObjectName oname = - MBeanUtils.createObjectName(managed.getDomain(), resourceLink); - return (oname.toString()); + ObjectName oname = MBeanUtils.createObjectName(managed.getDomain(), resourceLink); + return oname.toString(); } @@ -270,18 +231,15 @@ public class NamingResourcesMBean extend * @param envName Name of the environment entry to remove */ public void removeEnvironment(String envName) { - NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource; if (nresources == null) { return; } ContextEnvironment env = nresources.findEnvironment(envName); if (env == null) { - throw new IllegalArgumentException - ("Invalid environment name '" + envName + "'"); + throw new IllegalArgumentException("Invalid environment name '" + envName + "'"); } nresources.removeEnvironment(envName); - } @@ -291,7 +249,6 @@ public class NamingResourcesMBean extend * @param resourceName Name of the resource reference to remove */ public void removeResource(String resourceName) { - resourceName = ObjectName.unquote(resourceName); NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource; if (nresources == null) { @@ -299,11 +256,9 @@ public class NamingResourcesMBean extend } ContextResource resource = nresources.findResource(resourceName); if (resource == null) { - throw new IllegalArgumentException - ("Invalid resource name '" + resourceName + "'"); + throw new IllegalArgumentException("Invalid resource name '" + resourceName + "'"); } nresources.removeResource(resourceName); - } @@ -313,19 +268,16 @@ public class NamingResourcesMBean extend * @param resourceLinkName Name of the resource link reference to remove */ public void removeResourceLink(String resourceLinkName) { - resourceLinkName = ObjectName.unquote(resourceLinkName); NamingResourcesImpl nresources = (NamingResourcesImpl) this.resource; if (nresources == null) { return; } - ContextResourceLink resourceLink = - nresources.findResourceLink(resourceLinkName); + ContextResourceLink resourceLink = nresources.findResourceLink(resourceLinkName); if (resourceLink == null) { - throw new IllegalArgumentException - ("Invalid resource Link name '" + resourceLinkName + "'"); + throw new IllegalArgumentException( + "Invalid resource Link name '" + resourceLinkName + "'"); } nresources.removeResourceLink(resourceLinkName); } - } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/RoleMBean.java Thu Feb 7 22:53:33 2019 @@ -14,18 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.mbeans; - -import javax.management.MBeanException; -import javax.management.RuntimeOperationsException; - import org.apache.tomcat.util.modeler.BaseModelMBean; import org.apache.tomcat.util.modeler.ManagedBean; import org.apache.tomcat.util.modeler.Registry; - /** * <p>A <strong>ModelMBean</strong> implementation for the * <code>org.apache.catalina.Role</code> component.</p> @@ -34,30 +28,8 @@ import org.apache.tomcat.util.modeler.Re */ public class RoleMBean extends BaseModelMBean { - - // ----------------------------------------------------------- Constructors - - - /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public RoleMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } - - // ----------------------------------------------------- Instance Variables - /** * The configuration information registry for our managed beans. */ @@ -68,12 +40,4 @@ public class RoleMBean extends BaseModel * The <code>ManagedBean</code> information describing this MBean. */ protected final ManagedBean managed = registry.findManagedBean("Role"); - - - // ------------------------------------------------------------- Attributes - - - // ------------------------------------------------------------- Operations - - } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java Thu Feb 7 22:53:33 2019 @@ -14,27 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.mbeans; -import javax.management.InstanceNotFoundException; import javax.management.MBeanException; -import javax.management.RuntimeOperationsException; -import javax.management.modelmbean.InvalidTargetObjectTypeException; import org.apache.catalina.Executor; import org.apache.catalina.Service; import org.apache.catalina.connector.Connector; -import org.apache.tomcat.util.modeler.BaseModelMBean; - -public class ServiceMBean extends BaseModelMBean { - public ServiceMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } +public class ServiceMBean extends BaseCatalinaMBean<Service> { /** * Add a new Connector to the set of defined Connectors, and associate it @@ -49,16 +37,7 @@ public class ServiceMBean extends BaseMo */ public void addConnector(String address, int port, boolean isAjp, boolean isSSL) throws MBeanException { - Service service; - try { - service = (Service)getManagedResource(); - } catch (InstanceNotFoundException e) { - throw new MBeanException(e); - } catch (RuntimeOperationsException e) { - throw new MBeanException(e); - } catch (InvalidTargetObjectTypeException e) { - throw new MBeanException(e); - } + Service service = doGetManagedResource(); String protocol = isAjp ? "AJP/1.3" : "HTTP/1.1"; Connector connector = new Connector(protocol); if ((address!=null) && (address.length()>0)) { @@ -69,38 +48,21 @@ public class ServiceMBean extends BaseMo connector.setScheme(isSSL ? "https" : "http"); service.addConnector(connector); - } + /** * Adds a named executor to the service * @param type Classname of the Executor to be added * @throws MBeanException error creating the executor */ public void addExecutor(String type) throws MBeanException { - - Service service; - try { - service = (Service)getManagedResource(); - } catch (InstanceNotFoundException e) { - throw new MBeanException(e); - } catch (RuntimeOperationsException e) { - throw new MBeanException(e); - } catch (InvalidTargetObjectTypeException e) { - throw new MBeanException(e); - } - - Executor executor; - try { - executor = (Executor)Class.forName(type).getConstructor().newInstance(); - } catch (ReflectiveOperationException e) { - throw new MBeanException(e); - } - + Service service = doGetManagedResource(); + Executor executor = (Executor) newInstance(type); service.addExecutor(executor); - } + /** * Find and return the set of Connectors associated with this Service. * @return an array of string representations of the connectors @@ -108,28 +70,19 @@ public class ServiceMBean extends BaseMo */ public String[] findConnectors() throws MBeanException { - Service service; - try { - service = (Service)getManagedResource(); - } catch (InstanceNotFoundException e) { - throw new MBeanException(e); - } catch (RuntimeOperationsException e) { - throw new MBeanException(e); - } catch (InvalidTargetObjectTypeException e) { - throw new MBeanException(e); - } + Service service = doGetManagedResource(); Connector[] connectors = service.findConnectors(); String[] str = new String[connectors.length]; - for(int i=0; i< connectors.length; i++){ + for(int i = 0; i < connectors.length; i++) { str[i] = connectors[i].toString(); } return str; - } + /** * Retrieves all executors. * @return an array of string representations of the executors @@ -137,27 +90,19 @@ public class ServiceMBean extends BaseMo */ public String[] findExecutors() throws MBeanException { - Service service; - try { - service = (Service)getManagedResource(); - } catch (InstanceNotFoundException e) { - throw new MBeanException(e); - } catch (RuntimeOperationsException e) { - throw new MBeanException(e); - } catch (InvalidTargetObjectTypeException e) { - throw new MBeanException(e); - } + Service service = doGetManagedResource(); Executor[] executors = service.findExecutors(); String[] str = new String[executors.length]; - for(int i=0; i< executors.length; i++){ + for(int i = 0; i < executors.length; i++){ str[i] = executors[i].toString(); } return str; } + /** * Retrieves executor by name * @param name Name of the executor to be retrieved @@ -165,21 +110,8 @@ public class ServiceMBean extends BaseMo * @throws MBeanException error accessing the associated service */ public String getExecutor(String name) throws MBeanException{ - - Service service; - try { - service = (Service)getManagedResource(); - } catch (InstanceNotFoundException e) { - throw new MBeanException(e); - } catch (RuntimeOperationsException e) { - throw new MBeanException(e); - } catch (InvalidTargetObjectTypeException e) { - throw new MBeanException(e); - } - + Service service = doGetManagedResource(); Executor executor = service.getExecutor(name); return executor.toString(); - } - } Modified: tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/catalina/mbeans/UserMBean.java Thu Feb 7 22:53:33 2019 @@ -14,17 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.catalina.mbeans; - import java.util.ArrayList; import java.util.Iterator; -import javax.management.MBeanException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.RuntimeOperationsException; import org.apache.catalina.Group; import org.apache.catalina.Role; @@ -42,29 +38,8 @@ import org.apache.tomcat.util.modeler.Re public class UserMBean extends BaseModelMBean { - // ----------------------------------------------------------- Constructors - - - /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public UserMBean() - throws MBeanException, RuntimeOperationsException { - - super(); - - } - - // ----------------------------------------------------- Instance Variables - /** * The configuration information registry for our managed beans. */ @@ -74,8 +49,7 @@ public class UserMBean extends BaseModel /** * The <code>ManagedBean</code> information describing this MBean. */ - protected final ManagedBean managed = - registry.findManagedBean("User"); + protected final ManagedBean managed = registry.findManagedBean("User"); // ------------------------------------------------------------- Attributes @@ -104,7 +78,6 @@ public class UserMBean extends BaseModel } } return results.toArray(new String[results.size()]); - } @@ -131,13 +104,11 @@ public class UserMBean extends BaseModel } } return results.toArray(new String[results.size()]); - } // ------------------------------------------------------------- Operations - /** * Add a new {@link Group} to those this user belongs to. * @@ -151,11 +122,9 @@ public class UserMBean extends BaseModel } Group group = user.getUserDatabase().findGroup(groupname); if (group == null) { - throw new IllegalArgumentException - ("Invalid group name '" + groupname + "'"); + throw new IllegalArgumentException("Invalid group name '" + groupname + "'"); } user.addGroup(group); - } @@ -172,11 +141,9 @@ public class UserMBean extends BaseModel } Role role = user.getUserDatabase().findRole(rolename); if (role == null) { - throw new IllegalArgumentException - ("Invalid role name '" + rolename + "'"); + throw new IllegalArgumentException("Invalid role name '" + rolename + "'"); } user.addRole(role); - } @@ -193,11 +160,9 @@ public class UserMBean extends BaseModel } Group group = user.getUserDatabase().findGroup(groupname); if (group == null) { - throw new IllegalArgumentException - ("Invalid group name '" + groupname + "'"); + throw new IllegalArgumentException("Invalid group name '" + groupname + "'"); } user.removeGroup(group); - } @@ -214,12 +179,8 @@ public class UserMBean extends BaseModel } Role role = user.getUserDatabase().findRole(rolename); if (role == null) { - throw new IllegalArgumentException - ("Invalid role name '" + rolename + "'"); + throw new IllegalArgumentException("Invalid role name '" + rolename + "'"); } user.removeRole(role); - } - - } Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original) +++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Thu Feb 7 22:53:33 2019 @@ -100,23 +100,10 @@ import org.apache.juli.logging.LogFactor * @author Craig R. McClanahan * @author Costin Manolache */ -public class BaseModelMBean implements DynamicMBean, MBeanRegistration, ModelMBeanNotificationBroadcaster { - private static final Log log = LogFactory.getLog(BaseModelMBean.class); - - // ----------------------------------------------------------- Constructors +public class BaseModelMBean implements DynamicMBean, MBeanRegistration, + ModelMBeanNotificationBroadcaster { - /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initializer of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - protected BaseModelMBean() throws MBeanException, RuntimeOperationsException { - super(); - } + private static final Log log = LogFactory.getLog(BaseModelMBean.class); // ----------------------------------------------------- Instance Variables Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1853178&r1=1853177&r2=1853178&view=diff ============================================================================== --- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Thu Feb 7 22:53:33 2019 @@ -75,6 +75,10 @@ application provided error handling and/or the container provided error handling (<code>ErrorReportValve</code>) as appropriate. (markt) </add> + <scode> + Refactor the MBean implementations for the internal Tomcat components + to reduce code duplication. (markt) + </scode> </changelog> </subsection> <subsection name="WebSocket"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
