[tomcat] branch main updated: Remove deprecated code.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 378bb27c4f Remove deprecated code.
378bb27c4f is described below

commit 378bb27c4fd98dc306b88f699955e19dce4d7c41
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Aug 24 14:22:39 2022 +0100

    Remove deprecated code.
---
 java/org/apache/tomcat/util/descriptor/web/WebXml.java      |  8 --------
 .../tomcat/util/descriptor/web/TestWebXmlOrdering.java      | 13 -------------
 2 files changed, 21 deletions(-)

diff --git a/java/org/apache/tomcat/util/descriptor/web/WebXml.java 
b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
index 3eb1a0f253..a8efa05dff 100644
--- a/java/org/apache/tomcat/util/descriptor/web/WebXml.java
+++ b/java/org/apache/tomcat/util/descriptor/web/WebXml.java
@@ -89,14 +89,6 @@ public class WebXml extends XmlEncodingBase implements 
DocumentProperties.Charse
     public boolean isDuplicated() {
         return !duplicates.isEmpty();
     }
-    @Deprecated
-    public void setDuplicated(boolean duplicated) {
-        if (duplicated) {
-            duplicates.add("unknown");
-        } else {
-            duplicates.clear();
-        }
-    }
     public void addDuplicate(String duplicate) {
         this.duplicates.add(duplicate);
     }
diff --git a/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java 
b/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
index 5c221d19c1..40b62ab300 100644
--- a/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
+++ b/test/org/apache/tomcat/util/descriptor/web/TestWebXmlOrdering.java
@@ -362,19 +362,6 @@ public class TestWebXmlOrdering {
         WebXml.orderWebFragments(app, fragmentsWithDuplicate, null);
     }
 
-    @SuppressWarnings("deprecation")
-    @Test(expected=IllegalArgumentException.class)
-    public void testOrderWebFragmentsRelativeDuplicateDeprecated() throws 
MalformedURLException {
-        WebXml withDuplicate = new WebXml();
-        withDuplicate.setURL(new URL("https://example.com/original.jar";));
-        withDuplicate.setDuplicated(true);
-
-        Map<String,WebXml> fragmentsWithDuplicate = new LinkedHashMap<>();
-        fragmentsWithDuplicate.put("has-duplicate", withDuplicate);
-
-        WebXml.orderWebFragments(app, fragmentsWithDuplicate, null);
-    }
-
     private interface RelativeOrderingTestRunner {
         void init();
         void validate(String order);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org