Removed all deprecated code and options

Author: Claudenw

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

@@ -91,85 +91,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();
-        }
     }
 }

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

@@ -129,31 +129,31 @@ public static InputStream markSupportedInputStream(final InputStream stream) {
      * @throws RatDocumentAnalysisException on error.
      */
     public static String process(final Document document) throws RatDocumentAnalysisException {
-        try (InputStream stream = markSupportedInputStream(document.inputStream())) {
-            Metadata metadata = new Metadata();
-            metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, document.getName().getShortName());
-            String result = TIKA.detect(stream, metadata);
-            String[] parts = result.split("/");
-            MediaType mediaType = new MediaType(parts[0], parts[1]);
-            document.getMetaData().setMediaType(mediaType);
-            if (!document.isIgnored()) {
-                document.getMetaData()
-                        .setDocumentType(fromMediaType(mediaType));
-            }
-            if (Document.Type.STANDARD == document.getMetaData().getDocumentType()) {
-                try {
-                    document.getMetaData().setCharset(detectCharset(stream, document.getName()));
-                    if (NoteGuesser.isNote(document)) {
-                        document.getMetaData().setDocumentType(Document.Type.NOTICE);
+            try (InputStream stream = markSupportedInputStream(document.inputStream())) {
+                Metadata metadata = new Metadata();
+                metadata.set(TikaCoreProperties.RESOURCE_NAME_KEY, document.getName().getShortName());
+                String result = TIKA.detect(stream, metadata);
+                String[] parts = result.split("/");
+                MediaType mediaType = new MediaType(parts[0], parts[1]);
+                document.getMetaData().setMediaType(mediaType);
+                if (!document.isIgnored()) {
+                    document.getMetaData()
+                            .setDocumentType(fromMediaType(mediaType));
+                }
+                if (Document.Type.STANDARD == document.getMetaData().getDocumentType()) {
+                    try {
+                        document.getMetaData().setCharset(detectCharset(stream, document.getName()));
+                        if (NoteGuesser.isNote(document)) {
+                            document.getMetaData().setDocumentType(Document.Type.NOTICE);
+                        }
+                    } catch (UnsupportedCharsetException e) {
+                        document.getMetaData().setDocumentType(Document.Type.UNKNOWN);
                     }
-                } catch (UnsupportedCharsetException e) {
-                    document.getMetaData().setDocumentType(Document.Type.UNKNOWN);
                 }
+                return result;
+            } catch (IOException e) {
+                throw new RatDocumentAnalysisException(e);
             }
-            return result;
-        } catch (IOException e) {
-            throw new RatDocumentAnalysisException(e);
-        }
     }
 
     /**