true if the result will include all static dependencies
* @since 1.0.5
*/
- public boolean isIncludeStatic()
- {
+ public boolean isIncludeStatic() {
return includeStatic;
}
@@ -251,8 +222,7 @@ public boolean isIncludeStatic()
* @return this request
* @since 1.0.5
*/
- public ResolvePathsRequest
- * JavaVersion.parse( "1" ).getValue( 1 ) is "1"
- * JavaVersion.parse( "1" ).getValue( 2 ) is "1.0"
- * JavaVersion.parse( "2.1" ).getValue( 1 ) is "2"
- * JavaVersion.parse( "2.1" ).getValue( 2 ) is "2.1"
+ * JavaVersion.parse( "1" ).getValue( 1 ) is "1"
+ * JavaVersion.parse( "1" ).getValue( 2 ) is "1.0"
+ * JavaVersion.parse( "2.1" ).getValue( 1 ) is "2"
+ * JavaVersion.parse( "2.1" ).getValue( 2 ) is "2.1"
*
- *
+ *
* @param groups number of groups to return
* @return the version respecting the number of groups
*/
- public String getValue( int groups )
- {
+ public String getValue(int groups) {
StringBuilder value = new StringBuilder();
- StringTokenizer tokenizer = new StringTokenizer( rawVersion, "." );
-
- value.append( tokenizer.nextToken() );
- for ( int group = 1 ; group < groups ; group++ )
- {
- value.append( '.' );
- if( tokenizer.hasMoreTokens() )
- {
- value.append( tokenizer.nextToken() );
- }
- else
- {
- value.append( "0" );
+ StringTokenizer tokenizer = new StringTokenizer(rawVersion, ".");
+
+ value.append(tokenizer.nextToken());
+ for (int group = 1; group < groups; group++) {
+ value.append('.');
+ if (tokenizer.hasMoreTokens()) {
+ value.append(tokenizer.nextToken());
+ } else {
+ value.append("0");
}
}
return value.toString();
}
@Override
- public String toString()
- {
+ public String toString() {
return rawVersion;
}
@Override
- public int hashCode()
- {
- return Objects.hashCode( rawVersion );
+ public int hashCode() {
+ return Objects.hashCode(rawVersion);
}
@Override
- public boolean equals( Object obj )
- {
- if ( this == obj )
- {
+ public boolean equals(Object obj) {
+ if (this == obj) {
return true;
}
- if ( obj == null )
- {
+ if (obj == null) {
return false;
}
- if ( getClass() != obj.getClass() )
- {
+ if (getClass() != obj.getClass()) {
return false;
}
-
+
JavaVersion other = (JavaVersion) obj;
- if ( isMajor != other.isMajor )
- {
+ if (isMajor != other.isMajor) {
final String thisOneDotVersion;
final String otherOneDotVersion;
- if ( isMajor )
- {
+ if (isMajor) {
thisOneDotVersion = "1." + rawVersion;
otherOneDotVersion = other.rawVersion;
- }
- else
- {
+ } else {
thisOneDotVersion = rawVersion;
otherOneDotVersion = "1." + other.rawVersion;
}
-
- if ( !Objects.equals( thisOneDotVersion, otherOneDotVersion ) )
- {
- return false;
- }
- }
- else if ( !Objects.equals( rawVersion, other.rawVersion ) )
- {
+
+ if (!Objects.equals(thisOneDotVersion, otherOneDotVersion)) {
return false;
+ }
+ } else if (!Objects.equals(rawVersion, other.rawVersion)) {
+ return false;
}
return true;
}
diff --git a/plexus-java/src/main/java9/module-info.java b/plexus-java/src/main/java9/module-info.java
index 9b83831..c09093b 100644
--- a/plexus-java/src/main/java9/module-info.java
+++ b/plexus-java/src/main/java9/module-info.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-module org.codehaus.plexus.languages.java
-{
+module org.codehaus.plexus.languages.java {
requires com.thoughtworks.qdox;
requires org.objectweb.asm;
-
+
exports org.codehaus.plexus.languages.java.jpms;
exports org.codehaus.plexus.languages.java.version;
-
- provides org.codehaus.plexus.languages.java.jpms.LocationManager with org.codehaus.plexus.languages.java.jpms.LocationManager;
-}
\ No newline at end of file
+
+ provides org.codehaus.plexus.languages.java.jpms.LocationManager with
+ org.codehaus.plexus.languages.java.jpms.LocationManager;
+}
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
index 6bab93e..a2f3af1 100644
--- 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
@@ -21,68 +21,55 @@
import java.io.IOException;
import java.io.InputStream;
-
import java.lang.module.ModuleDescriptor;
-import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.Set;
import org.codehaus.plexus.languages.java.jpms.JavaModuleDescriptor.Builder;
-class BinaryModuleInfoParser extends AbstractBinaryModuleInfoParser
-{
+class BinaryModuleInfoParser extends AbstractBinaryModuleInfoParser {
@Override
- JavaModuleDescriptor parse( InputStream in ) throws IOException
- {
- ModuleDescriptor descriptor = ModuleDescriptor.read( in );
-
- Builder builder = JavaModuleDescriptor.newModule( descriptor.name() );
-
- for ( ModuleDescriptor.Requires requires : descriptor.requires() )
- {
- if ( requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.STATIC )
- || requires.modifiers().contains( ModuleDescriptor.Requires.Modifier.TRANSITIVE ) )
- {
+ JavaModuleDescriptor parse(InputStream in) throws IOException {
+ ModuleDescriptor descriptor = ModuleDescriptor.read(in);
+
+ Builder builder = JavaModuleDescriptor.newModule(descriptor.name());
+
+ for (ModuleDescriptor.Requires requires : descriptor.requires()) {
+ if (requires.modifiers().contains(ModuleDescriptor.Requires.Modifier.STATIC)
+ || requires.modifiers().contains(ModuleDescriptor.Requires.Modifier.TRANSITIVE)) {
Set
* The result is a properties-file written ot the StdOut, having the jar path as key and the module name as value.
* Any exception is written to the StdErr.
- *
Build automatically option,
- * otherwise it'll continually rebuild the project, causing compilations or tests to fail.
- *
+ * NOTE Eclipse users must disable the Build automatically option,
+ * otherwise it'll continually rebuild the project, causing compilations or tests to fail.
+ *
* @author Robert Scholte
*/
-@RunWith( org.mockito.junit.MockitoJUnitRunner.class )
-public class LocationManagerIT
-{
+@DisabledOnJre(value = JRE.JAVA_8, disabledReason = "Requires Java 9+ Module System")
+@ExtendWith(MockitoExtension.class)
+class LocationManagerIT {
@Mock
private BinaryModuleInfoParser asmParser;
@@ -54,84 +52,74 @@ public class LocationManagerIT
private SourceModuleInfoParser qdoxParser;
private LocationManager locationManager;
-
- final Path mockModuleInfoJava = Paths.get( "src/test/resources/mock/module-info.java");
-
- @BeforeClass
- public static void assume()
- {
- assumeThat( "Requires at least Java 9", System.getProperty( "java.version" ), not( startsWith( "1." ) ) );
- }
-
- @Before
- public void onSetup()
- {
- locationManager = new LocationManager( qdoxParser )
- {
+
+ final Path mockModuleInfoJava = Paths.get("src/test/test-data/mock/module-info.java");
+
+ @BeforeEach
+ void onSetup() {
+ locationManager = new LocationManager(qdoxParser) {
@Override
- ModuleInfoParser getBinaryModuleInfoParser( Path jdkHome )
- {
+ ModuleInfoParser getBinaryModuleInfoParser(Path jdkHome) {
return asmParser;
}
};
}
-
+
@Test
- public void testManifestWithoutReflectRequires() throws Exception
- {
- Path abc = Paths.get( "src/test/resources/manifest.without/out" );
- JavaModuleDescriptor descriptor = JavaModuleDescriptor.newModule( "base" ).requires( "any" ).build();
- when( qdoxParser.fromSourcePath( any( Path.class ) ) ).thenReturn( descriptor );
- ResolvePathsRequest