From fc6c8f09fbd017f11100e72cdb674ee104e7c748 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Tue, 5 May 2020 15:48:11 +0200 Subject: [PATCH] replace inventory Preconditions by requireNonNull as advised by SpotBugs JIRA: TRNSPRTPCE-207 TRNSPRTPCE-241 TRNSPRTPCE-265 Signed-off-by: guillaume.lambert Change-Id: I2c2875d6ef1ab319a6f38f48bdc6f683ac9a4149 --- .../org/opendaylight/transportpce/inventory/INode121.java | 8 +++----- .../org/opendaylight/transportpce/inventory/INode221.java | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java index 5ba9a938f..9d7aa6423 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode121.java @@ -8,11 +8,11 @@ package org.opendaylight.transportpce.inventory; +import static java.util.Objects.requireNonNull; import static org.opendaylight.transportpce.inventory.utils.StringUtils.getCurrentTimestamp; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareDashString; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; -import com.google.common.base.Preconditions; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -184,8 +184,7 @@ public class INode121 { Timeouts.DEVICE_READ_TIMEOUT_UNIT); LOG.info("Shelves size {}", deviceObject.get().getShelves().size()); - try (Connection connection = dataSource.getConnection()) { - Preconditions.checkNotNull(connection); + try (Connection connection = requireNonNull(dataSource.getConnection())) { for (int i = 0; i < deviceObject.get().getShelves().size(); i++) { Shelves shelve = deviceObject.get().getShelves().get(i); String shelfName = shelve.getShelfName(); @@ -216,8 +215,7 @@ public class INode121 { } LOG.info("Circuit pack size {}", deviceObject.get().getCircuitPacks().size()); - try (Connection connection = dataSource.getConnection()) { - Preconditions.checkNotNull(connection); + try (Connection connection = requireNonNull(dataSource.getConnection())) { for (int i = 0; i < deviceObject.get().getCircuitPacks().size(); i++) { CircuitPacks cp = deviceObject.get().getCircuitPacks().get(i); diff --git a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java index e394860a1..e22cbd404 100644 --- a/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java +++ b/inventory/src/main/java/org/opendaylight/transportpce/inventory/INode221.java @@ -7,11 +7,11 @@ */ package org.opendaylight.transportpce.inventory; +import static java.util.Objects.requireNonNull; import static org.opendaylight.transportpce.inventory.utils.StringUtils.getCurrentTimestamp; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareDashString; import static org.opendaylight.transportpce.inventory.utils.StringUtils.prepareEmptyString; -import com.google.common.base.Preconditions; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -184,8 +184,7 @@ public class INode221 { Timeouts.DEVICE_READ_TIMEOUT_UNIT); LOG.info("Shelves size {}", deviceObject.get().getShelves().size()); - try (Connection connection = dataSource.getConnection()) { - Preconditions.checkNotNull(connection); + try (Connection connection = requireNonNull(dataSource.getConnection())) { for (int i = 0; i < deviceObject.get().getShelves().size(); i++) { Shelves shelve = deviceObject.get().getShelves().get(i); String shelfName = shelve.getShelfName(); @@ -217,8 +216,7 @@ public class INode221 { } LOG.info("Circuit pack size {}", deviceObject.get().getCircuitPacks().size()); - try (Connection connection = dataSource.getConnection()) { - Preconditions.checkNotNull(connection); + try (Connection connection = requireNonNull(dataSource.getConnection())) { for (int i = 0; i < deviceObject.get().getCircuitPacks().size(); i++) { CircuitPacks cp = deviceObject.get().getCircuitPacks().get(i); -- 2.36.6