[MSHADE-307] defaults for transformers and filters #12
Conversation
|
What about adding some description about new default in this page ? |
|
@rfscholte please take a look |
|
@rmannibucau tests are failing on Jenkins |
|
Another path separator issue :(, fixed hopefully |
| private List<ResourceTransformer> getDefaultResourceTransformers() | ||
| { | ||
| final List<ResourceTransformer> transformers = new LinkedList<>(); | ||
| if ( missTransformer( ServicesResourceTransformer.class ) ) |
There was a problem hiding this comment.
getDefaultResourceTransformers() is only called when transformers is null, so no need for missTransformer()-call
| getMatchingJars( artifacts , new ArtifactId( "*:*" ) ), | ||
| Collections.<String>emptySet(), | ||
| new HashSet<>( Arrays.asList( "META-INF/*.SF", "META-INF/*.DSA", "META-INF/*.RSA" ) ) ) ); | ||
| } | ||
|
|
||
| filters.addAll( simpleFilters ); |
There was a problem hiding this comment.
I would expect a NPE here with the default filters.
There was a problem hiding this comment.
not sure i'm following, this is not this.filters but the list created in the method
| @@ -822,6 +831,16 @@ private File resolveArtifactSources( Artifact artifact ) | |||
| simpleFilters.add( new SimpleFilter( jars, filter.getIncludes(), filter.getExcludes() ) ); | |||
| } | |||
| } | |||
| else if ( this.filters == null ) | |||
| { | |||
| getLog().debug( "Adding META-INF/*.SF, META-INF/*.DSA and META-INF/*.RSA exclusions" ); | |||
There was a problem hiding this comment.
Please create a method getDefaultFilters()
| @@ -60,6 +64,50 @@ | |||
| public class ShadeMojoTest | |||
| extends PlexusTestCase | |||
| { | |||
| public void testDefaultConfiguration() throws Exception | |||
There was a problem hiding this comment.
Very creative with reflection, but I wonder if we are testing the right things. If it is too hard to verify it with a unittest, why not switch to an integration test?
There was a problem hiding this comment.
Thought about it but I found it saner as a compromise cause this is really more a whitebox test to check we mutate the user config as expected than an IT which would be more complicated with fewer guarantee on what we do at that level IMHO (here we really want to check the default config is setup and not smoke test it, at least was the intention)
|
Updated the PR, I think the test is more relevant for this particular case than an IT since we don't care how it runs but we care about what it runs, let me know if it is still an issue. |
|
Can depend on the SPI PR, could be replaced by a SPI module IMHO. |
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).If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.