1 files changed, 25 insertions, 49 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java b/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
index 6e251db2d..b7ff82afe 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/LoggerController.java
@@ -20,10 +20,16 @@
 
 package org.onap.vid.controller;
 
-import ch.qos.logback.classic.LoggerContext;
-import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.FileAppender;
-import ch.qos.logback.core.spi.AppenderAttachable;
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.InternalServerErrorException;
+import javax.ws.rs.NotAuthorizedException;
 import org.apache.commons.io.input.ReversedLinesFileReader;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
@@ -32,23 +38,15 @@ import org.onap.vid.model.ExceptionResponse;
 import org.onap.vid.roles.Role;
 import org.onap.vid.roles.RoleProvider;
 import org.onap.vid.utils.Streams;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.InternalServerErrorException;
-import javax.ws.rs.NotAuthorizedException;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.Objects;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static com.att.eelf.configuration.Configuration.GENERAL_LOGGER_NAME;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
@@ -56,11 +54,16 @@ import static com.att.eelf.configuration.Configuration.GENERAL_LOGGER_NAME;
 public class LoggerController extends RestrictedBaseController {
 
     private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(LoggerController.class);
+    private RoleProvider roleProvider;
+    private LogfilePathCreator logfilePathCreator;
 
     @Autowired
-    RoleProvider roleProvider;
+    public LoggerController(RoleProvider roleProvider, LogfilePathCreator logfilePathCreator) {
+        this.roleProvider = roleProvider;
+        this.logfilePathCreator = logfilePathCreator;
+    }
 
-    @RequestMapping(value = "/{loggerName:audit|error|metrics}", method = RequestMethod.GET)
+    @GetMapping(value = "/{loggerName:audit|error|metrics}")
     public String getLog(@PathVariable String loggerName, HttpServletRequest request,
                          @RequestParam(value="limit", defaultValue = "5000") Integer limit) throws IOException {
 
@@ -70,8 +73,7 @@ public class LoggerController extends RestrictedBaseController {
             throw new NotAuthorizedException("User not authorized to get logs");
         }
 
-        String logfilePath = getLogfilePath(loggerName);
-
+        String logfilePath = logfilePathCreator.getLogfilePath(loggerName);
         try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath))) {
             Supplier<String> reverseLinesSupplier = () -> {
                 try {
@@ -94,32 +96,6 @@ public class LoggerController extends RestrictedBaseController {
         }
     }
 
-    private String getLogfilePath(String loggerName) {
-        /*
-        Find the requested logger, and pull all of it's appenders.
-        Find the first of the appenders that is a FileAppender, and return it's
-        write-out filename.
-         */
-        LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
-        return context.getLoggerList().stream()
-                .filter(logger -> logger.getName().equals(GENERAL_LOGGER_NAME + "." + loggerName))
-                .flatMap(this::pullSubAppenders)
-                .flatMap(appender -> {
-                    // Appender might be "attachable", if so - roll-up its sub-appenders
-                    return (appender instanceof AppenderAttachable) ?
-                            pullSubAppenders((AppenderAttachable<?>) appender) : Stream.of(appender);
-                })
-                .filter(appender -> appender instanceof FileAppender)
-                .map(appender -> (FileAppender<?>) appender)
-                .map(FileAppender::getFile)
-                .findFirst()
-                .orElseThrow(() -> new InternalServerErrorException("logfile for " + loggerName + " not found"));
-    }
-
-    private <T> Stream<Appender<T>> pullSubAppenders(AppenderAttachable<T> logger) {
-        return Streams.fromIterator(logger.iteratorForAppenders());
-    }
-
     @ExceptionHandler({ NotAuthorizedException.class })
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
     public String notAuthorizedHandler(NotAuthorizedException e) {