[MSHARED-1224] Prefer JDK classes to Plexus utils #81
Conversation
| if ( !directory.isDirectory() ) | ||
|
|
||
| List<Path> classFiles = Files.walk( directory.toPath() ) | ||
| .filter( path -> path.toFile().getName().endsWith( ".class" ) ) |
There was a problem hiding this comment.
Why not #getFileName()#toString()?
There was a problem hiding this comment.
Six of one, half dozen of another. I looked at that and saw that getFileName returned a Path instead of a String, which seemed wrong to me. But if you prefer I can change this.
There was a problem hiding this comment.
Let's make consistently use NIO2.
There was a problem hiding this comment.
might have to revert that. It seems to break the integration tests on Windows in a way that indicates a real issue.
src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
Outdated
Show resolved
Hide resolved
This reverts commit 82dddaf.
|
Trickier than I thought. The problem is that jars on Windows still use forward slash but directories use backslash. |
| @@ -99,7 +97,8 @@ private static void acceptJar( URL url, ClassFileVisitor visitor ) | |||
| // ignore files like package-info.class and module-info.class | |||
| if ( name.endsWith( ".class" ) && name.indexOf( '-' ) == -1 ) | |||
| { | |||
| visitClass( name, in, visitor ); | |||
| // Even on Windows Jars use / as the separator character | |||
There was a problem hiding this comment.
The comment is redundant and wrong because this has nothing to do with Windows. REad the PKZIP implementation note: separators are always foward slashes regarding of the OS.
There was a problem hiding this comment.
Yes, that's the point. The previous version was using the system dependent line separator, which was why the test was failing on Windows but not Linux.
slawekjaranowski
changed the title
src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
Show resolved
Hide resolved
This completely removes Plexus utils from this package.