From eb4aa2a877a810579c808986fac869bf52798452 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Tue, 27 Aug 2024 14:02:58 +0100
Subject: [PATCH 01/15] FISH-6030: Remove noisy and all references to it.

The noisy parameter has been removed from all Admin Console pages and has been marked as deprecated within the API.
---
 .../cdiEventbusNotifierConfiguration.jsf           | 14 ++------------
 .../eventbus/eventbusNotifierConfiguration.jsf     | 13 ++-----------
 .../resources/jms/jmsNotifierConfiguration.jsf     | 13 ++-----------
 .../configAPI/gcpConfigSourceConfiguration.jsf     |  4 ++--
 .../main/resources/notification/notification.jsf   | 11 ++---------
 .../jms/SetJmsNotifierConfigurationCommand.java    |  8 +-------
 .../notification/PayaraNotifierConfiguration.java  | 12 +++++++-----
 .../admin/BaseGetNotifierConfigurationCommand.java | 12 +++---------
 .../admin/BaseSetNotifierConfigurationCommand.java | 10 +++-------
 .../admin/GetNotificationConfigurationCommand.java |  9 +++------
 .../admin/SetNotificationConfiguration.java        |  6 +-----
 11 files changed, 28 insertions(+), 84 deletions(-)

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
index 3f76168dfee..f78c1966c9a 100644
--- a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
@@ -1,7 +1,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
   The contents of this file are subject to the terms of either the GNU
   General Public License Version 2 only ("GPL") or the Common Development
@@ -55,7 +55,7 @@
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic", "loopback"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic", "loopback"});
 
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
@@ -66,9 +66,6 @@
         if (#{pageSession.valueMap['hazelcastEnabled']}=true) {
             setPageSessionAttribute(key="hazelcastEnabled", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -83,7 +80,6 @@
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-                        mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         mapPut(map="#{pageSession.valueMap}" key="loopBack" value="#{pageSession.loopBackSelected}");
                         mapPut(map="#{pageSession.valueMap}" key="hazelcastEnabled" value="#{pageSession.hazelcastEnabled}");
@@ -105,12 +101,6 @@
                           helpText="$resource{i18ncebn.notifier.cdieventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
-                          rendered="#{pageSession.hazelcastEnabled == true}"
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18nn.notification.configuration.dynamic}"
diff --git a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
index 39edf074e9e..77c30321bfa 100644
--- a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
@@ -53,14 +53,11 @@ holder.
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"});
         
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -86,7 +83,6 @@ holder.
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-						mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         prepareSuccessfulMsg();
                         gf.updateEntity(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/set-eventbus-notifier-configuration" 
@@ -105,11 +101,6 @@ holder.
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18nn.notification.configuration.dynamic}"  
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
diff --git a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
index 71951ee7b05..a22a7665ec4 100644
--- a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
+++ b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) [2017-2020] Payara Foundation and/or its affiliates. All rights reserved.
+Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
@@ -53,14 +53,11 @@ holder.
                 method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.notifierConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy", "dynamic"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "dynamic"});
         
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
     /> 
 </event>
@@ -86,7 +83,6 @@ holder.
                         onClick="if (guiValidate('#{reqMsg}','#{reqInt}','#{reqPort}')) submitAndDisable(this, '$resource{i18n.button.Processing}'); return false;" >
                     <!command
                         mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
