Author: markt Date: Fri Jul 28 15:20:32 2017 New Revision: 1803281 URL: http://svn.apache.org/viewvc?rev=1803281&view=rev Log: Deprecate unused code identified by FindBugs
Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java Modified: tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java Fri Jul 28 15:20:32 2017 @@ -64,7 +64,6 @@ public class ClusterRuleSet extends Rule */ public ClusterRuleSet(String prefix) { super(); - this.namespaceURI = null; this.prefix = prefix; } 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=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRuleSet.java Fri Jul 28 15:20:32 2017 @@ -65,11 +65,8 @@ public class MemoryRuleSet extends RuleS * trailing slash character) */ public MemoryRuleSet(String prefix) { - super(); - this.namespaceURI = null; this.prefix = prefix; - } Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ContextRuleSet.java Fri Jul 28 15:20:32 2017 @@ -81,7 +81,6 @@ public class ContextRuleSet extends Rule * created */ public ContextRuleSet(String prefix, boolean create) { - this.namespaceURI = null; this.prefix = prefix; this.create = create; } Modified: tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/CredentialHandlerRuleSet.java Fri Jul 28 15:20:32 2017 @@ -61,7 +61,6 @@ public class CredentialHandlerRuleSet ex * trailing slash character) */ public CredentialHandlerRuleSet(String prefix) { - this.namespaceURI = null; this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/EngineRuleSet.java Fri Jul 28 15:20:32 2017 @@ -63,7 +63,6 @@ public class EngineRuleSet extends RuleS * trailing slash character) */ public EngineRuleSet(String prefix) { - this.namespaceURI = null; this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostRuleSet.java Fri Jul 28 15:20:32 2017 @@ -63,7 +63,6 @@ public class HostRuleSet extends RuleSet * trailing slash character) */ public HostRuleSet(String prefix) { - this.namespaceURI = null; this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/NamingRuleSet.java Fri Jul 28 15:20:32 2017 @@ -62,7 +62,6 @@ public class NamingRuleSet extends RuleS * trailing slash character) */ public NamingRuleSet(String prefix) { - this.namespaceURI = null; this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/RealmRuleSet.java Fri Jul 28 15:20:32 2017 @@ -64,7 +64,6 @@ public class RealmRuleSet extends RuleSe * trailing slash character) */ public RealmRuleSet(String prefix) { - this.namespaceURI = null; this.prefix = prefix; } Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/WebRuleSet.java Fri Jul 28 15:20:32 2017 @@ -136,9 +136,7 @@ public class WebRuleSet extends RuleSetB * @param fragment <code>true</code> if this is a web fragment */ public WebRuleSet(String prefix, boolean fragment) { - super(); - this.namespaceURI = null; this.prefix = prefix; this.fragment = fragment; @@ -152,8 +150,8 @@ public class WebRuleSet extends RuleSetB relativeOrdering = new RelativeOrderingRule(fragment); } - // --------------------------------------------------------- Public Methods + // --------------------------------------------------------- Public Methods /** * <p>Add the set of Rule instances defined in this RuleSet to the Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Fri Jul 28 15:20:32 2017 @@ -203,7 +203,10 @@ public class CallMethodRule extends Rule /** * The names of the classes of the parameters to be collected. * This attribute allows creation of the classes to be postponed until the digester is set. + * + * @deprecated Unused. This will be removed in Tomcat 9. */ + @Deprecated protected final String paramClassNames[]; /** Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Fri Jul 28 15:20:32 2017 @@ -586,7 +586,10 @@ public class Digester extends DefaultHan /** * @return the namespace URI that will be applied to all subsequently * added <code>Rule</code> objects. + * + * @deprecated Unused. Will be removed in Tomcat 9 */ + @Deprecated public String getRuleNamespaceURI() { return getRules().getNamespaceURI(); } @@ -599,7 +602,10 @@ public class Digester extends DefaultHan * @param ruleNamespaceURI Namespace URI that must match on all * subsequently added rules, or <code>null</code> for matching * regardless of the current namespace URI + * + * @deprecated Unused. Will be removed in Tomcat 9 */ + @Deprecated public void setRuleNamespaceURI(String ruleNamespaceURI) { getRules().setNamespaceURI(ruleNamespaceURI); } @@ -1522,6 +1528,7 @@ public class Digester extends DefaultHan public void addRuleSet(RuleSet ruleSet) { String oldNamespaceURI = getRuleNamespaceURI(); + @SuppressWarnings("deprecation") String newNamespaceURI = ruleSet.getNamespaceURI(); if (log.isDebugEnabled()) { if (newNamespaceURI == null) { Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSet.java Fri Jul 28 15:20:32 2017 @@ -44,7 +44,10 @@ public interface RuleSet { /** * @return the namespace URI that will be applied to all Rule instances * created from this RuleSet. + * + * @deprecated Unused. Will be removed in Tomcat 9 */ + @Deprecated public String getNamespaceURI(); Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Fri Jul 28 15:20:32 2017 @@ -34,7 +34,10 @@ public abstract class RuleSetBase implem /** * The namespace URI that all Rule instances created by this RuleSet * will be associated with. + * + * @deprecated Unused. This will be removed in Tomcat 9. */ + @Deprecated protected String namespaceURI = null; @@ -44,7 +47,10 @@ public abstract class RuleSetBase implem /** * Return the namespace URI that will be applied to all Rule instances * created from this RuleSet. + * + * @deprecated Unused. This will be removed in Tomcat 9. */ + @Deprecated @Override public String getNamespaceURI() { return this.namespaceURI; Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java?rev=1803281&r1=1803280&r2=1803281&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java (original) +++ tomcat/trunk/java/org/apache/tomcat/util/digester/Rules.java Fri Jul 28 15:20:32 2017 @@ -53,7 +53,10 @@ public interface Rules { /** * @return the namespace URI that will be applied to all subsequently * added <code>Rule</code> objects. + * + * @deprecated Unused. Will be removed in Tomcat 9 */ + @Deprecated public String getNamespaceURI(); @@ -64,7 +67,10 @@ public interface Rules { * @param namespaceURI Namespace URI that must match on all * subsequently added rules, or <code>null</code> for matching * regardless of the current namespace URI + * + * @deprecated Unused. Will be removed in Tomcat 9 */ + @Deprecated public void setNamespaceURI(String namespaceURI); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org