RAT-465: Removed all deprecated code and options

apache-rat-core/src/main/java/org/apache/rat/OptionCollection.java

@@ -71,26 +71,6 @@ private OptionCollection() {
     /** The Help option */
     public static final Option HELP = new Option("?", "help", false, "Print help for the RAT command line interface and exit.");
 
-    /** A mapping of {@code argName(value)} values to a description of those values. */
-    @Deprecated
-    private static final Map<String, Supplier<String>> ARGUMENT_TYPES;
-    static {
-        ARGUMENT_TYPES = new TreeMap<>();
-        for (ArgumentType argType : ArgumentType.values()) {
-            ARGUMENT_TYPES.put(argType.getDisplayName(), argType.description);
-        }
-    }
-
-    /**
-     * Gets the mapping of {@code argName(value)} values to a description of those values.
-     * @return the mapping of {@code argName(value)} values to a description of those values.
-     * @deprecated use {@link ArgumentType}
-     */
-    @Deprecated
-    public static Map<String, Supplier<String>> getArgumentTypes() {
-        return Collections.unmodifiableMap(ARGUMENT_TYPES);
-    }
-
     /**
      * Join a collection of objects together as a comma separated list of their string values.
      * @param args the objects to join together.

apache-rat-core/src/main/java/org/apache/rat/analysis/IHeaderMatcher.java

@@ -20,14 +20,6 @@
 
 import org.apache.rat.config.parameters.Description;
 import org.apache.rat.config.parameters.DescriptionBuilder;
-import org.apache.rat.configuration.builders.AllBuilder;
-import org.apache.rat.configuration.builders.AnyBuilder;
-import org.apache.rat.configuration.builders.CopyrightBuilder;
-import org.apache.rat.configuration.builders.MatcherRefBuilder;
-import org.apache.rat.configuration.builders.NotBuilder;
-import org.apache.rat.configuration.builders.RegexBuilder;
-import org.apache.rat.configuration.builders.SpdxBuilder;
-import org.apache.rat.configuration.builders.TextBuilder;
 
 /**
  * Performs explicit checks against a line from the header of a file. For
@@ -91,85 +83,5 @@ interface Builder {
         default Description getDescription() {
             return DescriptionBuilder.buildMap(this.getClass());
         }
-
-        /**
-         * @return an instance of the standard TextBuilder.
-         * @see TextBuilder
-         * @deprecated Use new TextBuilder()
-         */
-        @Deprecated // since 0.17
-        static TextBuilder text() {
-            return new TextBuilder();
-        }
-
-        /**
-         * @return an instance of the standard AnyBuilder.
-         * @see AnyBuilder
-         * @deprecated Use new AnyBuilder()
-         */
-        @Deprecated // since 0.17
-        static AnyBuilder any() {
-            return new AnyBuilder();
-        }
-
-        /**
-         * @return an instance of the standard AllBuilder.
-         * @see AllBuilder
-         * @deprecated Use new AllBuilder()
-         */
-        @Deprecated // since 0.17
-        static AllBuilder all() {
-            return new AllBuilder();
-        }
-
-        /**
-         * @return an instance of the standard CopyrightBuilder.
-         * @see CopyrightBuilder
-         * @deprecated Use new CopyrightBuilder()
-         */
-        @Deprecated // since 0.17
-        static CopyrightBuilder copyright() {
-            return new CopyrightBuilder();
-        }
-
-        /**
-         * @return an instance of the standard SpdxBuilder.
-         * @see SpdxBuilder
-         * @deprecated Use new SpdxBuilder()
-         */
-        @Deprecated // since 0.17
-        static SpdxBuilder spdx() {
-            return new SpdxBuilder();
-        }
-
-        /**
-         * @return an instance of the standard MatcherRefBuilder.
-         * @see MatcherRefBuilder
-         * @deprecated Use new MatcherRefBuilder()
-         */
-        @Deprecated // since 0.17
-        static MatcherRefBuilder matcherRef() {
-            return new MatcherRefBuilder();
-        }
-
-        /**
-         * @return an instance of the standard NotBuilder.
-         * @see NotBuilder
-         * @deprecated Use new NotBuilder()
-         */
-        @Deprecated // since 0.17
-        static NotBuilder not() {
-            return new NotBuilder();
-        }
-
-        /**
-         * @return an instance of the standard RegexBuilder.
-         * @see RegexBuilder
-         * @deprecated Use new RegexBuilder()
-         */
-        @Deprecated // since 0.17
-        static RegexBuilder regex() {
-            return new RegexBuilder();
-        }
     }
 }