Implement module requires removal

Fixes: #37

Author: mkoncek

Makefile

@@ -17,6 +17,7 @@ $(call Executable_file,jurand_test): $(call Object_file,jurand_test.cpp)
 
 manpages: \
 	$(call Manpage,jurand.1)\
+	$(call Manpage,java_remove.7)\
 	$(call Manpage,java_remove_annotations.7)\
 	$(call Manpage,java_remove_imports.7)\
 

README.adoc

@@ -5,7 +5,7 @@ A tool for manipulating symbols present in `.java` source files.
 The tool can be used for patching `.java` sources in cases where using `sed` is insufficient due to Java language syntax.
 The tool follows Java language rules rather than applying simple regular expressions on the source code.
 
-Currently the tool is able to remove `import` statements and annotations.
+Currently the tool is able to remove `import` statements, annotations and modular `requires` statements.
 
 == Usage
 ----
@@ -16,6 +16,7 @@ Matcher::
 [horizontal]
 `-n <name>`::: Simple (not fully-qualified) class name.
 `-p <pattern>`::: Regex pattern to match names used in code.
+`-m <pattern>`::: Regex pattern to match module name `requires` fields used in `module-info.java` files.
 [horizontal!]
 
 Optional flags::
@@ -36,10 +37,12 @@ File path arguments are handled the following way:
 * Symlinks are ignored
 * Regular files are handled regardless of the file name
 * Directories are traversed recursively and all `.java` files are handled
+* Files named `module-info.java` are handled specifically
 
 If no file path is provided then the tool reads from the standard input.
 
 Class name matching can be done in two ways: `-n` to match simple class names or `-p` to match the provided regex pattern against fully qualified names as present in the sources.
+Modular `requires` statements are matched using the `-m` flag provding a regex pattern.
 These options can be specified multiple times.
 
 The specific implementation of the regex search engine is subject to change.

macros/macros.jurand

@@ -1,3 +1,11 @@
+# java_remove - remove dependency declarations or annotations from Java source files
+# 
+# Usage: *%java_remove* [-n <simple class name>]... [-p|-m <pattern>]... [file path]...
+# 
+# Removes dependency declarations or annotations from Java source files by matching
+# them against the lists of simple class names and patterns.
+%java_remove %{_bindir}/jurand -i
+
 # java_remove_imports - remove import statements from Java source files
 # 
 # Usage: *%java_remove_imports* [-n <simple class name>]... [-p <pattern>]... [file path]...

manpages/java_remove.7.adoc

