Merge "Sonar fix: Notification.java"

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / server / AbsServiceStarter.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
index 29166b0..fe610e5 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
@@ -19,10 +19,16 @@
  *
  */
 package org.onap.aaf.auth.server;
+import java.io.IOException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.auth.org.OrganizationFactory;
 import org.onap.aaf.auth.rserv.RServlet;
 import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.cadi.register.Registrar;
 import org.onap.aaf.misc.env.Trans;
@@ -39,8 +45,8 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
         try {
             OrganizationFactory.init(service.env);
         } catch (OrganizationException e) {
-            service.access.log(e, "Missing defined Organzation Plugins");
-            System.exit(3);
+            service.access.log(e, "Missing defined Organization Plugins");
+               System.exit(3);
         }
         // do_register - this is used for specialty Debug Situations.  Developer can create an Instance for a remote system
         // for Debugging purposes without fear that real clients will start to call your debug instance
@@ -61,14 +67,30 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
 
     @Override
     public final void start() throws Exception {
-        _start(service);
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                shutdown();
-            }
-        });
+       ExecutorService es = Executors.newSingleThreadExecutor();
+       Future<?> app = es.submit(this);
+        final AbsServiceStarter<?,?> absSS = this;
+       Runtime.getRuntime().addShutdownHook(new Thread() {
+             @Override
+          public void run() {
+                 absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.app_name, absSS.service.app_version);
+                 absSS.shutdown();
+                 app.cancel(true);
+             }
+       });
+               if(System.getProperty("ECLIPSE", null)!=null) {
+                       Thread.sleep(2000);
+               System.out.println("Service Started in Eclipse: ");
+               System.out.print("  Hit <enter> to end:");
+               try {
+                               System.in.read();
+                               System.exit(0);
+                       } catch (IOException e) {
+                       }
+               }
+
     }
+    
 
     @SafeVarargs
     public final synchronized void register(final Registrant<ENV> ... registrants) {
@@ -83,6 +105,15 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
     }
 
     @Override
+       public void run() {
+        try {
+                       _start(service);
+               } catch (Exception e) {
+                       e.printStackTrace();
+               }
+       }
+
+       @Override
     public void shutdown() {
         if (registrar!=null) {
             registrar.close(env());