Skip to content

Commit 6aeba7d

Browse files
committed
build: enable ErrorProne during code compilation.
See https://errorprone.info Fix #971
1 parent a9ebbc4 commit 6aeba7d

File tree

3 files changed

+54
-3
lines changed

3 files changed

+54
-3
lines changed

pom.xml

+51
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,8 @@
493493

494494
<dockerfile.plugin.version>1.4.6</dockerfile.plugin.version>
495495
<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
496+
<error-prone-javac.version>9+181-r4173-1</error-prone-javac.version>
497+
<error-prone.version>2.3.2</error-prone.version>
496498
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
497499
<fest.assert.version>2.0M8</fest.assert.version>
498500
<findbugs.excludeFilterFile>src/main/config/findbugs-filter.xml</findbugs.excludeFilterFile>
@@ -781,6 +783,29 @@
781783
<failOnWarning>true</failOnWarning>
782784
<!-- Required for using method's parameters inside of @PreAuthorize expressions -->
783785
<parameters>true</parameters>
786+
<!-- Required for ErrorProne -->
787+
<!-- @todo #971 Document ErrorProne tool -->
788+
<compilerArgs>
789+
<compilerArg>-XDcompilePolicy=simple</compilerArg>
790+
<!--
791+
The following checks have been disabled:
792+
- MissingOverride: produce false positives with @Getter from Lombok
793+
- ParameterName: workaround for https://github.com/google/error-prone/issues/780
794+
-->
795+
<compilerArg>-Xplugin:ErrorProne -Xep:MissingOverride:OFF -Xep:ParameterName:OFF</compilerArg>
796+
</compilerArgs>
797+
<annotationProcessorPaths>
798+
<path>
799+
<groupId>com.google.errorprone</groupId>
800+
<artifactId>error_prone_core</artifactId>
801+
<version>${error-prone.version}</version>
802+
</path>
803+
<path>
804+
<groupId>org.projectlombok</groupId>
805+
<artifactId>lombok</artifactId>
806+
<version>${lombok.version}</version>
807+
</path>
808+
</annotationProcessorPaths>
784809
</configuration>
785810
</plugin>
786811

@@ -1189,4 +1214,30 @@
11891214
<url>https://github.com/php-coder/mystamps</url>
11901215
</scm>
11911216

1217+
<profiles>
1218+
<profile>
1219+
<id>jdk8</id>
1220+
<activation>
1221+
<jdk>1.8</jdk>
1222+
</activation>
1223+
<build>
1224+
<plugins>
1225+
<!-- Required for ErrorProne -->
1226+
<plugin>
1227+
<groupId>org.apache.maven.plugins</groupId>
1228+
<artifactId>maven-compiler-plugin</artifactId>
1229+
<configuration>
1230+
<fork>true</fork>
1231+
<compilerArgs combine.children="append">
1232+
<compilerArg>
1233+
-J-Xbootclasspath/p:${settings.localRepository}/com/google/errorprone/javac/${error-prone-javac.version}/javac-${error-prone-javac.version}.jar
1234+
</compilerArg>
1235+
</compilerArgs>
1236+
</configuration>
1237+
</plugin>
1238+
</plugins>
1239+
</build>
1240+
</profile>
1241+
</profiles>
1242+
11921243
</project>

src/main/java/ru/mystamps/web/feature/series/SeriesController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ private static boolean isAllowedToAddingImages(SeriesDto series) {
680680

681681
private static boolean isUserCanAddImagesToSeries(SeriesDto series) {
682682
return isAdmin()
683-
|| isOwner(series) && isAllowedToAddingImages(series);
683+
|| (isOwner(series) && isAllowedToAddingImages(series));
684684
}
685685

686686
private static boolean isAdmin() {

src/main/java/ru/mystamps/web/support/spring/security/CustomUserDetailsService.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
*/
1818
package ru.mystamps.web.support.spring.security;
1919

20+
import java.util.ArrayList;
2021
import java.util.Collection;
21-
import java.util.LinkedList;
2222
import java.util.List;
2323

2424
import org.apache.commons.lang3.Validate;
@@ -68,7 +68,7 @@ public org.springframework.security.core.userdetails.UserDetails loadUserByUsern
6868

6969
private static Collection<? extends GrantedAuthority> getAuthorities(UserDetails userDetails) {
7070
// Constants sorted in an ascending order.
71-
List<GrantedAuthority> authorities = new LinkedList<>();
71+
List<GrantedAuthority> authorities = new ArrayList<>();
7272
authorities.add(Authority.CREATE_CATEGORY);
7373
authorities.add(Authority.CREATE_COUNTRY);
7474
authorities.add(Authority.CREATE_SERIES);

0 commit comments

Comments
 (0)