Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 31, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95ea5b1
fix issues including requires static. see MCOMPILER-481
olamy Jan 19, 2022
4955d51
commit included static
olamy Jan 20, 2022
2d1735e
if request ask including static this must be done for deeper level
olamy Jan 26, 2022
65147f5
test for MCOMPILER-482
olamy Jan 26, 2022
e304fc6
improve variable naming
olamy Jan 31, 2022
c59f8ae
#106 rewrite selectRequires()
rfscholte Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/AsmModuleInfoParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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 );
}
};
}
Expand Down
46 changes: 41 additions & 5 deletions plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/JavaModuleDescriptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -254,7 +266,7 @@ private JavaRequires( String name )
this.name = name;
}

public Set<JavaModifier> modifiers​()
public Set<JavaModifier> modifiers()
{
return modifiers;
}
Expand All @@ -270,7 +282,7 @@ public String name()
* @author Robert Scholte
* @since 1.0.0
*/
public static enum JavaModifier
public enum JavaModifier
{
STATIC, TRANSITIVE
}
Expand Down Expand Up @@ -308,6 +320,14 @@ public boolean equals( Object obj )
}
return true;
}

@Override
public String toString() {
return "JavaRequires{" +
"modifiers=" + modifiers +
", name='" + name + '\'' +
'}';
}
}

/**
Expand Down Expand Up @@ -377,6 +397,14 @@ public boolean equals( Object obj )
}
return true;
}

@Override
public String toString() {
return "JavaExports{" +
"source='" + source + '\'' +
", targets=" + targets +
'}';
}
}

/**
Expand Down Expand Up @@ -440,5 +468,13 @@ public boolean equals( Object obj )
}
return true;
}

@Override
public String toString() {
return "JavaProvides{" +
"service='" + service + '\'' +
", providers=" + providers +
'}';
}
}
}
36 changes: 21 additions & 15 deletions plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/LocationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() )
Expand All @@ -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
Expand Down Expand Up @@ -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 );
}
}

Expand All @@ -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 );
}
}

Expand Down
11 changes: 11 additions & 0 deletions plexus-java/src/main/java/org/codehaus/plexus/languages/java/jpms/ResolvePathsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() +
'}';
}
}
6 changes: 2 additions & 4 deletions ...us-java/src/main/java/org/codehaus/plexus/languages/java/jpms/SourceModuleInfoParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
{
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...s-java/src/main/java9/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -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() );
}


Expand Down
8 changes: 4 additions & 4 deletions ...ava/src/test/java/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down
Loading