From 1afa13c23ae2322d74b805fd00000825ac7581c0 Mon Sep 17 00:00:00 2001 From: Nicolas Payette Date: Mon, 11 Nov 2024 16:21:06 +0000 Subject: [PATCH] further appease SpotBugs --- .../destination/ChooseRandomDestinationBehaviour.java | 2 ++ .../uk/ac/ox/poseidon/biology/biomass/BiomassDiffuser.java | 6 +++--- core/src/main/java/uk/ac/ox/poseidon/core/Scenario.java | 2 +- .../main/java/uk/ac/ox/poseidon/examples/BasicScenario.java | 2 +- .../java/uk/ac/ox/poseidon/geography/grids/DoubleGrid.java | 2 ++ .../uk/ac/ox/poseidon/geography/ports/DefaultPortGrid.java | 2 ++ .../poseidon/gui/portrayals/PortGridPortrayalFactory.java | 2 +- io/src/main/java/uk/ac/ox/poseidon/io/ScenarioLoader.java | 2 ++ io/src/main/java/uk/ac/ox/poseidon/io/ScenarioWriter.java | 2 ++ 9 files changed, 16 insertions(+), 6 deletions(-) diff --git a/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ChooseRandomDestinationBehaviour.java b/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ChooseRandomDestinationBehaviour.java index f2103df3f..1e2384754 100644 --- a/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ChooseRandomDestinationBehaviour.java +++ b/agents/src/main/java/uk/ac/ox/poseidon/agents/behaviours/destination/ChooseRandomDestinationBehaviour.java @@ -21,6 +21,7 @@ import com.google.common.collect.ImmutableList; import ec.util.MersenneTwisterFast; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import sim.util.Int2D; import uk.ac.ox.poseidon.agents.behaviours.travel.TravelBehaviour; import uk.ac.ox.poseidon.agents.vessels.Vessel; @@ -34,6 +35,7 @@ public class ChooseRandomDestinationBehaviour extends DestinationBehaviour { private final ImmutableList possibleDestinations; private final MersenneTwisterFast rng; + @SuppressFBWarnings("EI_EXPOSE_REP2") public ChooseRandomDestinationBehaviour( final TravelBehaviour travelBehaviour, final List possibleDestinations, diff --git a/biology/src/main/java/uk/ac/ox/poseidon/biology/biomass/BiomassDiffuser.java b/biology/src/main/java/uk/ac/ox/poseidon/biology/biomass/BiomassDiffuser.java index d2ff441fa..6588ee477 100644 --- a/biology/src/main/java/uk/ac/ox/poseidon/biology/biomass/BiomassDiffuser.java +++ b/biology/src/main/java/uk/ac/ox/poseidon/biology/biomass/BiomassDiffuser.java @@ -38,13 +38,13 @@ public class BiomassDiffuser implements Steppable { @Serial private static final long serialVersionUID = 6904676724631409234L; - private final BiomassGrid biomassGrid; + private final transient BiomassGrid biomassGrid; - private final CarryingCapacityGrid carryingCapacityGrid; + private final transient CarryingCapacityGrid carryingCapacityGrid; private final Random rng; - private final BiomassDiffusionRule biomassDiffusionRule; + private final transient BiomassDiffusionRule biomassDiffusionRule; private final List habitableLocations; diff --git a/core/src/main/java/uk/ac/ox/poseidon/core/Scenario.java b/core/src/main/java/uk/ac/ox/poseidon/core/Scenario.java index bc17a861c..e5f98712a 100644 --- a/core/src/main/java/uk/ac/ox/poseidon/core/Scenario.java +++ b/core/src/main/java/uk/ac/ox/poseidon/core/Scenario.java @@ -38,7 +38,7 @@ @NoArgsConstructor public class Scenario { - private Factory startingDateTime = new DateFactory(); + protected Factory startingDateTime = new DateFactory(); public Scenario(final Factory startingDateTime) { this.startingDateTime = startingDateTime; diff --git a/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenario.java b/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenario.java index 90fbfeb65..79d5df492 100644 --- a/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenario.java +++ b/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenario.java @@ -136,7 +136,7 @@ public class BasicScenario extends Scenario { private Factory scheduledProcesses = new ScheduledRepeatingFactory<>( new DateTimeAfterFactory( - getStartingDateTime(), + startingDateTime, new PeriodFactory(0, 1, 0) ), new PeriodFactory(0, 1, 0), diff --git a/geography/src/main/java/uk/ac/ox/poseidon/geography/grids/DoubleGrid.java b/geography/src/main/java/uk/ac/ox/poseidon/geography/grids/DoubleGrid.java index ec7bd7013..f75c9d0cc 100644 --- a/geography/src/main/java/uk/ac/ox/poseidon/geography/grids/DoubleGrid.java +++ b/geography/src/main/java/uk/ac/ox/poseidon/geography/grids/DoubleGrid.java @@ -20,6 +20,7 @@ package uk.ac.ox.poseidon.geography.grids; import com.vividsolutions.jts.geom.Envelope; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import sim.field.grid.DoubleGrid2D; import sim.util.Int2D; @@ -69,6 +70,7 @@ public DoubleGrid( this(gridExtent, new DoubleGrid2D(values)); } + @SuppressFBWarnings("EI_EXPOSE_REP2") public DoubleGrid( final GridExtent gridExtent, final DoubleGrid2D grid diff --git a/geography/src/main/java/uk/ac/ox/poseidon/geography/ports/DefaultPortGrid.java b/geography/src/main/java/uk/ac/ox/poseidon/geography/ports/DefaultPortGrid.java index a58b8af9e..5831170a2 100644 --- a/geography/src/main/java/uk/ac/ox/poseidon/geography/ports/DefaultPortGrid.java +++ b/geography/src/main/java/uk/ac/ox/poseidon/geography/ports/DefaultPortGrid.java @@ -20,6 +20,7 @@ package uk.ac.ox.poseidon.geography.ports; import com.vividsolutions.jts.geom.Coordinate; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import sim.field.grid.SparseGrid2D; import sim.util.Int2D; import uk.ac.ox.poseidon.core.MasonUtils; @@ -36,6 +37,7 @@ public class DefaultPortGrid extends AbstractGrid implements PortG private final SparseGrid2D sparseGrid2D; + @SuppressFBWarnings("EI_EXPOSE_REP2") public DefaultPortGrid( final BathymetricGrid bathymetricGrid, final SparseGrid2D sparseGrid2D diff --git a/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/PortGridPortrayalFactory.java b/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/PortGridPortrayalFactory.java index e0b7586f4..12958a325 100644 --- a/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/PortGridPortrayalFactory.java +++ b/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/PortGridPortrayalFactory.java @@ -33,7 +33,7 @@ @Setter @AllArgsConstructor @NoArgsConstructor -public class PortGridPortrayalFactory extends SimulationScopeFactory { +public final class PortGridPortrayalFactory extends SimulationScopeFactory { private Factory portGrid; diff --git a/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioLoader.java b/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioLoader.java index 078978b07..58287de66 100644 --- a/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioLoader.java +++ b/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioLoader.java @@ -19,6 +19,7 @@ package uk.ac.ox.poseidon.io; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.yaml.snakeyaml.Yaml; import uk.ac.ox.poseidon.core.Scenario; @@ -46,6 +47,7 @@ public ScenarioLoader() { * * @param yaml the {@code Yaml} instance to use for loading scenarios */ + @SuppressFBWarnings("EI_EXPOSE_REP2") public ScenarioLoader(final Yaml yaml) { this.yaml = yaml; } diff --git a/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioWriter.java b/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioWriter.java index dbd25e155..edfc528e8 100644 --- a/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioWriter.java +++ b/io/src/main/java/uk/ac/ox/poseidon/io/ScenarioWriter.java @@ -19,6 +19,7 @@ package uk.ac.ox.poseidon.io; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import uk.ac.ox.poseidon.core.Scenario; @@ -35,6 +36,7 @@ public ScenarioWriter() { this(new Yaml(defaultDumperOptions())); } + @SuppressFBWarnings("EI_EXPOSE_REP2") public ScenarioWriter(final Yaml yaml) { this.yaml = yaml; }