added dependency injection to sugared logger

Author: gkcs

java-projects/output.txt

@@ -1,14 +1,19 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import logger.FastLogger;
 import modules.LoggingModule;
 import modules.PropertiesModule;
 
 import java.util.concurrent.ExecutionException;
 
 public class Main {
-    public static void main(String[] args) throws ExecutionException, InterruptedException {
-        final Injector injector = Guice.createInjector(new PropertiesModule(), new LoggingModule());
+    public static void main(String[] args) {
+        Injector injector = Guice.createInjector(new PropertiesModule(), new LoggingModule());
         final TaskManager taskManager = injector.getInstance(TaskManager.class);
-        taskManager.execute().get();
+        try {
+            taskManager.execute().get();
+        } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
+        }
     }
 }

java-projects/src/main/java/Main.java

@@ -1,12 +1,17 @@
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import logger.Logger;
 import logger.SugaredLogger;
 
 import java.util.concurrent.CompletableFuture;
 
+@Singleton
 public class TaskManager {
-    private final SugaredLogger logger;
+    private final Logger logger;
 
-    public TaskManager() {
-        this.logger = SugaredLogger.getLogger(System.out);
+    @Inject
+    public TaskManager(final Logger logger) {
+        this.logger = logger;
     }
 
     public CompletableFuture<Void> execute() {

java-projects/src/main/java/TaskManager.java

@@ -18,7 +18,7 @@ public class FastLogger implements Logger {
 
     @Inject
     public FastLogger(@Named("logger.fast.identifier") final String identifier,
-                      final OutputStream stream,
+                      @Named("console-output-stream") final OutputStream stream,
                       @Named("logger.fast.buffer.size") final Integer bufferSize) {
         this.identifier = identifier;
         this.stream = stream;

java-projects/src/main/java/logger/FastLogger.java

@@ -1,7 +1,5 @@
 package logger;
 
-import exceptions.LoggingException;
-
 import java.util.concurrent.CompletableFuture;
 
 public interface Logger {

java-projects/src/main/java/logger/Logger.java

@@ -1,5 +1,8 @@
 package logger;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
 import exceptions.LoggingException;
 
 import java.io.IOException;
@@ -10,26 +13,19 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-public class SugaredLogger {
-    private static SugaredLogger SUGARED_LOGGER;
+@Singleton
+public class SugaredLogger implements Logger {
     private final String identifier;
     private final OutputStream stream;
     private final List<String> buffer;
 
-    private SugaredLogger(final OutputStream stream) {
+    @Inject
+    public SugaredLogger(final OutputStream stream, @Named("logger.fast.identifier")  String identifier) {
         this.stream = stream;
-        identifier = "service:";
+        this.identifier = identifier;
         buffer = new ArrayList<>();
     }
 
-
-    public static synchronized SugaredLogger getLogger(OutputStream out) {
-        if (SUGARED_LOGGER == null) {
-            SUGARED_LOGGER = new SugaredLogger(out);
-        }
-        return SUGARED_LOGGER;
-    }
-
     public boolean write(final String word) {
         buffer.add(identifier + " " + word + "\n");
         return true;

java-projects/src/main/java/logger/SugaredLogger.java

@@ -5,6 +5,7 @@
 import com.google.inject.name.Named;
 import logger.FastLogger;
 import logger.Logger;
+import logger.SugaredLogger;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -19,7 +20,14 @@ public void configure() {
     }
 
     @Provides
+    @Named("file-output-stream")
     public OutputStream getOutputStream(@Named("output-file.name") String fileLocation) throws FileNotFoundException {
         return new FileOutputStream(fileLocation);
     }
+
+    @Provides
+    @Named("console-output-stream")
+    public OutputStream getConsoleOutputStream(@Named("output-file.name") String fileLocation) throws FileNotFoundException {
+        return System.out;
+    }
 }