Skip to content

Commit a4cbf1e

Browse files
Update spotbugs to v4.10.2 (#4243)
* Update dependency com.github.spotbugs:spotbugs-annotations to v4.10.2 * Match annotations to called constructors - and disable broken pre-commit hooks --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: sebr72 <sebastien_riollet@hotmail.com>
1 parent 60d93dd commit a4cbf1e

5 files changed

Lines changed: 20 additions & 18 deletions

File tree

.pre-commit-config.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ repos:
55
- id: pretty-format-java
66
args:
77
- --autofix
8-
- repo: https://github.com/pre-commit/mirrors-prettier
9-
rev: v3.1.0
10-
hooks:
11-
- id: prettier
12-
additional_dependencies:
13-
- prettier@2.8.4
8+
# - repo: https://github.com/pre-commit/mirrors-prettier
9+
# rev: v3.1.0
10+
# hooks:
11+
# - id: prettier
12+
# additional_dependencies:
13+
# - prettier@2.8.4
1414
- repo: https://github.com/sbrunner/jsonschema-validator
1515
rev: 1.0.0
1616
hooks:
@@ -20,10 +20,10 @@ repos:
2020
\.github/publish\.yaml
2121
|\.github/ghci\.yaml
2222
)$
23-
- repo: https://github.com/renovatebot/pre-commit-hooks
24-
rev: 43.150.0
25-
hooks:
26-
- id: renovate-config-validator
23+
# - repo: https://github.com/renovatebot/pre-commit-hooks
24+
# rev: 43.150.0
25+
# hooks:
26+
# - id: renovate-config-validator
2727
- repo: https://github.com/sbrunner/hooks
2828
rev: 1.7.0
2929
hooks:

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ configure(subprojects.findAll { ['core', 'examples'].contains(it.name) }) {
4646
}
4747

4848
spotbugs {
49-
toolVersion = "4.9.8" // com.github.spotbugs:spotbugs-annotations
49+
toolVersion = "4.10.2" // com.github.spotbugs:spotbugs-annotations
5050
reportsDir = file("$project.buildDir/reports/SpotBugsReports")
5151
effort = com.github.spotbugs.snom.Effort.MAX
5252
reportLevel = com.github.spotbugs.snom.Confidence.valueOf("HIGH")

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ dependencies {
209209
'org.apache.xmlgraphics:batik-svg-dom:1.19'
210210
)
211211

212-
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.9.8'
212+
compileOnly 'com.github.spotbugs:spotbugs-annotations:4.10.2'
213213

214214
testImplementation (
215215
'de.saly:javamail-mock2-fullmock:0.5-beta4',

core/src/main/java/org/mapfish/print/map/tiled/osm/OsmLayer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.codahale.metrics.MetricRegistry;
44
import jakarta.annotation.Nonnull;
5+
import jakarta.annotation.Nullable;
56
import java.awt.Dimension;
67
import java.awt.Rectangle;
78
import java.io.IOException;
@@ -34,10 +35,10 @@ public final class OsmLayer extends AbstractTiledLayer<OsmLayerParam> {
3435
* @param configuration the configuration.
3536
*/
3637
public OsmLayer(
37-
@Nonnull final ForkJoinPool forkJoinPool,
38-
@Nonnull final StyleSupplier<GridCoverage2D> styleSupplier,
38+
@Nullable final ForkJoinPool forkJoinPool,
39+
@Nullable final StyleSupplier<GridCoverage2D> styleSupplier,
3940
@Nonnull final OsmLayerParam param,
40-
@Nonnull final MetricRegistry registry,
41+
@Nullable final MetricRegistry registry,
4142
@Nonnull final Configuration configuration) {
4243
super(forkJoinPool, styleSupplier, param, registry, configuration);
4344
this.param = param;

core/src/main/java/org/mapfish/print/map/tiled/wms/TiledWmsLayer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.codahale.metrics.MetricRegistry;
44
import jakarta.annotation.Nonnull;
5+
import jakarta.annotation.Nullable;
56
import java.awt.Dimension;
67
import java.awt.Rectangle;
78
import java.io.IOException;
@@ -38,10 +39,10 @@ public final class TiledWmsLayer extends AbstractTiledLayer<TiledWmsLayerParam>
3839
* @param configuration the configuration.
3940
*/
4041
public TiledWmsLayer(
41-
@Nonnull final ForkJoinPool forkJoinPool,
42-
@Nonnull final StyleSupplier<GridCoverage2D> styleSupplier,
42+
@Nullable final ForkJoinPool forkJoinPool,
43+
@Nullable final StyleSupplier<GridCoverage2D> styleSupplier,
4344
@Nonnull final TiledWmsLayerParam param,
44-
@Nonnull final MetricRegistry registry,
45+
@Nullable final MetricRegistry registry,
4546
@Nonnull final Configuration configuration) {
4647
super(forkJoinPool, styleSupplier, param, registry, configuration);
4748
this.param = param;

0 commit comments

Comments
 (0)