Streamline logging calls

Author: grafnu

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

@@ -409,20 +409,8 @@ private EventNotificationConfig eventNotificationConfig() {
     return EventNotificationConfig.newBuilder().setPubsubTopicName(topicName).build();
   }
 
-  private HashMap<String, CloudModel> fetchBoundGateways(String deviceRegistryId, String deviceId,
-      Consumer<String> progress) {
-    GatewayListOptions gatewayListOptions = ifNotNullGet(deviceId, this::getBoundGatewaysOptions);
-    return fetchDevices(deviceRegistryId, progress, gatewayListOptions);
-  }
-
-  private HashMap<String, CloudModel> fetchDevices(String deviceRegistryId, String gatewayId,
-      Consumer<String> progress) {
-    GatewayListOptions gatewayListOptions = ifNotNullGet(gatewayId, this::getBoundDevicesOptions);
-    return fetchDevices(deviceRegistryId, progress, gatewayListOptions);
-  }
-
   private HashMap<String, CloudModel> fetchDevices(String deviceRegistryId,
-      Consumer<String> progress, GatewayListOptions gatewayListOptions) {
+      Consumer<String> progress, boolean chattyProgress, GatewayListOptions gatewayListOptions) {
     requireNonNull(progress, "fetchDevices has null progress");
     String location = getRegistryLocation(deviceRegistryId);
     String registryFullName =
@@ -448,7 +436,8 @@ private HashMap<String, CloudModel> fetchDevices(String deviceRegistryId,
       collect.putAll(responseMap);
       pageToken = response.getNextPageToken();
       queryCount++;
-      progress.accept(getProgressMessage(collect, gatewayListOptions));
+      ifTrueThen(pageToken != null || chattyProgress,
+          () -> progress.accept(getProgressMessage(collect, gatewayListOptions)));
       debug(format("fetchDevices %s #%d found %d total %d more %s", deviceRegistryId,
           queryCount, responseMap.size(), collect.size(), pageToken != null));
     } while (pageToken != null);
@@ -479,7 +468,8 @@ private CloudModel findDevicesForGateway(String registryId, Device device) {
 
   private CloudModel findGatewaysForDevice(String registryId, Device device) {
     String deviceId = requireNonNull(device.toBuilder().getId(), "unspecified device id");
-    Set<String> boundGateways = fetchBoundGateways(registryId, deviceId, this::bitBucket).keySet();
+    Set<String> boundGateways = fetchDevices(registryId, this::bitBucket,
+        true, getBoundGatewaysOptions(deviceId)).keySet();
     if (boundGateways.isEmpty()) {
       throw new RuntimeException("Was expecting at least one bound gateway!");
     }
@@ -537,10 +527,16 @@ private String hashedDeviceId(String registryId, String deviceId) {
 
   private CloudModel listRegistryDevices(String registryId, String gatewayId,
       Consumer<String> maybeProgress) {
+    return listRegistryDevices(registryId, gatewayId, maybeProgress, true);
+  }
+
+  private CloudModel listRegistryDevices(String registryId, String gatewayId,
+      Consumer<String> maybeProgress, boolean chattyProgress) {
     try {
       CloudModel cloudModel = new CloudModel();
       Consumer<String> progress = ofNullable(maybeProgress).orElse(this::bitBucket);
-      HashMap<String, CloudModel> boundDevices = fetchDevices(registryId, gatewayId, progress);
+      GatewayListOptions options = ifNotNullGet(gatewayId, this::getBoundDevicesOptions);
+      HashMap<String, CloudModel> boundDevices = fetchDevices(registryId, progress, chattyProgress, options);
       debug(format("Fetched %d devices from %s gateway %s", boundDevices.size(), registryId,
           gatewayId));
       if (gatewayId != null) {
@@ -562,8 +558,7 @@ private Map<String, CloudModel> augmentGatewayModels(String registryId,
         boundDevices.entrySet().stream().filter(this::isGateway).collect(Collectors.toSet());
     AtomicInteger count = new AtomicInteger();
     gateways.forEach(entry -> {
-      // Send progress updates to bitBucket to suppress redundant log messages.
-      int added = augmentGatewayModel(registryId, entry, proxyDeviceGateways, this::bitBucket);
+      int added = augmentGatewayModel(registryId, entry, proxyDeviceGateways, progress);
       progress.accept(format("Augmented gateway %s (%d/%d) with %d entries",
           entry.getKey(), count.incrementAndGet(), gateways.size(), added));
     });
@@ -587,7 +582,7 @@ private void augmentProxiedModel(Entry<String, CloudModel> entry,
   private int augmentGatewayModel(String registryId, Entry<String, CloudModel> model,
       HashMap<String, String> proxyDeviceGateways, Consumer<String> progress) {
     String gatewayId = model.getKey();
-    CloudModel gatewayModel = listRegistryDevices(registryId, gatewayId, progress);
+    CloudModel gatewayModel = listRegistryDevices(registryId, gatewayId, progress, false);
     model.getValue().gateway = gatewayModel.gateway;
     gatewayModel.gateway.proxy_ids.forEach(proxyId -> proxyDeviceGateways.put(proxyId, gatewayId));
     return gatewayModel.gateway.proxy_ids.size();

validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java

@@ -69,7 +69,6 @@
 import com.google.udmi.util.ExceptionMap;
 import com.google.udmi.util.ExceptionMap.ErrorTree;
 import com.google.udmi.util.ExceptionMap.ExceptionCategory;
-import com.google.udmi.util.GeneralUtils;
 import com.google.udmi.util.JsonUtil;
 import com.google.udmi.util.SiteModel;
 import com.google.udmi.util.ValidationError;
@@ -139,6 +138,7 @@ public class Registrar {
   private static final String TOOL_NAME = "registrar";
   private static final long DELETE_FLUSH_DELAY_MS = 10 * SEC_TO_MS;
   public static final String REGISTRAR_TOOL_NAME = "registrar";
+  private static final int UNBIND_SET_SIZE = 1000;
   private boolean autoAltRegistry;
   private final Map<String, JsonSchema> schemas = new HashMap<>();
   private final String generation = JsonUtil.isoConvert();
@@ -769,9 +769,9 @@ private void unbindDevicesFromGateways(Set<String> allDevices, Set<String> bound
         Map<String, CloudModel> boundDevices = cloudIotManager.fetchDevice(gatewayId).device_ids;
         Set<String> toUnbind = new HashSet<>(intersection(allDevices, boundDevices.keySet()));
         System.err.printf("Unbinding from gateway %s: %s%n", gatewayId, setOrSize(toUnbind));
-        boolean multiple = toUnbind.size() > GeneralUtils.SET_SIZE_THRESHOLD;
+        boolean multiple = toUnbind.size() > UNBIND_SET_SIZE;
         while (!toUnbind.isEmpty()) {
-          Set<String> limitedSet = limitSetSize(toUnbind, GeneralUtils.SET_SIZE_THRESHOLD);
+          Set<String> limitedSet = limitSetSize(toUnbind, UNBIND_SET_SIZE);
           ifTrueThen(multiple, () -> System.err.printf("Unbinding subset from %s: %s%n", gatewayId,
               setOrSize(limitedSet)));
           cloudIotManager.bindDevices(limitedSet, gatewayId, false);