Skip to content

Commit 4ff2c63

Browse files
committed
Remove @SuppressFBWarnings annotations and fix typo in package name
1 parent 2386be9 commit 4ff2c63

132 files changed

Lines changed: 246 additions & 215 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
freefairPluginsVersion = '1.0.0'
1212

1313
lombokVersion = '1.16.18'
14-
findbugsVersion = '3.0.1'
14+
jsr305Version = '3.0.2'
1515

1616
retrofitVersion = '2.3.0'
1717
okHttpVersion = '3.8.1'
@@ -24,7 +24,7 @@ buildscript {
2424
deps = [
2525
errorprone : "com.google.errorprone:error_prone_core:$errorproneVersion",
2626
lombok : "org.projectlombok:lombok:$lombokVersion",
27-
findbugs : "com.google.code.findbugs:annotations:$findbugsVersion",
27+
jsr305 : "com.google.code.findbugs:jsr305:$jsr305Version",
2828

2929
retrofit : "com.squareup.retrofit2:retrofit:$retrofitVersion",
3030
retrofitMoshi : "com.squareup.retrofit2:converter-moshi:$retrofitVersion",

library/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ dependencies {
2626
errorprone deps.errorprone
2727

2828
compileOnly deps.lombok
29-
compileOnly deps.findbugs
29+
compileOnly deps.jsr305
3030

3131
api deps.retrofit
3232
api deps.retrofitMoshi
3333
api deps.okHttp
3434
api deps.moshi
3535

3636
testCompileOnly deps.lombok
37-
testCompileOnly deps.findbugs
37+
testCompileOnly deps.jsr305
3838

3939
testImplementation deps.junit
4040
testImplementation deps.assertj
@@ -120,9 +120,9 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
120120
from javadoc.destinationDir
121121
}
122122

123-
//compileJava {
124-
// options.compilerArgs << "-Werror"
125-
//}
123+
compileJava {
124+
options.compilerArgs << "-Werror"
125+
}
126126

127127
buildConfig {
128128
packageName = 'me.proxer.library'
@@ -147,6 +147,7 @@ jacocoTestReport {
147147

148148
findbugs {
149149
sourceSets = [sourceSets.main]
150+
excludeFilter = file('config/findbugs/findbugs-filter.xml')
150151
}
151152

152153
tasks.withType(FindBugs) {
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<FindBugsFilter>
3+
4+
<!-- Suppress internal exposal of Lombok constructors. -->
5+
<Match>
6+
<Package name="~me\.proxer\.library\.entity.*"/>
7+
<Method name="&lt;init&gt;"/>
8+
<Bug pattern="EI_EXPOSE_REP2"/>
9+
</Match>
10+
11+
<!-- Suppress internal exposal of Lombok getters returning Date. -->
12+
<Match>
13+
<Package name="~me\.proxer\.library\.entity.*"/>
14+
<Method returns="java.util.Date"/>
15+
<Bug pattern="EI_EXPOSE_REP"/>
16+
</Match>
17+
18+
<!-- Suppress Lombok generated equals and hashcode methods. -->
19+
<Match>
20+
<Or>
21+
<Package name="~me\.proxer\.library\.entity.*"/>
22+
<Class name="me.proxer.library.api.ProxerResponse"/>
23+
</Or>
24+
<Or>
25+
<Method name="equals" returns="boolean" params="java.lang.Object"/>
26+
<Method name="hashCode" returns="int" params=""/>
27+
</Or>
28+
<Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
29+
</Match>
30+
31+
</FindBugsFilter>

library/lombok.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
lombok.anyConstructor.suppressConstructorProperties = true
2-
lombok.extern.findbugs.addSuppressFBWarnings = true
32
lombok.addGeneratedAnnotation = false

library/src/main/java/me/proxer/library/api/ConferenceAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.squareup.moshi.Json;
55
import lombok.AccessLevel;
66
import lombok.Getter;
7-
import me.proxer.library.entitiy.messenger.Conference;
7+
import me.proxer.library.entity.messenger.Conference;
88

99
import java.util.Date;
1010

library/src/main/java/me/proxer/library/api/ConferenceInfoAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.squareup.moshi.FromJson;
44
import com.squareup.moshi.Json;
5-
import me.proxer.library.entitiy.messenger.ConferenceInfo;
6-
import me.proxer.library.entitiy.messenger.ConferenceParticipant;
5+
import me.proxer.library.entity.messenger.ConferenceInfo;
6+
import me.proxer.library.entity.messenger.ConferenceParticipant;
77

88
import java.util.Date;
99
import java.util.List;

library/src/main/java/me/proxer/library/api/EpisodeInfoAdapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import com.squareup.moshi.Json;
55
import com.squareup.moshi.ToJson;
66
import me.proxer.library.api.EpisodeInfoAdapter.IntermediateEpisodeInfo.IntermediateEpisode;
7-
import me.proxer.library.entitiy.info.AnimeEpisode;
8-
import me.proxer.library.entitiy.info.Episode;
9-
import me.proxer.library.entitiy.info.EpisodeInfo;
10-
import me.proxer.library.entitiy.info.MangaEpisode;
7+
import me.proxer.library.entity.info.AnimeEpisode;
8+
import me.proxer.library.entity.info.Episode;
9+
import me.proxer.library.entity.info.EpisodeInfo;
10+
import me.proxer.library.entity.info.MangaEpisode;
1111
import me.proxer.library.enums.Category;
1212
import me.proxer.library.enums.MediaLanguage;
1313

library/src/main/java/me/proxer/library/api/FixRatingDetailsAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.squareup.moshi.FromJson;
44
import com.squareup.moshi.JsonAdapter;
55
import com.squareup.moshi.Moshi;
6-
import me.proxer.library.entitiy.info.RatingDetails;
6+
import me.proxer.library.entity.info.RatingDetails;
77

88
import javax.annotation.Nullable;
99
import java.io.IOException;

library/src/main/java/me/proxer/library/api/NotificationAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.squareup.moshi.FromJson;
44
import com.squareup.moshi.Json;
5-
import me.proxer.library.entitiy.notifications.Notification;
5+
import me.proxer.library.entity.notifications.Notification;
66
import me.proxer.library.enums.NotificationType;
77
import me.proxer.library.util.ProxerUrls;
88
import okhttp3.HttpUrl;

library/src/main/java/me/proxer/library/api/NotificationInfoAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.squareup.moshi.FromJson;
44
import com.squareup.moshi.JsonDataException;
5-
import me.proxer.library.entitiy.notifications.NotificationInfo;
5+
import me.proxer.library.entity.notifications.NotificationInfo;
66

77
/**
88
* @author Ruben Gees

0 commit comments

Comments
 (0)