Clean up a bit more the PR

xwiki · Feb 16, 2024 · a2d9dd2 · a2d9dd2
1 parent d7345d4
commit a2d9dd2
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 106 deletions.
diff --git a/...default/src/main/java/org/xwiki/notifications/notifiers/internal/UserEventDispatcher.java b/...default/src/main/java/org/xwiki/notifications/notifiers/internal/UserEventDispatcher.java
@@ -325,6 +325,7 @@ private boolean isPrefiltered(Event event, String entityId, boolean mail)
             return result.getTotalHits() > 0;
         } catch (Exception e) {
             this.logger.error("Failed to check status for event [{}] and entity [{}]", event.getId(), entityId, e);
+
             return false;
         }
     }

diff --git a/...st-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java b/...st-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsEmailsIT.java
@@ -66,8 +66,7 @@
         "xwikiDbHbmCommonExtraMappings=mailsender.hbm.xml,notification-filter-preferences.hbm.xml",
         "xwikiCfgPlugins=com.xpn.xwiki.plugin.scheduler.SchedulerPlugin",
         // Switch to domain-based URL
-        "xwikiCfgVirtualUsepath=0",
-        "xwikiPropertiesAdditionalProperties=notifications.rest.cache=false"
+        "xwikiCfgVirtualUsepath=0"
     },
     extraJARs = {
         // It's currently not possible to install a JAR contributing a Hibernate mapping file as an Extension. Thus,

diff --git a/...-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java b/...-docker/src/test/it/org/xwiki/platform/notifications/test/ui/NotificationsSettingsIT.java
@@ -61,8 +61,7 @@
  */
 @UITest(
     properties = {
-        "xwikiDbHbmCommonExtraMappings=notification-filter-preferences.hbm.xml",
-        "xwikiPropertiesAdditionalProperties=notifications.rest.cache=false"
+        "xwikiDbHbmCommonExtraMappings=notification-filter-preferences.hbm.xml"
     },
     extraJARs = {
         // It's currently not possible to install a JAR contributing a Hibernate mapping file as an Extension. Thus,

diff --git a/...ons-test/xwiki-platform-notifications-test-docker/src/test/resources/logback-override.xml b/...ons-test/xwiki-platform-notifications-test-docker/src/test/resources/logback-override.xml
diff --git a/...java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java b/...java/org/xwiki/test/docker/internal/junit5/configuration/ConfigurationFilesGenerator.java
@@ -130,7 +130,7 @@ public void generate(File configurationFileTargetDirectory, String version, Arti
         // Copy a logback config file for testing. This allows putting overrides in it that are needed only for the
         // tests. Only do this in the CI for now (or if debug is true) since this is currently used for debugging
         // problems.
-        if (DockerTestUtils.isInAContainer() || this.testConfiguration.isVerbose()) {
+        if (DockerTestUtils.isInAContainer() || this.testConfiguration.isDebug()) {
             copyLogbackConfigFile(configurationFileTargetDirectory);
         }
     }