requires static from deeper level must be included if requested. see MCOMPILER-481 (#106)

olamy · rfscholte · web-flow · commit 86e0436075da · 2022-02-01T07:05:16.000+10:00
* fix issues including requires static. see MCOMPILER-481

Signed-off-by: Olivier Lamy &lt;olamy@apache.org&gt;
Co-authored-by: rfscholte &lt;rfscholte@apache.org&gt;
diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParser.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParser.java
@@ -23,7 +23,6 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -74,7 +73,7 @@ public void visitRequire( String module, int access, String version )
                                 modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
                             }
 
-                            wrapper.builder.requires​( modifiers, module );
+                            wrapper.builder.requires( modifiers, module );
                         }
                         else
                         {
@@ -109,7 +108,7 @@ public void visitProvide( String service, String... providers )
                         {
                             renamedProvides.add( provider.replace( '/', '.' ) );
                         }
-                        wrapper.builder.provides​( service.replace( '/', '.' ), renamedProvides );
+                        wrapper.builder.provides( service.replace( '/', '.' ), renamedProvides );
                     }
                 };
             }
diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/JavaModuleDescriptor.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/JavaModuleDescriptor.java
@@ -128,7 +128,19 @@ public boolean equals( Object obj )
         }
         return true;
     }
-    
+
+    @Override
+    public String toString() {
+        return "JavaModuleDescriptor{" +
+                "name='" + name + '\'' +
+                ", automatic=" + automatic +
+                ", requires=" + requires +
+                ", exports=" + exports +
+                ", uses=" + uses +
+                ", provides=" + provides +
+                '}';
+    }
+
     /**
      * A JavaModuleDescriptor Builder
      * 
@@ -158,7 +170,7 @@ private Builder setAutomatic( boolean isAutomatic )
          * @param name The module name
          * @return This builder
          */
-        public Builder requires​( Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers, String name )
+        public Builder requires( Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers, String name )
         {
             jModule.requires.add( new JavaRequires( modifiers, name ) );
             return this;
@@ -213,7 +225,7 @@ public Builder uses( String service )
             return this;
         }
         
-        public Builder provides​( String service, List<String> providers )
+        public Builder provides( String service, List<String> providers )
         {
             jModule.provides.add( new JavaProvides( service, providers ) );
             return this;
@@ -254,7 +266,7 @@ private JavaRequires( String name )
             this.name = name;
         }
 
-        public Set<JavaModifier> modifiers​()
+        public Set<JavaModifier> modifiers()
         {
             return modifiers;
         }
@@ -270,7 +282,7 @@ public String name()
          * @author Robert Scholte
          * @since 1.0.0
          */
-        public static enum JavaModifier
+        public enum JavaModifier
         {
             STATIC, TRANSITIVE
         }
@@ -308,6 +320,14 @@ public boolean equals( Object obj )
             }
             return true;
         }
