Updating mockio and adding NPE checks

Author: grafnu

pubber/build.gradle

@@ -122,5 +122,5 @@ dependencies {
     implementation 'org.slf4j:slf4j-simple:1.7.30'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.64'
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
+    testImplementation 'org.mockito:mockito-core:5.3.1'
 }

udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java

@@ -261,6 +261,7 @@ private CloudModel bindDevicesToGateway(String registryId, String gatewayId,
 
   private void checkBoundState(String registryId, String gatewayId, Set<String> deviceIds,
       Consumer<String> progress) {
+    requireNonNull(progress, "checkBoundState has null progress");
     CloudModel cloudModel = listRegistryDevices(registryId, gatewayId, progress);
     List<String> proxyIds = cloudModel.gateway.proxy_ids;
     progress.accept(format("Found %d devices bound to gateway %s.", proxyIds.size(), gatewayId));
@@ -422,6 +423,7 @@ private HashMap<String, CloudModel> fetchDevices(String deviceRegistryId, String
 
   private HashMap<String, CloudModel> fetchDevices(String deviceRegistryId,
       Consumer<String> progress, GatewayListOptions gatewayListOptions) {
+    requireNonNull(progress, "fetchDevices has null progress");
     String location = getRegistryLocation(deviceRegistryId);
     String registryFullName =
         RegistryName.of(projectId, location, deviceRegistryId).getRegistryFullName();
@@ -553,6 +555,7 @@ private CloudModel listRegistryDevices(String registryId, String gatewayId,
 
   private Map<String, CloudModel> augmentGatewayModels(String registryId,
       HashMap<String, CloudModel> boundDevices, Consumer<String> progress) {
+    requireNonNull(progress, "augmentGatewayModels has null progress");
     HashMap<String, String> proxyDeviceGateways = new HashMap<>();
     Set<Entry<String, CloudModel>> gateways =
         boundDevices.entrySet().stream().filter(this::isGateway).collect(Collectors.toSet());
@@ -741,6 +744,7 @@ private CloudModel unbindAndDeleteCore(String registryId, Device device, Set<Str
 
   private void bindDevicesGateways(String registryId, Set<String> gatewayIds,
       Set<String> deviceIds, boolean toBind, Consumer<String> progress) {
+    requireNonNull(progress, "bindDevicesGateways has null progress");
     String opCode = toBind ? "Binding" : "Unbinding";
     info("%s %s: gateways %s devices %s", opCode, registryId, gatewayIds, deviceIds);
     AtomicInteger opCount = new AtomicInteger(0);