Added a sourcesPaths array tag that will add multiple Sources to the … #43
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
…Cobertura ArgumentBuilder.
E.g.
<sourcesPaths>
<scourcesPath>${project.basedir}/src/main/groovy/</scourcesPath>
<scourcesPath>${project.basedir}/src/main/java/</scourcesPath>
</sourcesPaths>
Adds support for both groovy files and java files in a GMavenPlus Plugin default layout.
added 5 commits
May 22, 2017 15:29
This isn't wired into the runtime of the project yet but the problem we have is Cobertura doesn't reference the original sources directory for multiple source sets in it's XML output. That being said, in the ProjectData model object we get the filename in the form "my/package/MyClass.java" from the ClassData.getSourceFileName() which we can use as the basis for testing all sourcesPaths to see if in which one a given file exists. With that then we can generate a proper Sonarqube XML representation by just rendering out the JAXB objects to the sonarqube xml output file.
Created the CoberturaToSonarQubeReportConverter abstraction to provide a seam for using the XSL way of transformation in addition to the Jaxb way of transformation
…nverter Just put in a hardcoded version of JaxbCoberturaToSonarQubeReportConverter to test that it will work within what exists in the existing plugin flows
The XSD wasn't strictly correct as there was a cardinality mismatch between CoverateType and FileType, ti needed to be 1 to many, not 1 to 1 Just beginning implementaiton of the JaxbCoberturaToSonarQubeReportConverter
Now the Sonar report generation is covered for supporting multiple sourcesPaths, it also works with a single sourcesPath as well to not break backwards compatibility. There is still current a way to go back to the XSL transformation but that will for sure generate some nonsense in the multiple sourcesPaths case and should be removed before merging into master
|
@pawlakm, so this is functionally complete w/support for the sonar xml file generation with both a single sourcesPath and the new array sourcesPaths. Take a look when you have a chance. Also, there is a test harness artifact in there that should be removed but figured I'd leave it for you to be able to easily switch from the old XSL transformation to the JAXB transformation logic. //TODO remove this before merging, it's just for testing purposes in case
@Parameter(defaultValue = "false", required = false)
private boolean useXslTransform; |
pfrank13
commented
May 24, 2017
| @@ -75,6 +78,12 @@ public void convertReport( | |||
| final String[] sourcesPaths, | |||
| final String projectPath) throws MojoExecutionException { | |||
| try { | |||
| //There is no real lookup but the project doesn't have Tuple or KeyValuePair | |||
There was a problem hiding this comment.
Small smell here, using in a Map in not a very map like way, e.g. I only iterate over the EntrySet and don't do any get('key').
pfrank13
commented
May 24, 2017
| if(fileToCheck.exists()){ | ||
| return sonarSourcesPathPrefixEntry.getValue(); | ||
| }else { | ||
| //Should we even bother defaulting? |
There was a problem hiding this comment.
The entire defaulting thing here can potentially be removed and just returning a default "" and just know that the file name is not going to resolve because we don't know what it is.
|
Just pinging to see if there is anything i can do to help this be accepted. |
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.
…Cobertura ArgumentBuilder.
E.g.
${project.basedir}/src/main/groovy/
${project.basedir}/src/main/java/
Adds support for both groovy files and java files in a GMavenPlus Plugin default layout.