[MSHADE-364] drop duplicates handled by a transformer #48
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elharo
reviewed
May 12, 2020
| @@ -256,6 +256,10 @@ else if ( shadeRequest.isShadeSourcesContent() && name.endsWith( ".java" ) ) | |||
|
|
|||
| addResource( resources, jos, mappedName, entry.getTime(), in ); | |||
| } | |||
| else | |||
| { | |||
| duplicates.remove( name, jar ); | |||
There was a problem hiding this comment.
Could there be a test for this?
There was a problem hiding this comment.
elharo
reviewed
May 12, 2020
| "We have a duplicate META-INF/MANIFEST.MF in src/test/jars/plexus-utils-1.4.1.jar" )); | ||
| } | ||
|
|
||
| public void testOverlappingResourcesAreLoggedExceptATransformerHandlesIt() throws Exception { | ||
| final TemporaryFolder temporaryFolder = new TemporaryFolder(); |
There was a problem hiding this comment.
IMHO not necessary to mark local variables final
| } | ||
|
|
||
| @Override | ||
| public void debug( final String s, final Throwable throwable ) |
There was a problem hiding this comment.
don't need to mark arguments final
| private final List<String> debugMessages = new ArrayList<>(); | ||
| private final List<String> warnMessages = new ArrayList<>(); | ||
|
|
||
| public MockLogger() |
There was a problem hiding this comment.
doesn't need to be public as it's in a private class
|
|
||
| temporaryFolder.delete(); | ||
|
|
||
| assertTrue(logWithTransformer.warnMessages.toString(), logWithTransformer.warnMessages.isEmpty()); |
There was a problem hiding this comment.
Is the purpose of this PR to add another warning to the log?
|
|
||
| assertTrue(logWithTransformer.warnMessages.toString(), logWithTransformer.warnMessages.isEmpty()); | ||
| assertTrue(logWithoutTransformer.warnMessages.toString(), logWithoutTransformer.warnMessages.containsAll( | ||
| Arrays.<String>asList( "j1.jar, j2.jar define 1 overlapping resources:", "- foo.txt" ) ) ); |
There was a problem hiding this comment.
resources --> resource when it's singular
|
CI is blue/green, any blocker to merge? |
michael-o
requested changes
May 13, 2020
| overlaps.add( "classes" ); | ||
| if ( resources.size() == 1 ) | ||
| { | ||
| overlaps.add( "classe" ); |
There was a problem hiding this comment.
I'd say french typo ;). Thanks for the catch, should be fixed now
…dled by a transformer
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a transformer handles a resource then the resource being duplicated is ok since the transformer will merge it so no need to log it (in particular as a warning).
Following this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MSHADE-XXX] - Fixes bug in ApproximateQuantiles,where you replace
MSHADE-XXXwith the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the
commit message.
mvn clean verifyto make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
mvn -Prun-its clean verify).