@@ -0,0 +1,121 @@
+= java_remove(7)
+:doctype: manpage
+:mansource: JAVA_REMOVE
+:manmanual: Java packaging support
+
+== NAME
+java_remove - remove dependency declarations or annotations from Java source files
+
+== SYNOPSIS
+*%java_remove* [optional flags] <matcher>... [file path]...
+
+== DESCRIPTION
+This macro removes annotations, corresponding *import* statements and modular *requires* statements from Java source files.
+
+Annotations and import statements are matched using *-p* and *-n* flags.
+Modular requires statements are matched using the *-m* flag.
+
+The tool matches all non-whitespace content following the 'import [static]' statement against all patterns provided via the *-p* flag and all simple class names against names provided by the *-n* flag.
+
+In *module-info.java* files, all content following 'requires [static] [transitive]' is matched against all patterns provided via the *-m* flag.
+
+File path arguments are handled the following way:
+
+* Symlinks are ignored.
+* Regular files are handled regardless of the file name.
+* Directories are traversed recursively and all `.java` files are handled.
+
+Arguments can be specified in arbitrary order.
+
+Optional flags:
+
+*-s*, *--strict*::
+Fail if any of the user provided arguments were redundant.
+
+*-a*::
+Also remove annotations used in code.
+Annotations will be matched by the non-modular matchers.
+
+Matcher is one of:
+
+*-n <name>*::
+Simple class name to be matched against the simple names of imported symbols.
+Names are matched for exact equality.
+Can be specified multiple times.
+
+*-p <pattern>*::
+Regex patterns to be matched against imported symbols.
+Each imported symbol found in the code is matched against each pattern.
+Can be specified multiple times.
+
+*-m <pattern>*::
+Regex pattern to match module name `requires` fields used in `module-info.java` files.
+Can be specified multiple times.
+
+== EXAMPLES
+Examples of usage in a *.spec* file:
+
+- *%java_remove module-api module-impl module-tests -s -a -n Nullable*
+- *%java_remove src -s -a -p org[.]jspecify[.]annotations -m org[.]jspecify*
+
+=== Import patterns:
+- Import statements present in Java source file:
+
+    1) import java.lang.Runnable;
+    2) import java.util.List;
+    3) import static java.util.*;
+    4) import static java.lang.String.valueOf;
+    5) import com.google.common.util.concurrent.Service;
+
+- Names used to match:
+
+    Name 'Runnable' matches 1)
+    Name 'String' matches 4)
+
+    Name 'util' does not match anything.
+    Name '*' does not match anything.
+    Name 'valueOf' does not match anything.
+
+- Patterns used to match:
+
+    Pattern 'Runnable' matches 1).
+    Pattern '[*]' matches 3).
+    Pattern 'java[.]util' matches 2), 3).
+    Pattern 'util' matches 2), 3), 5).
+    Patterns 'java', 'java.*' match 1) - 4).
+    
+    Pattern 'static' does not match anything.
+
+=== Annotations
+- Annotations present in Java source file:
+
+    1) @SuppressWarnings
+    2) @SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
+    3) @org.junit.Test
+    4) @org.junit.jupiter.api.Test
+
+- Names used to match:
+
+    Name 'SuppressWarnings' matches 1)
+    Name 'Test' matches 3), 4).
+
+    Name 'junit' does not match anything.
+
+- Patterns used to match:
+
+    Pattern 'SuppressWarnings' matches 1).
+    Pattern 'Suppress' matches 1), 2).
+    Pattern 'org[.]junit[.]Test' matches 3).
+    Pattern 'junit' matches 3), 4).
+
+    Pattern '@SuppressWarnings' does not match anything.
+    Pattern 'EI_EXPOSE_REP' does not match anything.
+
+== REPORTING BUGS
+Bugs should be reported through the issue tracker at GitHub: https://github.com/fedora-java/jurand/issues.
+
+== AUTHOR
+Written by Marián Konček.
+
+== SEE ALSO
+*jurand*(1).

manpages/jurand.1.adoc

@@ -7,15 +7,15 @@
 jurand - Java removal of annotations
 
 == SYNOPSIS
-*jurand* [*-a*] [*-i*] [*-s*] [*-n*=_<name>_] [*-p*=<pattern>] [_<paths>_...]
+*jurand* [*-a*] [*-i*] [*-s*] [*-n*=_<name>_] [*-p|-m*=_<pattern>_] [_<paths>_...]
 
 == DESCRIPTION
 A tool for manipulating symbols present in `.java` source files.
 
 The tool can be used for patching `.java` sources in cases where using sed is insufficient due to Java language syntax.
 The tool follows Java language rules rather than applying simple regular expressions on the source code.
 
-Currently the tool is able to remove `import` statements and annotations.
+Currently the tool is able to remove `import` statements, annotations and module `requires` statements.
 
 == OPTIONS
 *-n _<name>_::
@@ -24,6 +24,9 @@ Simple (not fully-qualified) class name.
 *-p _<pattern>_::
 Regex pattern to match names used in code.
 
+*-m _<pattern>_::
+Regex pattern to match module name `requires` fields used in `module-info.java` files.
+
 *-a*::
 Also remove annotations used in code.
 
@@ -41,5 +44,6 @@ Bugs should be reported through the Jurand issue tracker at Github: https://gith
 Written by Marián Konček.
 
 == SEE ALSO
+*java_remove*(7),
 *java_remove_annotations*(7),
 *java_remove_imports*(7).