Author: markt Date: Mon Jun 26 20:27:09 2017 New Revision: 1799981 URL: http://svn.apache.org/viewvc?rev=1799981&view=rev Log: Refactor - remove unnecessary code
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.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/ServiceMBean.java tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Modified: tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java Mon Jun 26 20:27:09 2017 @@ -25,11 +25,6 @@ import org.apache.tomcat.util.modeler.Ba public abstract class BaseCatalinaMBean<T> extends BaseModelMBean { - protected BaseCatalinaMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - protected T doGetManagedResource() throws MBeanException { try { @SuppressWarnings("unchecked") Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java Mon Jun 26 20:27:09 2017 @@ -16,9 +16,6 @@ */ package org.apache.catalina.mbeans; -import javax.management.MBeanException; -import javax.management.RuntimeOperationsException; - /** * <p>A convenience base class for <strong>ModelMBean</strong> implementations * where the underlying base class (and therefore the set of supported @@ -35,20 +32,6 @@ import javax.management.RuntimeOperation public class ClassNameMBean<T> extends BaseCatalinaMBean<T> { /** - * Construct a <code>ModelMBean</code> with default - * <code>ModelMBeanInfo</code> information. - * - * @exception MBeanException if the initialize of an object - * throws an exception - * @exception RuntimeOperationsException if an IllegalArgumentException - * occurs - */ - public ClassNameMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * Return the fully qualified Java class name of the managed object * for this MBean. */ Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java Mon Jun 26 20:27:09 2017 @@ -34,20 +34,6 @@ import org.apache.tomcat.util.Introspect public class ConnectorMBean extends ClassNameMBean<Connector> { /** - * 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 ConnectorMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * Obtain and return the value of a specific attribute of this MBean. * * @param name Name of the requested attribute 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java Mon Jun 26 20:27:09 2017 @@ -22,7 +22,6 @@ import java.util.List; import javax.management.MBeanException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.RuntimeOperationsException; import org.apache.catalina.Container; import org.apache.catalina.ContainerListener; @@ -39,20 +38,6 @@ import org.apache.catalina.startup.HostC public class ContainerMBean extends BaseCatalinaMBean<ContainerBase> { /** - * 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 ContainerMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * Add a new child Container to those associated with this Container, * if supported. Won't start the child yet. Has to be started with a call to * Start method after necessary configurations are done. Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java Mon Jun 26 20:27:09 2017 @@ -20,7 +20,6 @@ import javax.management.Attribute; import javax.management.AttributeNotFoundException; import javax.management.MBeanException; import javax.management.ReflectionException; -import javax.management.RuntimeOperationsException; import org.apache.tomcat.util.descriptor.web.ContextEnvironment; import org.apache.tomcat.util.descriptor.web.NamingResources; @@ -35,20 +34,6 @@ public class ContextEnvironmentMBean ext /** - * 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 ContextEnvironmentMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * Set the value of a specific attribute of this MBean. * * @param attribute The identification of the attribute to be set Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java Mon Jun 26 20:27:09 2017 @@ -17,7 +17,6 @@ package org.apache.catalina.mbeans; import javax.management.MBeanException; -import javax.management.RuntimeOperationsException; import org.apache.catalina.Context; import org.apache.tomcat.util.descriptor.web.ApplicationParameter; @@ -28,11 +27,6 @@ import org.apache.tomcat.util.descriptor public class ContextMBean extends BaseCatalinaMBean<Context> { - public ContextMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - /** * Return the set of application parameters for this application. * @return a string array with a representation of each parameter Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java Mon Jun 26 20:27:09 2017 @@ -33,21 +33,6 @@ import org.apache.tomcat.util.descriptor */ public class ContextResourceLinkMBean extends BaseCatalinaMBean<ContextResourceLink> { - - /** - * 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 ContextResourceLinkMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - /** * Obtain and return the value of a specific attribute of this MBean. * Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Mon Jun 26 20:27:09 2017 @@ -34,20 +34,6 @@ import org.apache.tomcat.util.descriptor public class ContextResourceMBean extends BaseCatalinaMBean<ContextResource> { /** - * 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 ContextResourceMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * Obtain and return the value of a specific attribute of this MBean. * * @param name Name of the requested attribute 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java Mon Jun 26 20:27:09 2017 @@ -20,10 +20,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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; @@ -41,20 +39,6 @@ import org.apache.tomcat.util.modeler.Re public class GroupMBean extends BaseModelMBean { /** - * 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 GroupMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - - /** * The configuration information registry for our managed beans. */ protected final Registry registry = MBeanUtils.createRegistry(); 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java Mon Jun 26 20:27:09 2017 @@ -20,10 +20,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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; @@ -41,22 +39,6 @@ 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 /** 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java Mon Jun 26 20:27:09 2017 @@ -19,10 +19,8 @@ package org.apache.catalina.mbeans; import java.util.ArrayList; import java.util.List; -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,22 +38,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 /** 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java Mon Jun 26 20:27:09 2017 @@ -16,9 +16,6 @@ */ 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; @@ -31,22 +28,6 @@ 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 /** Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java Mon Jun 26 20:27:09 2017 @@ -17,7 +17,6 @@ package org.apache.catalina.mbeans; import javax.management.MBeanException; -import javax.management.RuntimeOperationsException; import org.apache.catalina.Executor; import org.apache.catalina.Service; @@ -25,11 +24,6 @@ import org.apache.catalina.connector.Con public class ServiceMBean extends BaseCatalinaMBean<Service> { - public ServiceMBean() throws MBeanException, RuntimeOperationsException { - super(); - } - - /** * Add a new Connector to the set of defined Connectors, and associate it * with this Service's Container. 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=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java Mon Jun 26 20:27:09 2017 @@ -20,10 +20,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -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; @@ -41,22 +39,6 @@ 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 /** Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1799981&r1=1799980&r2=1799981&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Mon Jun 26 20:27:09 2017 @@ -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 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org