Skip to content

Commit 4fbee30

Browse files
Fixed SpotBugs issues
1 parent 1880ae7 commit 4fbee30

6 files changed

Lines changed: 22 additions & 6 deletions

File tree

build-logic/src/main/java/org/ehcache/build/conventions/CheckstyleConvention.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,22 @@ public void apply(Project project) {
1919
properties.put("projectDir", project.getProjectDir());
2020
properties.put("rootDir", project.getRootDir());
2121
});
22+
23+
project.getConfigurations().named("checkstyle", config -> {
24+
config.getResolutionStrategy().dependencySubstitution(subs -> {
25+
subs.substitute(subs.module("org.codehaus.plexus:plexus-utils:3.1.1"))
26+
.using(subs.module("org.codehaus.plexus:plexus-utils:3.3.0"))
27+
.because("Checkstyle 10.18.1 pulls mismatched plexus-utils versions");
28+
subs.substitute(subs.module("org.apache.commons:commons-lang3:3.7"))
29+
.using(subs.module("org.apache.commons:commons-lang3:3.8.1"))
30+
.because("Checkstyle transitives mix commons-lang3 versions");
31+
subs.substitute(subs.module("org.apache.httpcomponents:httpcore:4.4.13"))
32+
.using(subs.module("org.apache.httpcomponents:httpcore:4.4.14"))
33+
.because("Align httpcore to latest bugfix release");
34+
subs.substitute(subs.module("commons-codec:commons-codec:1.11"))
35+
.using(subs.module("commons-codec:commons-codec:1.15"))
36+
.because("Checkstyle transitive dependencies depend on different commons-codec versions");
37+
});
38+
});
2239
}
2340
}

build-logic/src/main/java/org/ehcache/build/conventions/SpotbugsConvention.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public void apply(Project project) {
1818

1919
spotbugs.getIgnoreFailures().set(false);
2020
spotbugs.getToolVersion().set("4.9.8");
21+
spotbugs.getOmitVisitors().addAll("FindReturnRef", "ConstructorThrow");
2122

2223
project.getPlugins().withType(JavaBasePlugin.class).configureEach(plugin -> {
2324

clustered/ehcache-common-api/src/main/java/org/ehcache/clustered/common/internal/store/ValueWrapper.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
/**
2626
* ValueWrapper
2727
*/
28-
@SuppressFBWarnings("EI_EXPOSE_REP")
2928
public class ValueWrapper implements Serializable {
3029

3130
private static final long serialVersionUID = -4794738044295644587L;

ehcache-impl/src/main/java/org/ehcache/config/builders/UserManagedCacheBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public class UserManagedCacheBuilder<K, V, T extends UserManagedCache<K, V>> imp
121121
private boolean useValueSerializingCopier;
122122
private Serializer<K> keySerializer;
123123
private Serializer<V> valueSerializer;
124-
private int dispatcherConcurrency = 4;
124+
private volatile int dispatcherConcurrency = 4;
125125
private List<CacheEventListenerConfiguration<?>> eventListenerConfigurations = new ArrayList<>();
126126
private ExecutorService unOrderedExecutor;
127127
private ExecutorService orderedExecutor;

ehcache-impl/src/main/java/org/ehcache/impl/internal/store/tiering/TieredStore.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,10 @@ private void swapCachingTiers() {
222222
}
223223

224224
private void swapBackCachingTiers() {
225-
if(!cachingTierRef.compareAndSet(noopCachingTier, realCachingTier)) {
226-
throw new AssertionError("Something bad happened");
227-
}
228225
synchronized (noopCachingTier) {
226+
if(!cachingTierRef.compareAndSet(noopCachingTier, realCachingTier)) {
227+
throw new AssertionError("Something bad happened");
228+
}
229229
noopCachingTier.notify();
230230
}
231231
}

ehcache-impl/src/main/java/org/ehcache/impl/persistence/FileUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ static boolean tryRecursiveDelete(File file) {
110110
}
111111
}
112112

113-
@SuppressFBWarnings("DM_GC")
114113
private static void gc() {
115114
System.gc();
116115
System.runFinalization();

0 commit comments

Comments
 (0)