PAYARA-1696 stop previous thread when notifier is configured

appserver/payara-appserver-modules/notification-datadog-core/src/main/java/fish/payara/notification/datadog/DatadogNotifierService.java

@@ -81,8 +81,4 @@ public void bootstrap() {
         scheduleExecutor(new DatadogNotificationRunnable(queue, executionOptions));
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
 }

appserver/payara-appserver-modules/notification-email-core/src/main/java/fish/payara/notification/email/EmailNotifierService.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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,8 +101,4 @@ public void bootstrap() {
         }
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
 }

appserver/payara-appserver-modules/notification-hipchat-core/src/main/java/fish/payara/notification/hipchat/HipchatNotifierService.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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
@@ -81,8 +81,4 @@ public void bootstrap() {
         scheduleExecutor(new HipchatNotificationRunnable(queue, executionOptions));
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
 }

appserver/payara-appserver-modules/notification-jms-core/src/main/java/fish/payara/notification/jms/JmsNotifierService.java

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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
@@ -123,11 +123,6 @@ public void bootstrap() {
         }
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
-
     @Override
     @Subscribe
     public void handleNotification(JmsNotificationEvent event) {

appserver/payara-appserver-modules/notification-newrelic-core/src/main/java/fish/payara/notification/newrelic/NewRelicNotifierService.java

@@ -80,9 +80,5 @@ public void bootstrap() {
         executionOptions = (NewRelicNotifierConfigurationExecutionOptions) getNotifierConfigurationExecutionOptions();
         scheduleExecutor(new NewRelicNotificationRunnable(queue, executionOptions));
     }
-
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
+
 }

appserver/payara-appserver-modules/notification-slack-core/src/main/java/fish/payara/notification/slack/SlackNotifierService.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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
@@ -82,8 +82,4 @@ public void bootstrap() {
         scheduleExecutor(new SlackNotificationRunnable(queue, executionOptions));
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
 }

appserver/payara-appserver-modules/notification-snmp-core/src/main/java/fish/payara/notification/snmp/SnmpNotifierService.java

@@ -123,7 +123,7 @@ public void bootstrap() {
 
     @Override
     public void shutdown() {
-        super.reset();
+        super.shutdown();
         if (snmp != null) {
             try {
                 snmp.close();

appserver/payara-appserver-modules/notification-xmpp-core/src/main/java/fish/payara/notification/xmpp/XmppNotifierService.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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
@@ -116,7 +116,7 @@ public void bootstrap() {
 
     @Override
     public void shutdown() {
-        super.reset();
+        super.shutdown();
         if (connection != null) {
             connection.disconnect();
         }

nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/service/BaseNotifierService.java

@@ -124,6 +124,11 @@ public NotifierConfigurationExecutionOptions getNotifierConfigurationExecutionOp
         return null;
     }
 
+    /**
+     * Unregisters a service and cleans up any information stored in it
+     * This function does NOT restart the service.
+     * @param service 
+     */
     protected void reset(BaseNotifierService service) {
         eventBus.unregister(service);
     }

nucleus/payara-modules/notification-core/src/main/java/fish/payara/nucleus/notification/service/QueueBasedNotifierService.java

@@ -1,6 +1,6 @@
 /*
  *
- * Copyright (c) 2016 Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016-2017 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
@@ -85,12 +85,27 @@ protected ScheduledFuture scheduleExecutor(NotificationRunnable notificationRunn
                 TimeUnit.MILLISECONDS);
     }
 
+    /**
+     * Unregisters the service and cleans up any information stored in it
+     * This function does NOT restart the service.
+     */
     protected void reset() {
         super.reset(this);
         queue.resetQueue();
         if (scheduledFuture != null) {
             scheduledFuture.cancel(true);
         }
-        initializeExecutor();
+        //initializeExecutor();
+    }
+
+    /**
+     * Shuts down the service
+     */
+    @Override
+    public void shutdown(){
+        if (executor != null){
+            executor.shutdown();
+        }
+        reset();
     }
 }

nucleus/payara-modules/notification-eventbus-core/src/main/java/fish/payara/notification/eventbus/core/EventbusNotifierService.java

@@ -86,8 +86,4 @@ public void bootstrap() {
         executionOptions = (EventbusNotifierConfigurationExecutionOptions) getNotifierConfigurationExecutionOptions();
     }
 
-    @Override
-    public void shutdown() {
-        super.reset();
-    }
 }