refactor

remove some low-value code ceremony and simplify

Author: goekay

src/main/java/de/rwth/idsg/steve/Application.java

@@ -18,22 +18,25 @@
  */
 package de.rwth.idsg.steve;
 
+import de.rwth.idsg.steve.utils.LogFileRetriever;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
+import java.nio.file.Path;
+import java.util.Optional;
 import java.util.TimeZone;
 
 /**
  * @author Sevket Goekay <[email protected]>
  * @since 14.01.2015
  */
 @Slf4j
-public class Application implements ApplicationStarter, AutoCloseable {
+public class Application {
 
-    private final ApplicationStarter delegate;
+    private final JettyServer server = new JettyServer();
 
-    public Application() {
+    public static void main(String[] args) throws Exception {
         // For Hibernate validator
         System.setProperty("org.jboss.logging.provider", "slf4j");
 
@@ -44,50 +47,38 @@ public Application() {
         DateTimeZone.setDefault(DateTimeZone.forID(sc.getTimeZoneId()));
         log.info("Date/time zone of the application is set to {}. Current date/time: {}", sc.getTimeZoneId(), DateTime.now());
 
-        switch (sc.getProfile()) {
-            case DEV:
-            case TEST:
-                delegate = new SteveDevStarter();
-                break;
-            case PROD:
-                delegate = new SteveProdStarter();
-                break;
-            default:
-                throw new RuntimeException("Unexpected profile");
+        Optional<Path> path = LogFileRetriever.INSTANCE.getPath();
+        boolean loggingToFile = path.isPresent();
+        if (loggingToFile) {
+            System.out.println("Log file: " + path.get().toAbsolutePath());
         }
-    }
 
-    public static void main(String[] args) throws Exception {
-        Application app = null;
+        Application app = new Application();
+
         try {
-            app = new Application();
             app.start();
             app.join();
         } catch (Exception e) {
             log.error("Application failed to start", e);
-            if (app != null) {
-                app.stop();
+
+            if (loggingToFile) {
+                System.err.println("Application failed to start");
+                e.printStackTrace();
             }
+
+            app.stop();
         }
     }
 
-    @Override
     public void start() throws Exception {
-        delegate.start();
+        server.start();
     }
 
-    @Override
     public void join() throws Exception {
-        delegate.join();
+        server.join();
     }
 
-    @Override
     public void stop() throws Exception {
-        delegate.stop();
-    }
-
-    @Override
-    public void close() throws Exception {
-        stop();
+        server.stop();
     }
 }