FISH-1181 FISH-1182 Fix conflicting param names

Signed-off-by: Andrew Pielage <[email protected]>
payara · Mar 11, 2021 · 55cda2c · 55cda2c
1 parent 2ee41e7
commit 55cda2c
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/...rc/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java b/...rc/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java
@@ -93,7 +93,7 @@ public class SnmpNotificationConfigurer extends BaseSetNotifierConfigurationComm
     @Param(name = "hostName")
     private String hostName;
 
-    @Param(name = "port", defaultValue = "162", optional = true)
+    @Param(name = "snmpPort", defaultValue = "162", optional = true, alias = "snmpport")
     private Integer port;
 
     @Override

diff --git a/...rc/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java b/...rc/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java
@@ -84,7 +84,7 @@ public class XmppNotificationConfigurer extends BaseSetNotifierConfigurationComm
     @Param(name = "hostName")
     private String hostName;
 
-    @Param(name = "port", defaultValue = "5222", optional = true)
+    @Param(name = "xmppPort", defaultValue = "5222", optional = true, alias = "xmppport")
     private Integer port;
 
     @Param(name = "serviceName")

diff --git a/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf b/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf
@@ -143,7 +143,7 @@ holder.
                           label="$resource{i18nsnn.notifier.snmp.configuration.portLabel}"  
                           helpText="$resource{i18nsnn.notifier.snmp.configuration.portLabelHelpText}">
                 <sun:textField id="portField" columns="$int{75}" maxLength="255" styleClass="port"
-                               text="#{pageSession.valueMap['port']}" />
+                               text="#{pageSession.valueMap['snmpPort']}" />
             </sun:property>
         </sun:propertySheetSection>
     </sun:propertySheet>

diff --git a/.../main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java b/.../main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java
@@ -79,7 +79,7 @@ protected Map<String, Object> getNotifierConfiguration(SnmpNotifierConfiguration
             map.put("OID", configuration.getOid());
             map.put("Version", configuration.getVersion());
             map.put("Host Name", configuration.getHost());
-            map.put("Port", configuration.getPort());
+            map.put("SNMP Port", configuration.getPort());
         }
 
         return map;

diff --git a/.../main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java b/.../main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java
@@ -83,7 +83,7 @@ public class SetSnmpNotifierConfigurationCommand extends BaseSetNotifierConfigur
     @Param(name = "hostName")
     private String hostName;
 
-    @Param(name = "port", defaultValue = "162", optional = true)
+    @Param(name = "snmpPort", defaultValue = "162", optional = true, alias = "snmpport")
     private Integer port;
 
     @Override

diff --git a/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf b/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf
@@ -132,7 +132,7 @@ holder.
                           label="$resource{i18nxn.notifier.xmpp.configuration.portLabel}"  
                           helpText="$resource{i18nxn.notifier.xmpp.configuration.portLabelHelpText}">
                 <sun:textField id="portField" columns="$int{75}" maxLength="255" styleClass="port"
-                               text="#{pageSession.valueMap['port']}" />
+                               text="#{pageSession.valueMap['xmppPort']}" />
             </sun:property>
             <sun:property id="serviceNameProp" labelAlign="left" noWrap="#{true}" overlapLabel="#{false}" 
                           label="$resource{i18nxn.notifier.xmpp.configuration.serviceNameLabel}"  

diff --git a/...c/main/java/fish/payara/extensions/notifier/xmpp/GetXmppNotifierConfigurationCommand.java b/...c/main/java/fish/payara/extensions/notifier/xmpp/GetXmppNotifierConfigurationCommand.java
@@ -76,7 +76,7 @@ protected Map<String, Object> getNotifierConfiguration(XmppNotifierConfiguration
 
         if (configuration != null) {
             map.put("Host Name", configuration.getHost());
-            map.put("Port", configuration.getPort());
+            map.put("XMPP Port", configuration.getPort());
             map.put("Service Name", configuration.getServiceName());
             map.put("Username", configuration.getUsername());
             map.put("Password", configuration.getPassword());

diff --git a/...c/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java b/...c/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java
@@ -74,7 +74,7 @@ public class SetXmppNotifierConfigurationCommand extends BaseSetNotifierConfigur
     @Param(name = "hostName")
     private String hostName;
 
-    @Param(name = "port", defaultValue = "5222", optional = true)
+    @Param(name = "xmppPort", defaultValue = "5222", optional = true, alias = "xmppport")
     private Integer port;
 
     @Param(name = "serviceName")