-						mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                         mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                         prepareSuccessfulMsg();
                         gf.updateEntity(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/set-jms-notifier-configuration" 
@@ -105,11 +101,6 @@ holder.
                           helpText="$resource{i18njn.notifier.jms.configuration.enabledLabelHelpText}">
                 <sun:checkbox id="enabledProp" selected="#{pageSession.enabledSelected}" selectedValue="true" />
             </sun:property>
-            <sun:property id="noisy" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
-                          label="$resource{i18nn.notification.configuration.notifier.noisyLabel}"  
-                          helpText="$resource{i18nn.notification.configuration.notifier.noisyLabelHelpText}">
-                <sun:checkbox id="noisy" selected="#{pageSession.noisy}" selectedValue="true" />
-            </sun:property>
             <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18nn.notification.configuration.dynamic}"  
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
diff --git a/appserver/admingui/microprofile-console-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf b/appserver/admingui/microprofile-console-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf
index 1bed457fc14..2b3da685df9 100644
--- a/appserver/admingui/microprofile-console-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf
+++ b/appserver/admingui/microprofile-console-plugin/src/main/resources/microprofile/specs/configAPI/gcpConfigSourceConfiguration.jsf
@@ -1,7 +1,7 @@
 <!--
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 2020 Payara Foundation and/or its affiliates. All rights reserved.
+    Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -59,7 +59,7 @@
                 value="#{requestScope.resp.data.extraProperties.configSourceConfiguration}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
         
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled", "noisy"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled"});
         
         if (#{pageSession.valueMap['enabled']}=true) {
             setPageSessionAttribute(key="enabledSelected", value="true");
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
index 4276fcc392e..eb7c28fc6f8 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
+++ b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
@@ -1,5 +1,5 @@
 <!--
-Copyright (c) [2016-2020] Payara Foundation and/or its affiliates. All rights reserved.
+Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
 
 The contents of this file are subject to the terms of either the GNU
 General Public License Version 2 only ("GPL") or the Common Development
@@ -52,7 +52,7 @@ holder.
         gf.restRequest(endpoint="#{sessionScope.NOTIFICATION_CONFIG_URL}/get-notification-configuration?target=#{pageSession.configName}"  method="GET" result="#{requestScope.resp}");
         setPageSessionAttribute(key="valueMap", value="#{requestScope.resp.data.extraProperties.getNotificationConfigurationLogNotifier}");
         mapPut(map="#{pageSession.valueMap}" key="target" value="#{pageSession.configName}");
-        setPageSessionAttribute(key="convertToFalseList", value={"enabled","notifierEnabled","dynamic","notifierDynamic","noisy", "useSeparateLogFile"});
+        setPageSessionAttribute(key="convertToFalseList", value={"enabled","notifierEnabled","dynamic","notifierDynamic", "useSeparateLogFile"});
         if (#{pageSession.valueMap['enabled']}=true) {
         setPageSessionAttribute(key="enabledSelected", value="true");
         }
@@ -62,9 +62,6 @@ holder.
         if (#{pageSession.valueMap['useSeparateLogFile']}=true) {
         setPageSessionAttribute(key="useSeparateLogFile", value="true");
         }
-        if (#{pageSession.valueMap['noisy']}=true) {
-			setPageSessionAttribute(key="noisy", value="true");
-		}	
         setPageSessionAttribute(key="dynamic", value="true");
         /> 
 </event>
@@ -80,7 +77,6 @@ holder.
                 <!command
                     mapPut(map="#{pageSession.valueMap}" key="enabled" value="#{pageSession.enabledSelected}");
                     mapPut(map="#{pageSession.valueMap}" key="notifierEnabled" value="#{pageSession.notifierEnabledSelected}");
-					mapPut(map="#{pageSession.valueMap}" key="noisy" value="#{pageSession.noisy}");
                     mapPut(map="#{pageSession.valueMap}" key="useSeparateLogFile" value="#{pageSession.useSeparateLogFile}");
                     mapPut(map="#{pageSession.valueMap}" key="dynamic" value="#{pageSession.dynamic}");
                     mapPut(map="#{pageSession.valueMap}" key="notifierDynamic" value="#{pageSession.dynamic}");
@@ -103,9 +99,6 @@ holder.
        <sun:property id="logNotifierEnabledProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.logNotifierEnabled}" helpText="$resource{i18nn.notification.configuration.logNotifierEnabledHelp}">
             <sun:checkbox id="logNotifierEnabledLabel" selected="#{pageSession.notifierEnabledSelected}" selectedValue="true" />
         </sun:property>
-       <sun:property id="logNotifierNoisyProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.logNotifierNoisy}" helpText="$resource{i18nn.notification.configuration.logNotifierNoisyHelp}">
-            <sun:checkbox id="logNotifierNoisyLabel" selected="#{pageSession.noisy}" selectedValue="true" />
-        </sun:property>
         <sun:property id="useSeparateLogFileProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.useSeparateLogFile}" helpText="$resource{i18nn.notification.configuration.useSeparateLogFileHelp}">
             <sun:checkbox id="useSeparateLogFileLabel" selected="#{pageSession.useSeparateLogFile}" selectedValue="true" />
         </sun:property>
diff --git a/appserver/payara-appserver-modules/notification-jms-core/src/main/java/fish/payara/notification/jms/SetJmsNotifierConfigurationCommand.java b/appserver/payara-appserver-modules/notification-jms-core/src/main/java/fish/payara/notification/jms/SetJmsNotifierConfigurationCommand.java
index 3ec9c919178..af54c9bdd27 100644
--- a/appserver/payara-appserver-modules/notification-jms-core/src/main/java/fish/payara/notification/jms/SetJmsNotifierConfigurationCommand.java
+++ b/appserver/payara-appserver-modules/notification-jms-core/src/main/java/fish/payara/notification/jms/SetJmsNotifierConfigurationCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2016-2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -92,12 +92,6 @@ public class SetJmsNotifierConfigurationCommand extends BaseSetNotifierConfigura
     @Override
     protected void applyValues(JmsNotifierConfiguration configuration) throws PropertyVetoException {
         super.applyValues(configuration);
-        if (this.enabled != null) {
-            configuration.enabled(this.enabled);
-        }
-        if (this.noisy != null) {
-            configuration.noisy(this.noisy);
-        }
         if (StringUtils.ok(contextFactoryClass)) {
             configuration.setContextFactoryClass(contextFactoryClass);
         }
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
index 0ecb473d8fb..07185ed1b05 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -53,16 +53,18 @@
  */
 @Configured
 public interface PayaraNotifierConfiguration extends ConfigBeanProxy {
-
-    public static final String DEFAULT_ENABLED_VALUE = "false";
-    public static final String DEFAULT_NOISY_VALUE = "true";
+    String DEFAULT_ENABLED_VALUE = "false";
+    String DEFAULT_NOISY_VALUE = "true";
 
     @Attribute(defaultValue = DEFAULT_ENABLED_VALUE, dataType = Boolean.class)
     String getEnabled();
     void enabled(Boolean value) throws PropertyVetoException;
-    
+
+    @Deprecated
     @Attribute(defaultValue = DEFAULT_NOISY_VALUE, dataType = Boolean.class)
     String getNoisy();
+
+    @Deprecated
     void noisy(Boolean value) throws PropertyVetoException;
 
 }
\ No newline at end of file
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
index 4efa62bd631..f43eac292cb 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -40,7 +40,6 @@
 package fish.payara.internal.notification.admin;
 
 import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.ArrayList;
@@ -151,13 +150,8 @@ protected String listConfiguration(C configuration) {
     protected Map<String, Object> getNotifierConfiguration(C configuration) {
         Map<String, Object> map = new LinkedHashMap<>(2);
 
-        if (configuration != null) {
-            map.put("Enabled", configuration.getEnabled());
-            map.put("Noisy", configuration.getNoisy());
-        } else {
-            map.put("Enabled", FALSE.toString());
-            map.put("Noisy", TRUE.toString());
-        }
+        if (configuration != null) map.put("Enabled", configuration.getEnabled());
+        else map.put("Enabled", FALSE.toString());
 
         return map;
     }
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index fe67ad0ab09..d2553332639 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2016-2021 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -92,6 +92,7 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     @Param(name = "enabled")
     protected Boolean enabled;
 
+    @Deprecated
     @Param(name = "noisy", optional = true, defaultValue = "true")
     protected Boolean noisy;
 
@@ -174,12 +175,7 @@ public void execute(final AdminCommandContext context) {
      *                               pass the configured validation.
      */
     protected void applyValues(C configuration) throws PropertyVetoException {
-        if (this.enabled != null) {
-            configuration.enabled(this.enabled);
-        }
-        if (this.noisy != null) {
-            configuration.noisy(this.noisy);
-        }
+        if (this.enabled != null) configuration.enabled(this.enabled);
     }
 
     /**
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
index 7b0042058ed..5e1adc13fc2 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -129,7 +129,7 @@ public void execute(AdminCommandContext context) {
             return;
         }
 
-        String headers[] = { "Notifier Name", "Enabled", "Notifier Enabled", "Notifier Noisy" };
+        String headers[] = {"Notifier Name", "Enabled", "Notifier Enabled"};
         ColumnFormatter columnFormatter = new ColumnFormatter(headers);
 
         Properties extraProps = new Properties();
@@ -137,7 +137,7 @@ public void execute(AdminCommandContext context) {
             
             final Class<?> notifierClass = serviceHandle.getActiveDescriptor().getImplementationClass();
 
-            Object values[] = new Object[4];
+            Object values[] = new Object[3];
             values[0] = getNotifierName(serviceHandle.getActiveDescriptor());
             values[1] = notificationServiceEnabled;
 
@@ -150,10 +150,8 @@ public void execute(AdminCommandContext context) {
 
             if (notifierConfig == null) {
                 values[2] = PayaraNotifierConfiguration.DEFAULT_ENABLED_VALUE;
-                values[3] = PayaraNotifierConfiguration.DEFAULT_NOISY_VALUE;
             } else {
                 values[2] = notifierConfig.getEnabled();
-                values[3] = notifierConfig.getNoisy();
             }
 
             columnFormatter.addRow(values);
@@ -161,7 +159,6 @@ public void execute(AdminCommandContext context) {
             Map<String, Object> map = new HashMap<>(3);
             map.put("enabled", values[1]);
             map.put("notifierEnabled", values[2]);
-            map.put("noisy", values[3]);
             if (notifierConfig != null && notifierConfig instanceof LogNotifierConfiguration) {
                 map.put("useSeparateLogFile", ((LogNotifierConfiguration) notifierConfig).getUseSeparateLogFile());
             }
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
index 3dba0ffddae..87c56dbc661 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -96,9 +96,6 @@ public class SetNotificationConfiguration implements AdminCommand {
     @Param(name = "notifierEnabled")
     private Boolean notifierEnabled;
 
-    @Param(name = "noisy", defaultValue = "true", optional = true)
-    private Boolean noisy;
-
     @Param(name = "useSeparateLogFile", defaultValue = "false", optional = true)
     private Boolean useSeparateLogFile;
 
@@ -148,7 +145,6 @@ private void enableNotificationNotifierConfigurerOnTarget(ActionReport actionRep
         params.add("dynamic", notifierDynamic.toString());
         params.add("target", target);
         params.add("enabled", notifierEnabled.toString());
-        params.add("noisy", noisy.toString());
         params.add("useSeparateLogFile", useSeparateLogFile.toString());
         inv.parameters(params);
         inv.execute();

From c840410d3bd27740afca74b37448e1b107cc2d2f Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:29:41 +0100
Subject: [PATCH 02/15] FISH-9691: Implement event levels.

---
 .../internal/notification/EventLevel.java     | 81 +++++++++++++++++++
 .../PayaraConfiguredNotifier.java             |  7 +-
 .../notification/PayaraNotification.java      | 16 +++-
 .../PayaraNotificationBuilder.java            | 10 ++-
 .../PayaraNotificationFactory.java            |  3 +-
 .../internal/notification/PayaraNotifier.java | 11 ++-
 .../PayaraNotifierConfiguration.java          |  6 +-
 .../BaseGetNotifierConfigurationCommand.java  |  5 +-
 .../BaseSetNotifierConfigurationCommand.java  |  7 +-
 .../nucleus/notification/NotifierHandler.java |  4 +-
 10 files changed, 138 insertions(+), 12 deletions(-)
 create mode 100644 nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java
new file mode 100644
index 00000000000..870a87d1857
--- /dev/null
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java
@@ -0,0 +1,81 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) [2024] Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * https://github.com/payara/Payara/blob/main/LICENSE.txt
+ * See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * The Payara Foundation designates this particular file as subject to the "Classpath"
+ * exception as provided by the Payara Foundation in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package fish.payara.internal.notification;
+
+import java.util.function.BiPredicate;
+import java.util.logging.Level;
+
+/**
+ *
+ */
+public enum EventLevel {
+    INFO(800),
+    WARNING(900),
+    SEVERE(1000);
+
+    private final int severityLevel;
+
+    public static EventLevel fromNameOrWarning (String name) {
+        try {
+            return EventLevel.valueOf(name.toUpperCase());
+        } catch (Exception e) {
+            return WARNING;
+        }
+    }
+
+    public static EventLevel fromLogLevel (Level level) {
+        if (level.intValue() <= INFO.severityLevel) return INFO;
+        if (level.intValue() <= WARNING.severityLevel) return WARNING;
+        return SEVERE;
+    }
+
+    EventLevel (int severityLevel) {
+        this.severityLevel = severityLevel;
+    }
+
+    public int getSeverityLevel () {
+        return severityLevel;
+    }
+
+    public boolean compare (EventLevel other, BiPredicate<Integer, Integer> predicate) {
+        return predicate.test(this.severityLevel, other.severityLevel);
+    }
+}
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
index 4b0674b5b4d..6d50aaeee6c 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -66,4 +66,9 @@ public final C getConfiguration() {
         return configuration;
     }
 
+    @Override
+    public void tryHandleNotification (PayaraNotification event) {
+        if (event.getLevel().compare(EventLevel.fromNameOrWarning(this.configuration.getFilter()), (a, b) -> a >= b))
+            this.handleNotification(event);
+    }
 }
\ No newline at end of file
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotification.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotification.java
index 717143e98f2..f023b67129b 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotification.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotification.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -58,12 +58,19 @@ public class PayaraNotification implements Serializable {
     private final String subject;
     private final String message;
     private final Serializable data;
+    private final EventLevel level;
 
     private final List<String> notifierWhitelist;
     private final List<String> notifierBlacklist;
 
     public PayaraNotification(String eventType, String serverName, String hostName, String domainName,
-            String instanceName, String subject, String message, Serializable data, List<String> notifierWhitelist,
+                              String instanceName, String subject, String message, Serializable data, List<String> notifierWhitelist,
+                              List<String> notifierBlacklist) {
+        this(eventType, serverName, hostName, domainName, instanceName, subject, message, data, EventLevel.INFO, notifierWhitelist, notifierBlacklist);
+    }
+
+    public PayaraNotification (String eventType, String serverName, String hostName, String domainName,
+                               String instanceName, String subject, String message, Serializable data, EventLevel level, List<String> notifierWhitelist,
             List<String> notifierBlacklist) {
         this.eventType = eventType;
         this.serverName = serverName;
@@ -73,6 +80,7 @@ public PayaraNotification(String eventType, String serverName, String hostName,
         this.subject = subject;
         this.message = message;
         this.data = data;
+        this.level = level;
         this.notifierWhitelist = (notifierWhitelist == null) ? null : Collections.unmodifiableList(notifierWhitelist);
         this.notifierBlacklist = (notifierBlacklist == null) ? null : Collections.unmodifiableList(notifierBlacklist);
     }
@@ -105,6 +113,10 @@ public String getMessage() {
         return message;
     }
 
+    public EventLevel getLevel () {
+        return level;
+    }
+
     public List<String> getNotifierWhitelist() {
         return notifierWhitelist;
     }
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationBuilder.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationBuilder.java
index fc449a087c0..3e7d26b4a57 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationBuilder.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationBuilder.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -58,6 +58,7 @@ public class PayaraNotificationBuilder {
 
     private String subject;
     private String eventType;
+    private EventLevel eventLevel = EventLevel.INFO;
 
     private List<String> notifierWhitelist;
     private List<String> notifierBlacklist;
@@ -98,6 +99,11 @@ public PayaraNotificationBuilder eventType(String eventType) {
         return this;
     }
 
+    public PayaraNotificationBuilder level (EventLevel eventLevel) {
+        this.eventLevel = eventLevel;
+        return this;
+    }
+
     /**
      * Add a list of notifiers to the receiver list for this notification. Calling
      * this method with an empty list will mean that no notifier receives the
@@ -138,6 +144,6 @@ public PayaraNotificationBuilder blacklist(String... notifierNames) {
 
     public PayaraNotification build() {
         return new PayaraNotification(eventType, serverName, hostName, domainName, instanceName, subject, message, data,
-                notifierWhitelist, notifierBlacklist);
+            eventLevel, notifierWhitelist, notifierBlacklist);
     }
 }
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationFactory.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationFactory.java
index c6f96fe2036..ed5fba2b445 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationFactory.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotificationFactory.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016-2021 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -101,6 +101,7 @@ public PayaraNotification buildNotificationEvent(Level level, String subject, St
                 .subject(subject)
                 .message(message)
                 .eventType(level.getName())
+                .level(EventLevel.fromLogLevel(level))
                 .build();
     }
 
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
index cb107bda3de..6aa3f967a59 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -49,6 +49,15 @@
 @Contract
 public interface PayaraNotifier {
 
+    /**
+     * Receives a notification and processes if certain conditions are met.
+     *
+     * @param event the notification
+     */
+    default void tryHandleNotification (PayaraNotification event) {
+        this.handleNotification(event);
+    }
+
     /**
      * Receive notifications from the notification service.
      * @param event the notification
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
index 0ecb473d8fb..c12e9315e20 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifierConfiguration.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -56,6 +56,7 @@ public interface PayaraNotifierConfiguration extends ConfigBeanProxy {
 
     public static final String DEFAULT_ENABLED_VALUE = "false";
     public static final String DEFAULT_NOISY_VALUE = "true";
+    String DEFAULT_EVENT_FILTER = "WARNING";
 
     @Attribute(defaultValue = DEFAULT_ENABLED_VALUE, dataType = Boolean.class)
     String getEnabled();
@@ -65,4 +66,7 @@ public interface PayaraNotifierConfiguration extends ConfigBeanProxy {
     String getNoisy();
     void noisy(Boolean value) throws PropertyVetoException;
 
+    @Attribute(defaultValue = DEFAULT_EVENT_FILTER, dataType = String.class)
+    String getFilter ();
+    void filter (String value) throws PropertyVetoException;
 }
\ No newline at end of file
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
index 4efa62bd631..026da903dc0 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -51,6 +51,7 @@
 import java.util.Map.Entry;
 import java.util.Properties;
 
+import fish.payara.internal.notification.EventLevel;
 import jakarta.inject.Inject;
 
 import com.sun.enterprise.config.serverbeans.Config;
@@ -154,9 +155,11 @@ protected Map<String, Object> getNotifierConfiguration(C configuration) {
         if (configuration != null) {
             map.put("Enabled", configuration.getEnabled());
             map.put("Noisy", configuration.getNoisy());
+            map.put("Filter", configuration.getFilter());
         } else {
             map.put("Enabled", FALSE.toString());
             map.put("Noisy", TRUE.toString());
+            map.put("Filter", EventLevel.WARNING.toString());
         }
 
         return map;
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index fe67ad0ab09..8e7d33085f4 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2016-2021 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -43,6 +43,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import fish.payara.internal.notification.EventLevel;
 import jakarta.inject.Inject;
 
 import com.sun.enterprise.config.serverbeans.Config;
@@ -95,6 +96,9 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     @Param(name = "noisy", optional = true, defaultValue = "true")
     protected Boolean noisy;
 
+    @Param(name = "filter", optional = true, defaultValue = "WARNING")
+    protected String filter;
+
     @Override
     public void execute(final AdminCommandContext context) {
         final ActionReport actionReport = context.getActionReport();
@@ -180,6 +184,7 @@ protected void applyValues(C configuration) throws PropertyVetoException {
         if (this.noisy != null) {
             configuration.noisy(this.noisy);
         }
+        if (this.filter != null) configuration.filter(EventLevel.fromNameOrWarning(this.filter).toString());
     }
 
     /**
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/NotifierHandler.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/NotifierHandler.java
index 31b517b0f66..99b7619e6cd 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/NotifierHandler.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/NotifierHandler.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -168,7 +168,7 @@ private void run() {
             final PayaraNotification notification = notificationQueue.take();
             try {
                 if (notification != null) {
-                    notifier.handleNotification(notification);
+                    notifier.tryHandleNotification(notification);
                 }
             } catch (final Exception ex) {
                 LOGGER.log(Level.WARNING,

From 468931b94cc7a58f592e1113fb253e46c0d025f0 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 19 Sep 2024 13:58:05 +0100
Subject: [PATCH 03/15] FISH-6030: Adjust code style and add obsolete.

---
 .../admin/BaseGetNotifierConfigurationCommand.java         | 7 +++++--
 .../admin/BaseSetNotifierConfigurationCommand.java         | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
index f43eac292cb..19e0d853767 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseGetNotifierConfigurationCommand.java
@@ -150,8 +150,11 @@ protected String listConfiguration(C configuration) {
     protected Map<String, Object> getNotifierConfiguration(C configuration) {
         Map<String, Object> map = new LinkedHashMap<>(2);
 
-        if (configuration != null) map.put("Enabled", configuration.getEnabled());
-        else map.put("Enabled", FALSE.toString());
+        if (configuration != null) {
+            map.put("Enabled", configuration.getEnabled());
+        } else {
+            map.put("Enabled", FALSE.toString());
+        }
 
         return map;
     }
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index d2553332639..bbd1161c6a1 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -93,7 +93,7 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     protected Boolean enabled;
 
     @Deprecated
-    @Param(name = "noisy", optional = true, defaultValue = "true")
+    @Param(name = "noisy", optional = true, defaultValue = "true", obsolete = true)
     protected Boolean noisy;
 
     @Override
@@ -175,7 +175,9 @@ public void execute(final AdminCommandContext context) {
      *                               pass the configured validation.
      */
     protected void applyValues(C configuration) throws PropertyVetoException {
-        if (this.enabled != null) configuration.enabled(this.enabled);
+        if (this.enabled != null) {
+            configuration.enabled(this.enabled);
+        }
     }
 
     /**

From 043e8b6dc66d1d511fcba19d0c3187b319cb2425 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Wed, 18 Sep 2024 17:16:39 +0100
Subject: [PATCH 04/15] FISH-9691: Implement event filtering.

---
 .../mphealth/MicroProfileHealthChecker.java   | 14 ++++++++++++--
 .../metrics/MicroProfileMetricsCheck.java     |  9 ++++++++-
 .../monitoring/JMXMonitoringFormatter.java    |  6 ++++--
 .../fish/payara/audit/AdminAuditService.java  | 19 +++++++++++++++++--
 .../preliminary/BaseHealthCheck.java          |  6 +++++-
 .../preliminary/BaseThresholdHealthCheck.java | 13 ++++++++++++-
 .../HoggingThreadsHealthCheck.java            | 11 ++++++++++-
 .../stuck/StuckThreadsHealthCheck.java        | 11 ++++++++++-
 .../requesttracing/RequestTracingService.java |  4 +++-
 9 files changed, 81 insertions(+), 12 deletions(-)

diff --git a/appserver/payara-appserver-modules/healthcheck-checker/src/main/java/fish/payara/healthcheck/mphealth/MicroProfileHealthChecker.java b/appserver/payara-appserver-modules/healthcheck-checker/src/main/java/fish/payara/healthcheck/mphealth/MicroProfileHealthChecker.java
index 3bcfeb2173f..e9c6ddc4c0e 100644
--- a/appserver/payara-appserver-modules/healthcheck-checker/src/main/java/fish/payara/healthcheck/mphealth/MicroProfileHealthChecker.java
+++ b/appserver/payara-appserver-modules/healthcheck-checker/src/main/java/fish/payara/healthcheck/mphealth/MicroProfileHealthChecker.java
@@ -1,7 +1,7 @@
 /*
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- *  Copyright (c) [2018-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ *  Copyright (c) [2018-2024] Payara Foundation and/or its affiliates. All rights reserved.
  * 
  *  The contents of this file are subject to the terms of either the GNU
  *  General Public License Version 2 only ("GPL") or the Common Development
@@ -51,6 +51,8 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URISyntaxException;
+
+import fish.payara.internal.notification.EventLevel;
 import jakarta.validation.constraints.Pattern;
 import jakarta.inject.Inject;
 
@@ -172,6 +174,14 @@ protected HealthCheckResult doCheckInternal() {
         return result;
     }
 
+    @Override
+    protected EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult) {
+        if (checkResult == HealthCheckResultStatus.FINE || checkResult == HealthCheckResultStatus.GOOD) {
+            return EventLevel.INFO;
+        }
+        return EventLevel.WARNING;
+    }
+
     @Override
     public void collect(MonitoringWatchCollector collector) {
         if (!envrionment.isDas() || options == null || !options.isEnabled()) {
diff --git a/appserver/payara-appserver-modules/healthcheck-metrics/src/main/java/fish/payara/healthcheck/microprofile/metrics/MicroProfileMetricsCheck.java b/appserver/payara-appserver-modules/healthcheck-metrics/src/main/java/fish/payara/healthcheck/microprofile/metrics/MicroProfileMetricsCheck.java
index f4c9166ddf1..3ee24185099 100644
--- a/appserver/payara-appserver-modules/healthcheck-metrics/src/main/java/fish/payara/healthcheck/microprofile/metrics/MicroProfileMetricsCheck.java
+++ b/appserver/payara-appserver-modules/healthcheck-metrics/src/main/java/fish/payara/healthcheck/microprofile/metrics/MicroProfileMetricsCheck.java
@@ -1,7 +1,7 @@
 /*
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- *  Copyright (c) [2020-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ *  Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  *  The contents of this file are subject to the terms of either the GNU
  *  General Public License Version 2 only ("GPL") or the Common Development
@@ -51,6 +51,8 @@
 import java.util.List;
 import java.util.Set;
 
+import fish.payara.internal.notification.EventLevel;
+import fish.payara.notification.healthcheck.HealthCheckResultStatus;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 
@@ -124,6 +126,11 @@ protected HealthCheckResult doCheckInternal() {
         return result;
     }
 
+    @Override
+    protected EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult) {
+        return EventLevel.INFO;
+    }
+
     private synchronized String write() throws IOException {
         writer.write();
         // Remove any trailing whitespace or commas
diff --git a/appserver/payara-appserver-modules/jmx-monitoring-service/src/main/java/fish/payara/jmx/monitoring/JMXMonitoringFormatter.java b/appserver/payara-appserver-modules/jmx-monitoring-service/src/main/java/fish/payara/jmx/monitoring/JMXMonitoringFormatter.java
index 3e22eaab38b..2a1aa8e7265 100644
--- a/appserver/payara-appserver-modules/jmx-monitoring-service/src/main/java/fish/payara/jmx/monitoring/JMXMonitoringFormatter.java
+++ b/appserver/payara-appserver-modules/jmx-monitoring-service/src/main/java/fish/payara/jmx/monitoring/JMXMonitoringFormatter.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2016-2020] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -46,6 +46,7 @@
 
 import javax.management.MBeanServer;
 
+import fish.payara.internal.notification.EventLevel;
 import org.glassfish.hk2.api.messaging.Topic;
 
 import fish.payara.internal.notification.PayaraNotification;
@@ -128,7 +129,8 @@ public void run() {
     private void sendNotification(Level level, String message, Object[] parameters) {
         PayaraNotificationBuilder notification = notificationFactory.newBuilder()
             .whitelist(enabledNotifiers.toArray(new String[0]))
-            .subject(LOGMESSAGE_PREFIX + message);
+            .subject(LOGMESSAGE_PREFIX + message)
+            .level(EventLevel.INFO);
 
         if (parameters != null && parameters.length > 0) {
             notification = notification.message(MessageFormat.format(message, parameters));
diff --git a/nucleus/payara-modules/asadmin-audit/src/main/java/fish/payara/audit/AdminAuditService.java b/nucleus/payara-modules/asadmin-audit/src/main/java/fish/payara/audit/AdminAuditService.java
index 00ae5d3905f..15a25877102 100644
--- a/nucleus/payara-modules/asadmin-audit/src/main/java/fish/payara/audit/AdminAuditService.java
+++ b/nucleus/payara-modules/asadmin-audit/src/main/java/fish/payara/audit/AdminAuditService.java
@@ -1,7 +1,7 @@
 /*
  *  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- *  Copyright (c) [2019-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ *
+ *  Copyright (c) [2019-2024] Payara Foundation and/or its affiliates. All rights reserved.
  * 
  *  The contents of this file are subject to the terms of either the GNU
  *  General Public License Version 2 only ("GPL") or the Common Development
@@ -49,6 +49,8 @@
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import fish.payara.internal.notification.EventLevel;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import javax.security.auth.Subject;
@@ -143,11 +145,24 @@ public void recordAsadminCommand(String command, ParameterMap parameters, Subjec
                 .whitelist(enabledNotifiers.toArray(new String[0]))
                 .subject(AUDIT_MESSAGE)
                 .message(name + " issued command " + command + " with parameters " + parameters.toString())
+                .level(this.getEventLevel())
                 .build();
 
             notificationEventBus.publish(notification);
         }
     }
+
+    private EventLevel getEventLevel () {
+        switch (this.auditLevel) {
+            case INTERNAL:
+                return EventLevel.INFO;
+            case ACCESSORS:
+                return EventLevel.WARNING;
+            case MODIFIERS:
+            default:
+                return EventLevel.SEVERE;
+        }
+    }
     
     private boolean checkAuditLevel(String command) {        
         switch (auditLevel) {
diff --git a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseHealthCheck.java b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseHealthCheck.java
index 57e7c5776f3..b581faafa7d 100644
--- a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseHealthCheck.java
+++ b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseHealthCheck.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2016-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -49,6 +49,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 
+import fish.payara.internal.notification.EventLevel;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
 
@@ -125,6 +126,8 @@ public final HealthCheckResult doCheck() {
     }
 
     protected abstract HealthCheckResult doCheckInternal();
+
+    protected abstract EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult);
     public abstract O constructOptions(C c);
 
     public HealthCheckResultStatus getMostRecentCumulativeStatus() {
@@ -302,6 +305,7 @@ public void sendNotification(String name, HealthCheckResult checkResult, Level l
             .message(messageFormatted)
             .data(new HealthCheckNotificationData(checkResult.getEntries()))
             .eventType(level.getName())
+            .level(this.createNotificationEventLevel(checkResult.getCumulativeStatus()))
             .build();
         notificationEventBus.publish(notification);
 
diff --git a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseThresholdHealthCheck.java b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseThresholdHealthCheck.java
index 4f28d994a56..230b498b1f1 100644
--- a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseThresholdHealthCheck.java
+++ b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/BaseThresholdHealthCheck.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016-2020 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,6 +39,7 @@
  */
 package fish.payara.nucleus.healthcheck.preliminary;
 
+import fish.payara.internal.notification.EventLevel;
 import fish.payara.monitoring.collect.MonitoringWatchCollector;
 import fish.payara.notification.healthcheck.HealthCheckResultStatus;
 import fish.payara.nucleus.healthcheck.HealthCheckWithThresholdExecutionOptions;
@@ -89,6 +90,16 @@ protected HealthCheckResultStatus decideOnStatusWithRatio(double percentage) {
         return HealthCheckResultStatus.FINE;
     }
 
+    @Override
+    protected EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult) {
+        if (checkResult == HealthCheckResultStatus.GOOD || checkResult == HealthCheckResultStatus.FINE) {
+            return EventLevel.INFO;
+        } else if (checkResult == HealthCheckResultStatus.WARNING) {
+            return EventLevel.WARNING;
+        }
+        return EventLevel.SEVERE;
+    }
+
     @Override
     public O getOptions() {
         return options;
diff --git a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/HoggingThreadsHealthCheck.java b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/HoggingThreadsHealthCheck.java
index 259761fe89c..bf21e84e690 100644
--- a/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/HoggingThreadsHealthCheck.java
+++ b/nucleus/payara-modules/healthcheck-core/src/main/java/fish/payara/nucleus/healthcheck/preliminary/HoggingThreadsHealthCheck.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016-2022 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,6 +39,7 @@
  */
 package fish.payara.nucleus.healthcheck.preliminary;
 
+import fish.payara.internal.notification.EventLevel;
 import fish.payara.nucleus.healthcheck.HealthCheckHoggingThreadsExecutionOptions;
 import fish.payara.nucleus.healthcheck.HealthCheckResult;
 import fish.payara.monitoring.collect.MonitoringData;
@@ -224,6 +225,14 @@ record = new ThreadCpuTimeRecord();
         }
     }
 
+    @Override
+    protected EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult) {
+        if (checkResult == HealthCheckResultStatus.FINE) {
+            return EventLevel.INFO;
+        }
+        return EventLevel.WARNING;
+    }
+
     private static void acceptHoggingThread(final ThreadMXBean bean, final long now, final int retryCount, final int threshold,
             long threadId, long cpuTime, ThreadCpuTimeRecord record, HoggingThreadConsumer consumer) {
         long intervalLength = now - record.startOfIntervalTimestamp;
diff --git a/nucleus/payara-modules/healthcheck-stuck/src/main/java/fish/payara/nucleus/healthcheck/stuck/StuckThreadsHealthCheck.java b/nucleus/payara-modules/healthcheck-stuck/src/main/java/fish/payara/nucleus/healthcheck/stuck/StuckThreadsHealthCheck.java
index 226dd5c7448..8ff68b74432 100644
--- a/nucleus/payara-modules/healthcheck-stuck/src/main/java/fish/payara/nucleus/healthcheck/stuck/StuckThreadsHealthCheck.java
+++ b/nucleus/payara-modules/healthcheck-stuck/src/main/java/fish/payara/nucleus/healthcheck/stuck/StuckThreadsHealthCheck.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016-2023 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -39,6 +39,7 @@
  */
 package fish.payara.nucleus.healthcheck.stuck;
 
+import fish.payara.internal.notification.EventLevel;
 import fish.payara.monitoring.collect.MonitoringData;
 import fish.payara.monitoring.collect.MonitoringDataCollector;
 import fish.payara.monitoring.collect.MonitoringDataSource;
@@ -139,6 +140,14 @@ protected HealthCheckResult doCheckInternal() {
         return result;
     }
 
+    @Override
+    protected EventLevel createNotificationEventLevel (HealthCheckResultStatus checkResult) {
+        if (checkResult == HealthCheckResultStatus.FINE) {
+            return EventLevel.INFO;
+        }
+        return EventLevel.WARNING;
+    }
+
     @Override
     @MonitoringData(ns = "health", intervalSeconds = 4)
     public void collect(MonitoringDataCollector collector) {
diff --git a/nucleus/payara-modules/requesttracing-core/src/main/java/fish/payara/nucleus/requesttracing/RequestTracingService.java b/nucleus/payara-modules/requesttracing-core/src/main/java/fish/payara/nucleus/requesttracing/RequestTracingService.java
index 72ebcc1f904..a057e1a0d4b 100644
--- a/nucleus/payara-modules/requesttracing-core/src/main/java/fish/payara/nucleus/requesttracing/RequestTracingService.java
+++ b/nucleus/payara-modules/requesttracing-core/src/main/java/fish/payara/nucleus/requesttracing/RequestTracingService.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2016-2023] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2016-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -53,6 +53,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import fish.payara.internal.notification.EventLevel;
 import jakarta.annotation.PostConstruct;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
@@ -526,6 +527,7 @@ private void processTraceEnd() {
                 .subject("Request execution time: " + elapsedTime + "(ms) exceeded the acceptable threshold")
                 .message(requestTrace.toString())
                 .data(new RequestTracingNotificationData(requestTrace))
+                .level(EventLevel.WARNING)
                 .build();
             notificationEventBus.publish(notification);
         }

From 872680a726bdb1875f917ded7a03bee25d3b051b Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 20 Sep 2024 09:36:27 +0100
Subject: [PATCH 05/15] FISH-9691: Code stying.

---
 .../fish/payara/internal/notification/EventLevel.java     | 8 ++++++--
 .../internal/notification/PayaraConfiguredNotifier.java   | 4 +++-
 .../fish/payara/internal/notification/PayaraNotifier.java | 2 +-
 .../admin/BaseSetNotifierConfigurationCommand.java        | 4 +++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java
index 870a87d1857..5378eadf13e 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/EventLevel.java
@@ -62,8 +62,12 @@ public static EventLevel fromNameOrWarning (String name) {
     }
 
     public static EventLevel fromLogLevel (Level level) {
-        if (level.intValue() <= INFO.severityLevel) return INFO;
-        if (level.intValue() <= WARNING.severityLevel) return WARNING;
+        if (level.intValue() <= INFO.severityLevel) {
+            return INFO;
+        }
+        if (level.intValue() <= WARNING.severityLevel) {
+            return WARNING;
+        }
         return SEVERE;
     }
 
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
index 6d50aaeee6c..362c1163d57 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraConfiguredNotifier.java
@@ -68,7 +68,9 @@ public final C getConfiguration() {
 
     @Override
     public void tryHandleNotification (PayaraNotification event) {
-        if (event.getLevel().compare(EventLevel.fromNameOrWarning(this.configuration.getFilter()), (a, b) -> a >= b))
+        EventLevel filterLevel = EventLevel.fromNameOrWarning(this.configuration.getFilter());
+        if (event.getLevel().compare(filterLevel, (a, b) -> a >= b)) {
             this.handleNotification(event);
+        }
     }
 }
\ No newline at end of file
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
index 6aa3f967a59..3c062c50a68 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/PayaraNotifier.java
@@ -52,7 +52,7 @@ public interface PayaraNotifier {
     /**
      * Receives a notification and processes if certain conditions are met.
      *
-     * @param event the notification
+     * @param event The notification.
      */
     default void tryHandleNotification (PayaraNotification event) {
         this.handleNotification(event);
diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index 8e7d33085f4..db5fc2d138f 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -184,7 +184,9 @@ protected void applyValues(C configuration) throws PropertyVetoException {
         if (this.noisy != null) {
             configuration.noisy(this.noisy);
         }
-        if (this.filter != null) configuration.filter(EventLevel.fromNameOrWarning(this.filter).toString());
+        if (this.filter != null) {
+            configuration.filter(EventLevel.fromNameOrWarning(this.filter).toString());
+        }
     }
 
     /**

From 9711691481b5c821d31e2d0a7f656d973720992b Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:02:17 +0100
Subject: [PATCH 06/15] FISH-6030: Deprecate noisy configuration.

---
 .../notification/admin/SetNotificationConfiguration.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
index 87c56dbc661..b13c0d4bddb 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
@@ -99,6 +99,10 @@ public class SetNotificationConfiguration implements AdminCommand {
     @Param(name = "useSeparateLogFile", defaultValue = "false", optional = true)
     private Boolean useSeparateLogFile;
 
+    @Deprecated
+    @Param(name = "noisy", defaultValue = "true", optional = true, obsolete = true)
+    private Boolean noisy;
+
     @Inject
     ServiceLocator serviceLocator;
 

From 78647adcc030b68ccc0b9e59bb424cb76143fe13 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Fri, 20 Sep 2024 16:06:10 +0100
Subject: [PATCH 07/15] FISH-6030: Remove noisy from string properties.

---
 .../fish/payara/admingui/extras/Strings_es.properties         | 4 ----
 .../fish/payara/admingui/extras/Strings_ja.properties         | 4 ----
 .../resources/fish/payara/admingui/extras/Strings.properties  | 4 ----
 3 files changed, 12 deletions(-)

diff --git a/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties b/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties
index e2247151c5b..dc3670f247e 100644
--- a/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties
+++ b/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_es.properties
@@ -160,8 +160,6 @@ notification.configuration.dynamic=Dinámico
 notification.configuration.dynamicHelp=Empieza o para el servicio de notificaciones en Payara si es requerido.
 notification.configuration.logNotifierEnabled=Notificador de log habilitado
 notification.configuration.logNotifierEnabledHelp=Determina si el notificador de log está habilitado.
-notification.configuration.logNotifierNoisy=Notificador de log ruidoso
-notification.configuration.logNotifierNoisyHelp=Deterina si el notificador de log está activo incluso si el umbral de HealthCheck no se ha rebasado.
 notification.configuration.useSeparateLogFile=Utilizar un archivo aparte de log
 notification.configuration.useSeparateLogFileHelp=Determina si se utiliza un fichero separado de log para almacenar las notificaciones. Haz click en <a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Configuración del log de notificaciones Payara</a> para editar la configuración de log para el servicio de notificaciones Payara. 
 tree.notification=Notificación
@@ -170,8 +168,6 @@ notification.configuration.notifier.enabled=Habilitar notificador
 notification.configuration.notifier.enabledHelp=Habilita o deshabilita el notificador de notificaciones.
 notification.configuration.notifier.dynamic=Notificador dinámico
 notification.configuration.notifier.dynamicHelp=Empieza o para el notificador de Payara si es requerido.
-notification.configuration.notifier.noisyLabel=Ruidoso
-notification.configuration.notifier.noisyLabelHelpText=No comprueba el umbral, siempre envía notificación
 notification.configuration.notifier.name=Nombre del servicio notificador
 notification.configuration.notifier.nameHelp=Nombre del servicio notificador
 
diff --git a/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties b/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties
index 5061a86baf4..f148c54fbed 100644
--- a/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties
+++ b/appserver/admingui/payara-console-extras-l10n/src/main/resources/fish/payara/admingui/extras/Strings_ja.properties
@@ -199,8 +199,6 @@ notification.configuration.dynamic=\u52D5\u7684
 notification.configuration.dynamicHelp=\u5FC5\u8981\u306B\u5FDC\u3058\u3066Payara\u306E\u901A\u77E5\u30B5\u30FC\u30D3\u30B9\u3092\u958B\u59CB\u304A\u3088\u3073\u505C\u6B62\u3057\u307E\u3059\u3002
 notification.configuration.logNotifierEnabled=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u6709\u52B9\u5316
 notification.configuration.logNotifierEnabledHelp=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
-notification.configuration.logNotifierNoisy=\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC (Noisy)
-notification.configuration.logNotifierNoisyHelp=\u30D8\u30EB\u30B9\u30C1\u30A7\u30C3\u30AF\u306E\u95BE\u5024\u304Cfine\u3067\u3082\u30ED\u30B0\u30FB\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u5316\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002
 notification.configuration.useSeparateLogFile=\u5225\u306E\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u7528
 notification.configuration.useSeparateLogFileHelp=\u901A\u77E5\u306E\u8A18\u9332\u306B\u5225\u306E\u30ED\u30B0\u30D5\u30A1\u30A4\u30EB\u3092\u4F7F\u7528\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u6307\u5B9A\u3057\u307E\u3059\u3002<a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Payara \u901A\u77E5\u30ED\u30AC\u30FC\u8A2D\u5B9A</a>\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066Payara\u901A\u77E5\u30B5\u30FC\u30D3\u30B9\u306E\u30ED\u30AE\u30F3\u30B0\u8A2D\u5B9A\u3092\u7DE8\u96C6\u3057\u307E\u3059\u3002
 tree.notification=\u901A\u77E5
@@ -209,8 +207,6 @@ notification.configuration.notifier.enabled=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1
 notification.configuration.notifier.enabledHelp=\u901A\u77E5\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u6709\u52B9\u307E\u305F\u306F\u7121\u52B9\u306B\u3057\u307E\u3059\u3002
 notification.configuration.notifier.dynamic=\u52D5\u7684\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC
 notification.configuration.notifier.dynamicHelp=\u5FC5\u8981\u306B\u5FDC\u3058\u3066Payara\u306E\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u3092\u958B\u59CB\u307E\u305F\u306F\u505C\u6B62\u3057\u307E\u3059\u3002
-notification.configuration.notifier.noisyLabel=Noisy
-notification.configuration.notifier.noisyLabelHelpText=\u95BE\u5024\u306E\u30C1\u30A7\u30C3\u30AF\u3092\u884C\u308F\u305A\u3001\u5E38\u306B\u3059\u3079\u3066\u901A\u77E5\u5BFE\u8C61\u306B\u3057\u307E\u3059\u3002
 notification.configuration.notifier.name=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u30FB\u30B5\u30FC\u30D3\u30B9\u540D
 notification.configuration.notifier.nameHelp=\u30CE\u30FC\u30C6\u30A3\u30D5\u30A1\u30A4\u30E4\u30FC\u30FB\u30B5\u30FC\u30D3\u30B9\u306E\u540D\u79F0\u3067\u3059\u3002
 
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
index 35f289f65b3..19df5d1f06a 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
+++ b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -215,8 +215,6 @@ notification.configuration.dynamic=Dynamic
 notification.configuration.dynamicHelp=Starts or Stops the Notification Service in Payara if required.
 notification.configuration.logNotifierEnabled=Log Notifier Enabled
 notification.configuration.logNotifierEnabledHelp=Determines whether the Log Notifier is enabled.
-notification.configuration.logNotifierNoisy=Log Notifier Noisy
-notification.configuration.logNotifierNoisyHelp=Determines whether the Log Notifier is active even if HealthCheck's threshold is fine.
 notification.configuration.useSeparateLogFile=Use Separate Log File
 notification.configuration.useSeparateLogFileHelp=Determines whether to use separate log file for storing notifications. Click <a href="#{request.contextPath}/common/configuration/loggerGeneral.jsf?configName=#{pageSession.configName}">Payara Notification Logger Settings</a> to edit the logging settings for Payara Notification Service. 
 tree.notification=Notification
@@ -225,8 +223,6 @@ notification.configuration.notifier.enabled=Notifier Enable
 notification.configuration.notifier.enabledHelp=Enables or disables the Notification Notifier.
 notification.configuration.notifier.dynamic=Notifier Dynamic
 notification.configuration.notifier.dynamicHelp=Starts or Stops the Notifier in Payara if required.
-notification.configuration.notifier.noisyLabel=Noisy
-notification.configuration.notifier.noisyLabelHelpText=Does not check threshold, always apply notification
 notification.configuration.notifier.name=Notifier Service Name
 notification.configuration.notifier.nameHelp=Name of the Notifier Service
 

From 34b5a8db5d748b37929944aad4c48990ba5d392d Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:58:07 +0100
Subject: [PATCH 08/15] FISH-9691: Remove default value from noisy.

---
 .../notification/admin/BaseSetNotifierConfigurationCommand.java | 2 +-
 .../notification/admin/SetNotificationConfiguration.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index 3c8ba8ec7b3..b14551c6eea 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -94,7 +94,7 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     protected Boolean enabled;
 
     @Deprecated
-    @Param(name = "noisy", optional = true, defaultValue = "true", obsolete = true)
+    @Param(name = "noisy", optional = true, obsolete = true)
     protected Boolean noisy;
 
     @Param(name = "filter", optional = true, defaultValue = "WARNING")
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
index b13c0d4bddb..ee1d74a46aa 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
@@ -100,7 +100,7 @@ public class SetNotificationConfiguration implements AdminCommand {
     private Boolean useSeparateLogFile;
 
     @Deprecated
-    @Param(name = "noisy", defaultValue = "true", optional = true, obsolete = true)
+    @Param(name = "noisy", optional = true, obsolete = true)
     private Boolean noisy;
 
     @Inject

From 447726aa18d8468113c7182bcea1af5edd41d5af Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Mon, 30 Sep 2024 10:58:44 +0100
Subject: [PATCH 09/15] FISH-9691: Add accepted values to filter.

---
 .../notification/admin/BaseSetNotifierConfigurationCommand.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index b14551c6eea..669c5ca3388 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -97,7 +97,7 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     @Param(name = "noisy", optional = true, obsolete = true)
     protected Boolean noisy;
 
-    @Param(name = "filter", optional = true, defaultValue = "WARNING")
+    @Param(name = "filter", optional = true, acceptableValues = "info,warning,severe")
     protected String filter;
 
     @Override

From 110f2cfc4b1bbdd530c24fdaa03a19753d82d159 Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Mon, 30 Sep 2024 11:00:01 +0100
Subject: [PATCH 10/15] FISH-9691: Add filter to set-notification-configuration

---
 .../notification/admin/SetNotificationConfiguration.java      | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
index ee1d74a46aa..24a5ec9c0a2 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
@@ -103,6 +103,9 @@ public class SetNotificationConfiguration implements AdminCommand {
     @Param(name = "noisy", optional = true, obsolete = true)
     private Boolean noisy;
 
+    @Param(name = "filter", optional = true, acceptableValues = "info,warning,severe")
+    protected String filter;
+
     @Inject
     ServiceLocator serviceLocator;
 
@@ -150,6 +153,7 @@ private void enableNotificationNotifierConfigurerOnTarget(ActionReport actionRep
         params.add("target", target);
         params.add("enabled", notifierEnabled.toString());
         params.add("useSeparateLogFile", useSeparateLogFile.toString());
+        params.add("filter", filter);
         inv.parameters(params);
         inv.execute();
         // swallow the offline warning as it is not a problem

From 3f701cb68534fcb38c5753b0e22efa5a40b208fa Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:25:14 +0100
Subject: [PATCH 11/15] FISH-9693: Set filter options to uppercase.

---
 .../notification/admin/BaseSetNotifierConfigurationCommand.java | 2 +-
 .../notification/admin/SetNotificationConfiguration.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
index 669c5ca3388..48f4fd0b57e 100644
--- a/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
+++ b/nucleus/common/internal-api/src/main/java/fish/payara/internal/notification/admin/BaseSetNotifierConfigurationCommand.java
@@ -97,7 +97,7 @@ public abstract class BaseSetNotifierConfigurationCommand<C extends PayaraNotifi
     @Param(name = "noisy", optional = true, obsolete = true)
     protected Boolean noisy;
 
-    @Param(name = "filter", optional = true, acceptableValues = "info,warning,severe")
+    @Param(name = "filter", optional = true, acceptableValues = "INFO,WARNING,SEVERE")
     protected String filter;
 
     @Override
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
index 24a5ec9c0a2..83231a9bc29 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/SetNotificationConfiguration.java
@@ -103,7 +103,7 @@ public class SetNotificationConfiguration implements AdminCommand {
     @Param(name = "noisy", optional = true, obsolete = true)
     private Boolean noisy;
 
-    @Param(name = "filter", optional = true, acceptableValues = "info,warning,severe")
+    @Param(name = "filter", optional = true, acceptableValues = "INFO,WARNING,SEVERE")
     protected String filter;
 
     @Inject

From ab3c68a27bd32ccc2a36e83dd8d513a012955f3c Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Tue, 1 Oct 2024 14:25:35 +0100
Subject: [PATCH 12/15] FISH-9693: Add filter options to admin console.

---
 .../cdieventbus/cdiEventbusNotifierConfiguration.jsf     | 5 +++++
 .../resources/eventbus/eventbusNotifierConfiguration.jsf | 5 +++++
 .../src/main/resources/jms/jmsNotifierConfiguration.jsf  | 5 +++++
 .../fish/payara/admingui/extras/Strings.properties       | 5 ++++-
 .../src/main/resources/notification/notification.jsf     | 5 +++++
 .../admin/GetNotificationConfigurationCommand.java       | 9 ++++++---
 6 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
index f78c1966c9a..eae20f619cb 100644
--- a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
@@ -107,6 +107,11 @@
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+            </sun:property>
             <sun:property id="loopBackProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
                           label="$resource{i18ncebn.notifier.cdieventbus.configuration.loopBackEnabledLabel}"
diff --git a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
index 77c30321bfa..6c5b9f37e16 100644
--- a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
@@ -106,6 +106,11 @@ holder.
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+            </sun:property>
             <sun:property id="topicNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabel}"
                           helpText="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabelHelpText}">
diff --git a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
index a22a7665ec4..ebafb4b5c5e 100644
--- a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
+++ b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
@@ -106,6 +106,11 @@ holder.
                           helpText="$resource{i18nn.notification.configuration.notifier.dynamicHelp}">
                 <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
             </sun:property>
+            <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                          label="$resource{i18nn.notification.configuration.filter}"
+                          helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+            </sun:property>
             <sun:property id="contextFactoryClassProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18njn.notifier.jms.configuration.contextFactoryClassLabel}"  
                           helpText="$resource{i18njn.notifier.jms.configuration.contextFactoryClassLabelHelpText}">
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
index 19df5d1f06a..03c80a67720 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
+++ b/appserver/admingui/payara-console-extras/src/main/resources/fish/payara/admingui/extras/Strings.properties
@@ -213,6 +213,8 @@ notification.configuration.enabled=Notification Service Enabled
 notification.configuration.enabledHelp=Determines whether the Notification Service is enabled.
 notification.configuration.dynamic=Dynamic
 notification.configuration.dynamicHelp=Starts or Stops the Notification Service in Payara if required.
+notification.configuration.filter=Filter Level
+notification.configuration.filterHelp=Notifications below this severity level will be ignored by the notifier.
 notification.configuration.logNotifierEnabled=Log Notifier Enabled
 notification.configuration.logNotifierEnabledHelp=Determines whether the Log Notifier is enabled.
 notification.configuration.useSeparateLogFile=Use Separate Log File
@@ -225,7 +227,8 @@ notification.configuration.notifier.dynamic=Notifier Dynamic
 notification.configuration.notifier.dynamicHelp=Starts or Stops the Notifier in Payara if required.
 notification.configuration.notifier.name=Notifier Service Name
 notification.configuration.notifier.nameHelp=Name of the Notifier Service
-
+notification.configuration.notifier.filter=Filter Level
+notification.configuration.notifier.filterHelp=Notifications below this severity level will be ignored by the notifier.
 
 requestTracing.configurationTitle=Request Tracing Configuration
 requestTracing.configurationTitleHelp=Enable and configure the settings for the Request Tracing Service.
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
index eb7c28fc6f8..8a321c6cc8d 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
+++ b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
@@ -96,6 +96,11 @@ holder.
         <sun:property id="dynamic" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.dynamic}"  helpText="$resource{i18nn.notification.configuration.dynamicHelp}">
             <sun:checkbox id="dynamic" selected="#{pageSession.dynamic}" selectedValue="true" />
         </sun:property>
+        <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
+                      label="$resource{i18nn.notification.configuration.filter}"
+                      helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
+            <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+        </sun:property>
        <sun:property id="logNotifierEnabledProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.logNotifierEnabled}" helpText="$resource{i18nn.notification.configuration.logNotifierEnabledHelp}">
             <sun:checkbox id="logNotifierEnabledLabel" selected="#{pageSession.notifierEnabledSelected}" selectedValue="true" />
         </sun:property>
diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
index 5e1adc13fc2..4c0e5220f97 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/GetNotificationConfigurationCommand.java
@@ -129,7 +129,7 @@ public void execute(AdminCommandContext context) {
             return;
         }
 
-        String headers[] = {"Notifier Name", "Enabled", "Notifier Enabled"};
+        String[] headers = {"Notifier Name", "Enabled", "Notifier Enabled", "Filter Level"};
         ColumnFormatter columnFormatter = new ColumnFormatter(headers);
 
         Properties extraProps = new Properties();
@@ -137,7 +137,7 @@ public void execute(AdminCommandContext context) {
             
             final Class<?> notifierClass = serviceHandle.getActiveDescriptor().getImplementationClass();
 
-            Object values[] = new Object[3];
+            Object[] values = new Object[4];
             values[0] = getNotifierName(serviceHandle.getActiveDescriptor());
             values[1] = notificationServiceEnabled;
 
@@ -150,8 +150,10 @@ public void execute(AdminCommandContext context) {
 
             if (notifierConfig == null) {
                 values[2] = PayaraNotifierConfiguration.DEFAULT_ENABLED_VALUE;
+                values[3] = PayaraNotifierConfiguration.DEFAULT_EVENT_FILTER;
             } else {
                 values[2] = notifierConfig.getEnabled();
+                values[3] = notifierConfig.getFilter();
             }
 
             columnFormatter.addRow(values);
@@ -159,7 +161,8 @@ public void execute(AdminCommandContext context) {
             Map<String, Object> map = new HashMap<>(3);
             map.put("enabled", values[1]);
             map.put("notifierEnabled", values[2]);
-            if (notifierConfig != null && notifierConfig instanceof LogNotifierConfiguration) {
+            map.put("filter", values[3]);
+            if (notifierConfig instanceof LogNotifierConfiguration) {
                 map.put("useSeparateLogFile", ((LogNotifierConfiguration) notifierConfig).getUseSeparateLogFile());
             }
             extraProps.put("getNotificationConfiguration" + notifierClass.getSimpleName(), map);

From c7984188eef4a8ca1124165e55b5ee2a018e5c2f Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:10:13 +0000
Subject: [PATCH 13/15] FISH-10034: Reverse filter order.

---
 .../resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf  | 2 +-
 .../main/resources/eventbus/eventbusNotifierConfiguration.jsf   | 2 +-
 .../src/main/resources/jms/jmsNotifierConfiguration.jsf         | 2 +-
 .../src/main/resources/notification/notification.jsf            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
index eae20f619cb..ff4e45ea014 100644
--- a/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/cdieventbus-notifier-console-plugin/src/main/resources/cdieventbus/cdiEventbusNotifierConfiguration.jsf
@@ -110,7 +110,7 @@
             <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nn.notification.configuration.filter}"
                           helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
-                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
             </sun:property>
             <sun:property id="loopBackProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           rendered="#{pageSession.hazelcastEnabled == true}"
diff --git a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
index 6c5b9f37e16..2969a3e2415 100644
--- a/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
+++ b/appserver/admingui/eventbus-notifier-console-plugin/src/main/resources/eventbus/eventbusNotifierConfiguration.jsf
@@ -109,7 +109,7 @@ holder.
             <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nn.notification.configuration.filter}"
                           helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
-                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
             </sun:property>
             <sun:property id="topicNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nebn.notifier.eventbus.configuration.topicNameLabel}"
diff --git a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
index ebafb4b5c5e..fd083068f73 100644
--- a/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
+++ b/appserver/admingui/jms-notifier-console-plugin/src/main/resources/jms/jmsNotifierConfiguration.jsf
@@ -109,7 +109,7 @@ holder.
             <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                           label="$resource{i18nn.notification.configuration.filter}"
                           helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
-                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+                <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
             </sun:property>
             <sun:property id="contextFactoryClassProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18njn.notifier.jms.configuration.contextFactoryClassLabel}"  
diff --git a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
index 8a321c6cc8d..0c4e3db347e 100644
--- a/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
+++ b/appserver/admingui/payara-console-extras/src/main/resources/notification/notification.jsf
@@ -99,7 +99,7 @@ holder.
         <sun:property id="filter" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}"
                       label="$resource{i18nn.notification.configuration.filter}"
                       helpText="$resource{i18nn.notification.configuration.notifier.filterHelp}">
-            <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"INFO", "WARNING", "SEVERE"} />
+            <sun:dropDown id="filterDropdown" selected="#{pageSession.valueMap['filter']}" labels={"SEVERE", "WARNING", "INFO"} />
         </sun:property>
        <sun:property id="logNotifierEnabledProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" label="$resource{i18nn.notification.configuration.logNotifierEnabled}" helpText="$resource{i18nn.notification.configuration.logNotifierEnabledHelp}">
             <sun:checkbox id="logNotifierEnabledLabel" selected="#{pageSession.notifierEnabledSelected}" selectedValue="true" />

From a55d7e0be4154fbad955e37ee6d7695cc043998b Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:44:49 +0000
Subject: [PATCH 14/15] FISH-10016: Remove SNMP4J Repackager.

---
 .../external/snmp4j-repackaged/pom.xml        | 112 ------------------
 1 file changed, 112 deletions(-)
 delete mode 100644 appserver/packager/external/snmp4j-repackaged/pom.xml

diff --git a/appserver/packager/external/snmp4j-repackaged/pom.xml b/appserver/packager/external/snmp4j-repackaged/pom.xml
deleted file mode 100644
index 0c84b46c51b..00000000000
--- a/appserver/packager/external/snmp4j-repackaged/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~
-  ~  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-  ~
-  ~  Copyright (c) 2023 Payara Foundation and/or its affiliates. All rights reserved.
-  ~
-  ~  The contents of this file are subject to the terms of either the GNU
-  ~  General Public License Version 2 only ("GPL") or the Common Development
-  ~  and Distribution License("CDDL") (collectively, the "License").  You
-  ~  may not use this file except in compliance with the License.  You can
-  ~  obtain a copy of the License at
-  ~  https://github.com/payara/Payara/blob/main/LICENSE.txt
-  ~  See the License for the specific
-  ~  language governing permissions and limitations under the License.
-  ~
-  ~  When distributing the software, include this License Header Notice in each
-  ~  file and include the License file at glassfish/legal/LICENSE.txt.
-  ~
-  ~  GPL Classpath Exception:
-  ~  The Payara Foundation designates this particular file as subject to the "Classpath"
-  ~  exception as provided by the Payara Foundation in the GPL Version 2 section of the License
-  ~  file that accompanied this code.
-  ~
-  ~  Modifications:
-  ~  If applicable, add the following below the License Header, with the fields
-  ~  enclosed by brackets [] replaced by your own identifying information:
-  ~  "Portions Copyright [year] [name of copyright owner]"
-  ~
-  ~  Contributor(s):
-  ~  If you wish your version of this file to be governed by only the CDDL or
-  ~  only the GPL Version 2, indicate your decision by adding "[Contributor]
-  ~  elects to include this software in this distribution under the [CDDL or GPL
-  ~  Version 2] license."  If you don't indicate a single choice of license, a
-  ~  recipient has the option to distribute your version of this file under
-  ~  either the CDDL, the GPL Version 2 or to extend the choice of license to
-  ~  its licensees as provided above.  However, if you add GPL Version 2 code
-  ~  and therefore, elected the GPL Version 2 license, then the option applies
-  ~  only if the new code is made subject to such option by the copyright
-  ~  holder.
-  ~
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>fish.payara.server.internal.packager</groupId>
-        <artifactId>external</artifactId>
-        <version>6.2024.10-SNAPSHOT</version>
-    </parent>
-
-    <groupId>fish.payara.server.core.packager</groupId>
-    <artifactId>snmp4j-repackaged</artifactId>
-    <name>snmp4j repackaged as a module</name>
-    <description>snmp4j repackaged as a module</description>
-    <packaging>jar</packaging>
-
-    <properties>
-        <snmp4j.version>3.7.5</snmp4j.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>default-jar</id>
-                        <configuration>
-                            <skipIfEmpty>true</skipIfEmpty>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <configuration>
-                    <instructions>
-                        <Embed-Dependency>
-                            *;scope=compile;inline=true
-                        </Embed-Dependency>
-                        <!-- Export everything from snmp4j in the final bundle -->
-                        <Export-Package>*;version=${snmp4j.version}</Export-Package>
-                        <!-- Exclude unnecessary imports -->
-                        <Private-Package>!*</Private-Package>
-                    </instructions>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>osgi-bundle</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.snmp4j</groupId>
-            <artifactId>snmp4j</artifactId>
-            <version>${snmp4j.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>
\ No newline at end of file

From 6b407e427397acdf24a8e561057db1627c147f0a Mon Sep 17 00:00:00 2001
From: Rhys Williams <170514543+Viii3@users.noreply.github.com>
Date: Thu, 7 Nov 2024 16:00:33 +0000
Subject: [PATCH 15/15] FISH-10107: Set notifier testing to SEVERE.

---
 .../payara/nucleus/notification/admin/TestNotifier.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/TestNotifier.java b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/TestNotifier.java
index 47a51aad780..e0a6598f2a8 100644
--- a/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/TestNotifier.java
+++ b/nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/admin/TestNotifier.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2017-2021] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) [2017-2024] Payara Foundation and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -41,6 +41,7 @@
 
 import java.util.List;
 
+import fish.payara.internal.notification.EventLevel;
 import jakarta.inject.Inject;
 
 import org.glassfish.api.ActionReport;
@@ -105,7 +106,8 @@ public void execute(AdminCommandContext context) {
         PayaraNotificationBuilder builder = factory.newBuilder()
                 .eventType(EVENT_TYPE)
                 .subject(SUBJECT)
-                .message(MESSAGE);
+                .message(MESSAGE)
+                .level(EventLevel.SEVERE);
 
         if (all == null || !all) {
             if (notifiers == null || notifiers.isEmpty()) {