Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix checkstyle issues on master

Browse Source 
Fix checkstyle issues following 2.0.x merge and
spring-javaformat upgrade.

See gh-13932
This commit is contained in:
Phillip Webb
2018-07-27 23:58:57 +01:00
parent a6c9c92f2e
commit ce9c053cbf
11 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/EnvVariables.java
View File

@@ -49,7 +49,7 @@ class EnvVariables {
}
private static String getValue(String value) {
return (value != null ? value : "");
return (value != null) ? value : "";
}
public Map<String, String> asMap() {

6
spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java
View File

@@ -236,7 +236,7 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
*/
private Artifact getSourceArtifact() {
Artifact sourceArtifact = getArtifact(this.classifier);
return (sourceArtifact != null ? sourceArtifact : this.project.getArtifact());
return (sourceArtifact != null) ? sourceArtifact : this.project.getArtifact();
}
private Artifact getArtifact(String classifier) {
@@ -345,8 +345,8 @@ public class RepackageMojo extends AbstractDependencyFilterMojo {
this.classifier, target);
}
else {
String artifactId = (this.classifier != null
? "artifact with classifier " + this.classifier : "main artifact");
String artifactId = (this.classifier != null)
? "artifact with classifier " + this.classifier : "main artifact";
getLog().info(String.format("Replacing %s %s", artifactId, source.getFile()));
source.setFile(target);
}