Fix datafeed key json parsing

Author: at055612

stroom-receive/stroom-receive-common/src/main/java/stroom/receive/common/DataFeedKeyDirWatcher.java

@@ -5,9 +5,11 @@
 import stroom.util.json.JsonUtil;
 import stroom.util.logging.LambdaLogger;
 import stroom.util.logging.LambdaLoggerFactory;
+import stroom.util.logging.LogUtil;
 import stroom.util.shared.NullSafe;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectReader;
 import jakarta.inject.Inject;
 import jakarta.inject.Provider;
 import jakarta.inject.Singleton;
@@ -102,18 +104,19 @@ private void processAllFiles() {
                 }
             });
             LOGGER.info("Completed reading {} data feed key files in {}", counter, dirToWatch);
-        } catch (IOException e) {
-            LOGGER.error("Error reading contents of " + dirToWatch, e);
+        } catch (Exception e) {
+            LOGGER.error("Error reading contents of directory '{}': {}", dirToWatch, LogUtil.exceptionMessage(e));
         }
     }
 
     private void processFile(final Path path) {
         if (path != null && Files.isRegularFile(path)) {
             LOGGER.info("Reading datafeed key file {}", path.toAbsolutePath().normalize());
-            final ObjectMapper mapper = JsonUtil.getMapper();
+            final ObjectReader reader = JsonUtil.getMapper().reader()
+                    .with(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
             try (InputStream fileStream = new FileInputStream(path.toFile())) {
                 try {
-                    final HashedDataFeedKeys hashedDataFeedKeys = mapper.readValue(fileStream,
+                    final HashedDataFeedKeys hashedDataFeedKeys = reader.readValue(fileStream,
                             HashedDataFeedKeys.class);
                     if (hashedDataFeedKeys != null && NullSafe.hasItems(hashedDataFeedKeys.getDataFeedKeys())) {
                         final int addedCount = dataFeedKeyServiceProvider.get().addDataFeedKeys(hashedDataFeedKeys,
@@ -125,11 +128,12 @@ private void processFile(final Path path) {
                         LOGGER.info("No datafeed keys found in {}", path.toAbsolutePath().normalize());
                     }
                 } catch (IOException e) {
-                    LOGGER.error("Error parsing file {}: {}", path, e.getMessage(), e);
-                    throw new RuntimeException(e);
+                    LOGGER.debug("Error parsing file {}: {}", path, e.getMessage(), e);
+                    LOGGER.error("Error parsing file {}: {} (enable DEBUG for stacktrace)", path, e.getMessage());
                 }
             } catch (IOException e) {
-                LOGGER.error("Error reading file {}: {}", path, e.getMessage(), e);
+                LOGGER.debug("Error reading file {}: {}", path, e.getMessage(), e);
+                LOGGER.error("Error reading file {}: {} (enable DEBUG for stacktrace)", path, e.getMessage());
             }
         }
     }

unreleased_changes/20250411_075059_579__0.md

@@ -0,0 +1,19 @@
+* Add data feed key json parsing errors to log. Remove stack traces from error log. Stop a bad json file breaking the dir watcher on boot.
+
+
+```sh
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```