+
+        @Override
+        public String toString() {
+            return "JavaRequires{" +
+                    "modifiers=" + modifiers +
+                    ", name='" + name + '\'' +
+                    '}';
+        }
     }
     
     /**
@@ -377,6 +397,14 @@ public boolean equals( Object obj )
             }
             return true;
         }
+
+        @Override
+        public String toString() {
+            return "JavaExports{" +
+                    "source='" + source + '\'' +
+                    ", targets=" + targets +
+                    '}';
+        }
     }
     
     /**
@@ -440,5 +468,13 @@ public boolean equals( Object obj )
             }
             return true;
         }
+
+        @Override
+        public String toString() {
+            return "JavaProvides{" +
+                    "service='" + service + '\'' +
+                    ", providers=" + providers +
+                    '}';
+        }
     }
 }
diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java
@@ -261,8 +261,9 @@ public String extract( Path path )
                             Collections.unmodifiableMap( availableNamedModules ),
                             Collections.unmodifiableMap( availableProviders ), 
                             requiredNamedModules,
-                            true, 
-                            true );
+                            true,
+                            true,
+                            request.isIncludeStatic());
         }
         
         for ( String additionalModule : request.getAdditionalModules() )
@@ -271,8 +272,9 @@ public String extract( Path path )
                           Collections.unmodifiableMap( availableNamedModules ), 
                           Collections.unmodifiableMap( availableProviders ), 
                           requiredNamedModules,
-                          request.isIncludeStatic(), 
-                          true );
+                          true, 
+                          true,
+                          request.isIncludeStatic());
         }
 
         // in case of identical module names, first one wins
@@ -400,19 +402,21 @@ private void selectRequires( JavaModuleDescriptor module,
                                  Map<String, JavaModuleDescriptor> availableModules,
                                  Map<String, Set<String>> availableProviders,
                                  Set<String> namedModules,
-                                 boolean includeStatic, 
-                                 boolean includeTransitive )
+                                 boolean isRootModule,
+                                 boolean includeAsTransitive,
+                                 boolean includeStatic)
     {
         for ( JavaModuleDescriptor.JavaRequires requires : module.requires() )
         {
             // includeTransitive is one level deeper compared to includeStatic
-            if ( includeStatic || !requires.modifiers​().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC )  )
+            if ( isRootModule 
+                        || includeStatic
+                        || includeAsTransitive
+                        || !requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC )
+                        || requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE ) )
             {
-                selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );
-            }
-            else if ( includeTransitive && requires.modifiers​().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE )  )
-            {
-                selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );
+                selectModule( requires.name(), availableModules, availableProviders,
+                        namedModules, false, includeStatic, includeStatic );
             }
         }
         
@@ -426,21 +430,23 @@ else if ( includeTransitive && requires.modifiers​().contains( JavaModuleDescr
                     
                     if ( requiredModule != null && namedModules.add( providerModule ) )
                     {
-                        selectRequires( requiredModule, availableModules, availableProviders, namedModules, false, includeStatic );
+                        selectRequires( requiredModule, availableModules, availableProviders,
+                                namedModules, false, includeAsTransitive, includeStatic );
                     }
                 }
             }
         }        
     }
 
     private void selectModule( String module, Map<String, JavaModuleDescriptor> availableModules, Map<String, Set<String>> availableProviders,
-                               Set<String> namedModules, boolean includeStatic, boolean includeTransitive )
+                               Set<String> namedModules, boolean isRootModule, boolean includeTransitive, boolean includeStatic )
     {
         JavaModuleDescriptor requiredModule = availableModules.get( module );
 
         if ( requiredModule != null && namedModules.add( module ) )
         {
-            selectRequires( requiredModule, availableModules, availableProviders, namedModules, includeStatic, includeTransitive );
+            selectRequires( requiredModule, availableModules, availableProviders,
+                    namedModules, false, includeTransitive, includeStatic );
         }
     }
     
diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathsResult.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathsResult.java
@@ -122,4 +122,15 @@ public Map<T, Exception> getPathExceptions()
     {
         return pathExceptions;
     }
+
+    @Override
+    public String toString() {
+        return "ResolvePathsResult{" + System.lineSeparator() +
+                "mainModuleDescriptor=" + mainModuleDescriptor + System.lineSeparator() +
+                ", pathElements=" + pathElements + System.lineSeparator() +
+                ", modulepathElements=" + modulepathElements + System.lineSeparator() +
+                ", classpathElements=" + classpathElements + System.lineSeparator() +
+                ", pathExceptions=" + pathExceptions + System.lineSeparator() +
+                '}';
+    }
 }
diff --git a/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParser.java b/plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParser.java
@@ -23,8 +23,6 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -69,7 +67,7 @@ public org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor fromSourcePa
                     {
                         modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
                     }
-                    builder.requires​( modifiers , requires.getModule().getName() );
+                    builder.requires( modifiers , requires.getModule().getName() );
                 }
                 else
                 {
@@ -107,7 +105,7 @@ public org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor fromSourcePa
                     providers.add( provider.getName() );
                 }
                 
-                builder.provides​( provides.getService().getName(), providers );
+                builder.provides( provides.getService().getName(), providers );
             }
         }
         else
diff --git a/plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParser.java b/plexus-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParser.java
@@ -52,7 +52,7 @@ JavaModuleDescriptor parse( InputStream in ) throws IOException
                 {
                     modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );
                 }
-                builder.requires​( modifiers, requires.name() );
+                builder.requires( modifiers, requires.name() );
             }
             else
             {
@@ -79,7 +79,7 @@ JavaModuleDescriptor parse( InputStream in ) throws IOException
         
         for ( ModuleDescriptor.Provides provides : descriptor.provides() )
         {
-            builder.provides​( provides.service(), provides.providers() );
+            builder.provides( provides.service(), provides.providers() );
         }
         
         
diff --git a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParserTest.java b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParserTest.java
@@ -110,7 +110,7 @@ public void testOutputDirectoryDescriptor()
         Set<JavaRequires> expectedRequires = JavaModuleDescriptor.newAutomaticModule( "_" )
             .requires( "java.base" )
             .requires( "java.xml" )
-            .requires​( Collections.singleton( JavaRequires.JavaModifier.STATIC ), "com.google.common" )
+            .requires( Collections.singleton( JavaRequires.JavaModifier.STATIC ), "com.google.common" )
             .build()
             .requires();
 
@@ -192,9 +192,9 @@ public void testRequires() throws Exception
             Set<JavaRequires> expectedRequires = JavaModuleDescriptor.newAutomaticModule( "_" )
                             .requires( "java.base" )
                             .requires( "mod_r" )
-                            .requires​( Collections.singleton( JavaRequires.JavaModifier.STATIC ), "mod_r_s" )
-                            .requires​( Collections.singleton( JavaRequires.JavaModifier.TRANSITIVE ), "mod_r_t" )
-                            .requires​( new HashSet<JavaRequires.JavaModifier>( Arrays.asList( JavaRequires.JavaModifier.STATIC, JavaRequires.JavaModifier.TRANSITIVE ) ), "mod_r_s_t" )
+                            .requires( Collections.singleton( JavaRequires.JavaModifier.STATIC ), "mod_r_s" )
+                            .requires( Collections.singleton( JavaRequires.JavaModifier.TRANSITIVE ), "mod_r_t" )
+                            .requires( new HashSet<JavaRequires.JavaModifier>( Arrays.asList( JavaRequires.JavaModifier.STATIC, JavaRequires.JavaModifier.TRANSITIVE ) ), "mod_r_s_t" )
                             .build()
                             .requires();
 
diff --git a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerTest.java b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerTest.java
diff --git a/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParserTest.java b/plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParserTest.java

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`import java.io.InputStream;`
`24`	`24`	`import java.util.ArrayList;`
`25`	`25`	`import java.util.Arrays;`
`26`		`-import java.util.Collections;`
`27`	`26`	`import java.util.HashSet;`
`28`	`27`	`import java.util.LinkedHashSet;`
`29`	`28`	`import java.util.List;`
`@@ -74,7 +73,7 @@ public void visitRequire( String module, int access, String version )`
`74`	`73`	`modifiers.add( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );`
`75`	`74`	`}`
`76`	`75`
`77`		`- wrapper.builder.requires( modifiers, module );`
	`76`	`+ wrapper.builder.requires( modifiers, module );`
`78`	`77`	`}`
`79`	`78`	`else`
`80`	`79`	`{`
`@@ -109,7 +108,7 @@ public void visitProvide( String service, String... providers )`
`109`	`108`	`{`
`110`	`109`	`renamedProvides.add( provider.replace( '/', '.' ) );`
`111`	`110`	`}`
`112`		`- wrapper.builder.provides( service.replace( '/', '.' ), renamedProvides );`
	`111`	`+ wrapper.builder.provides( service.replace( '/', '.' ), renamedProvides );`
`113`	`112`	`}`
`114`	`113`	`};`
`115`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,19 @@ public boolean equals( Object obj )`
`128`	`128`	`}`
`129`	`129`	`return true;`
`130`	`130`	`}`
`131`		`-`
	`131`	`+`
	`132`	`+ @Override`
	`133`	`+ public String toString() {`
	`134`	`+ return "JavaModuleDescriptor{" +`
	`135`	`+ "name='" + name + '\'' +`
	`136`	`+ ", automatic=" + automatic +`
	`137`	`+ ", requires=" + requires +`
	`138`	`+ ", exports=" + exports +`
	`139`	`+ ", uses=" + uses +`
	`140`	`+ ", provides=" + provides +`
	`141`	`+ '}';`
	`142`	`+ }`
	`143`	`+`
`132`	`144`	`/**`
`133`	`145`	`* A JavaModuleDescriptor Builder`
`134`	`146`	`*`
`@@ -158,7 +170,7 @@ private Builder setAutomatic( boolean isAutomatic )`
`158`	`170`	`* @param name The module name`
`159`	`171`	`* @return This builder`
`160`	`172`	`*/`
`161`		`- public Builder requires( Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers, String name )`
	`173`	`+ public Builder requires( Set<JavaModuleDescriptor.JavaRequires.JavaModifier> modifiers, String name )`
`162`	`174`	`{`
`163`	`175`	`jModule.requires.add( new JavaRequires( modifiers, name ) );`
`164`	`176`	`return this;`
`@@ -213,7 +225,7 @@ public Builder uses( String service )`
`213`	`225`	`return this;`
`214`	`226`	`}`
`215`	`227`
`216`		`- public Builder provides( String service, List<String> providers )`
	`228`	`+ public Builder provides( String service, List<String> providers )`
`217`	`229`	`{`
`218`	`230`	`jModule.provides.add( new JavaProvides( service, providers ) );`
`219`	`231`	`return this;`
`@@ -254,7 +266,7 @@ private JavaRequires( String name )`
`254`	`266`	`this.name = name;`
`255`	`267`	`}`
`256`	`268`
`257`		`- public Set<JavaModifier> modifiers()`
	`269`	`+ public Set<JavaModifier> modifiers()`
`258`	`270`	`{`
`259`	`271`	`return modifiers;`
`260`	`272`	`}`
`@@ -270,7 +282,7 @@ public String name()`
`270`	`282`	`* @author Robert Scholte`
`271`	`283`	`* @since 1.0.0`
`272`	`284`	`*/`
`273`		`- public static enum JavaModifier`
	`285`	`+ public enum JavaModifier`
`274`	`286`	`{`
`275`	`287`	`STATIC, TRANSITIVE`
`276`	`288`	`}`
`@@ -308,6 +320,14 @@ public boolean equals( Object obj )`
`308`	`320`	`}`
`309`	`321`	`return true;`
`310`	`322`	`}`
	`323`	`+`
	`324`	`+ @Override`
	`325`	`+ public String toString() {`
	`326`	`+ return "JavaRequires{" +`
	`327`	`+ "modifiers=" + modifiers +`
	`328`	`+ ", name='" + name + '\'' +`
	`329`	`+ '}';`
	`330`	`+ }`
`311`	`331`	`}`
`312`	`332`
`313`	`333`	`/**`
`@@ -377,6 +397,14 @@ public boolean equals( Object obj )`
`377`	`397`	`}`
`378`	`398`	`return true;`
`379`	`399`	`}`
	`400`	`+`
	`401`	`+ @Override`
	`402`	`+ public String toString() {`
	`403`	`+ return "JavaExports{" +`
	`404`	`+ "source='" + source + '\'' +`
	`405`	`+ ", targets=" + targets +`
	`406`	`+ '}';`
	`407`	`+ }`
`380`	`408`	`}`
`381`	`409`
`382`	`410`	`/**`
`@@ -440,5 +468,13 @@ public boolean equals( Object obj )`
`440`	`468`	`}`
`441`	`469`	`return true;`
`442`	`470`	`}`
	`471`	`+`
	`472`	`+ @Override`
	`473`	`+ public String toString() {`
	`474`	`+ return "JavaProvides{" +`
	`475`	`+ "service='" + service + '\'' +`
	`476`	`+ ", providers=" + providers +`
	`477`	`+ '}';`
	`478`	`+ }`
`443`	`479`	`}`
`444`	`480`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,9 @@ public String extract( Path path )`
`261`	`261`	`Collections.unmodifiableMap( availableNamedModules ),`
`262`	`262`	`Collections.unmodifiableMap( availableProviders ),`
`263`	`263`	`requiredNamedModules,`
`264`		`- true,`
`265`		`- true );`
	`264`	`+ true,`
	`265`	`+ true,`
	`266`	`+ request.isIncludeStatic());`
`266`	`267`	`}`
`267`	`268`
`268`	`269`	`for ( String additionalModule : request.getAdditionalModules() )`
`@@ -271,8 +272,9 @@ public String extract( Path path )`
`271`	`272`	`Collections.unmodifiableMap( availableNamedModules ),`
`272`	`273`	`Collections.unmodifiableMap( availableProviders ),`
`273`	`274`	`requiredNamedModules,`
`274`		`- request.isIncludeStatic(),`
`275`		`- true );`
	`275`	`+ true,`
	`276`	`+ true,`
	`277`	`+ request.isIncludeStatic());`
`276`	`278`	`}`
`277`	`279`
`278`	`280`	`// in case of identical module names, first one wins`
`@@ -400,19 +402,21 @@ private void selectRequires( JavaModuleDescriptor module,`
`400`	`402`	`Map<String, JavaModuleDescriptor> availableModules,`
`401`	`403`	`Map<String, Set<String>> availableProviders,`
`402`	`404`	`Set<String> namedModules,`
`403`		`- boolean includeStatic,`
`404`		`- boolean includeTransitive )`
	`405`	`+ boolean isRootModule,`
	`406`	`+ boolean includeAsTransitive,`
	`407`	`+ boolean includeStatic)`
`405`	`408`	`{`
`406`	`409`	`for ( JavaModuleDescriptor.JavaRequires requires : module.requires() )`
`407`	`410`	`{`
`408`	`411`	`// includeTransitive is one level deeper compared to includeStatic`
`409`		`- if ( includeStatic \|\| !requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC ) )`
	`412`	`+ if ( isRootModule`
	`413`	`+ \|\| includeStatic`
	`414`	`+ \|\| includeAsTransitive`
	`415`	`+ \|\| !requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.STATIC )`
	`416`	`+ \|\| requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE ) )`
`410`	`417`	`{`
`411`		`- selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );`
`412`		`- }`
`413`		`- else if ( includeTransitive && requires.modifiers().contains( JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE ) )`
`414`		`- {`
`415`		`- selectModule( requires.name(), availableModules, availableProviders, namedModules, false, includeStatic );`
	`418`	`+ selectModule( requires.name(), availableModules, availableProviders,`
	`419`	`+ namedModules, false, includeStatic, includeStatic );`
`416`	`420`	`}`
`417`	`421`	`}`
`418`	`422`
`@@ -426,21 +430,23 @@ else if ( includeTransitive && requires.modifiers().contains( JavaModuleDescr`
`426`	`430`
`427`	`431`	`if ( requiredModule != null && namedModules.add( providerModule ) )`
`428`	`432`	`{`
`429`		`- selectRequires( requiredModule, availableModules, availableProviders, namedModules, false, includeStatic );`
	`433`	`+ selectRequires( requiredModule, availableModules, availableProviders,`
	`434`	`+ namedModules, false, includeAsTransitive, includeStatic );`
`430`	`435`	`}`
`431`	`436`	`}`
`432`	`437`	`}`
`433`	`438`	`}`
`434`	`439`	`}`
`435`	`440`
`436`	`441`	`private void selectModule( String module, Map<String, JavaModuleDescriptor> availableModules, Map<String, Set<String>> availableProviders,`
`437`		`- Set<String> namedModules, boolean includeStatic, boolean includeTransitive )`
	`442`	`+ Set<String> namedModules, boolean isRootModule, boolean includeTransitive, boolean includeStatic )`
`438`	`443`	`{`
`439`	`444`	`JavaModuleDescriptor requiredModule = availableModules.get( module );`
`440`	`445`
`441`	`446`	`if ( requiredModule != null && namedModules.add( module ) )`
`442`	`447`	`{`
`443`		`- selectRequires( requiredModule, availableModules, availableProviders, namedModules, includeStatic, includeTransitive );`
	`448`	`+ selectRequires( requiredModule, availableModules, availableProviders,`
	`449`	`+ namedModules, false, includeTransitive, includeStatic );`
`444`	`450`	`}`
`445`	`451`	`}`
`446`	`452`
Original file line number	Diff line number	Diff line change
`@@ -122,4 +122,15 @@ public Map<T, Exception> getPathExceptions()`
`122`	`122`	`{`
`123`	`123`	`return pathExceptions;`
`124`	`124`	`}`
	`125`	`+`
	`126`	`+ @Override`
	`127`	`+ public String toString() {`
	`128`	`+ return "ResolvePathsResult{" + System.lineSeparator() +`
	`129`	`+ "mainModuleDescriptor=" + mainModuleDescriptor + System.lineSeparator() +`
	`130`	`+ ", pathElements=" + pathElements + System.lineSeparator() +`
	`131`	`+ ", modulepathElements=" + modulepathElements + System.lineSeparator() +`
	`132`	`+ ", classpathElements=" + classpathElements + System.lineSeparator() +`
	`133`	`+ ", pathExceptions=" + pathExceptions + System.lineSeparator() +`
	`134`	`+ '}';`
	`135`	`+ }`
`125`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,6 @@`
`23`	`23`	`import java.io.IOException;`
`24`	`24`	`import java.nio.file.Path;`
`25`	`25`	`import java.util.ArrayList;`
`26`		`-import java.util.Collections;`
`27`		`-import java.util.HashSet;`
`28`	`26`	`import java.util.LinkedHashSet;`
`29`	`27`	`import java.util.List;`
`30`	`28`	`import java.util.Set;`
`@@ -69,7 +67,7 @@ public org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor fromSourcePa`
`69`	`67`	`{`
`70`	`68`	`modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );`
`71`	`69`	`}`
`72`		`- builder.requires( modifiers , requires.getModule().getName() );`
	`70`	`+ builder.requires( modifiers , requires.getModule().getName() );`
`73`	`71`	`}`
`74`	`72`	`else`
`75`	`73`	`{`
`@@ -107,7 +105,7 @@ public org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor fromSourcePa`
`107`	`105`	`providers.add( provider.getName() );`
`108`	`106`	`}`
`109`	`107`
`110`		`- builder.provides( provides.getService().getName(), providers );`
	`108`	`+ builder.provides( provides.getService().getName(), providers );`
`111`	`109`	`}`
`112`	`110`	`}`
`113`	`111`	`else`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ JavaModuleDescriptor parse( InputStream in ) throws IOException`
`52`	`52`	`{`
`53`	`53`	`modifiers.add( org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.JavaRequires.JavaModifier.TRANSITIVE );`
`54`	`54`	`}`
`55`		`- builder.requires( modifiers, requires.name() );`
	`55`	`+ builder.requires( modifiers, requires.name() );`
`56`	`56`	`}`
`57`	`57`	`else`
`58`	`58`	`{`
`@@ -79,7 +79,7 @@ JavaModuleDescriptor parse( InputStream in ) throws IOException`
`79`	`79`
`80`	`80`	`for ( ModuleDescriptor.Provides provides : descriptor.provides() )`
`81`	`81`	`{`
`82`		`- builder.provides( provides.service(), provides.providers() );`
	`82`	`+ builder.provides( provides.service(), provides.providers() );`
`83`	`83`	`}`
`84`	`84`
`85`	`85`