changed logging

Author: phasenraum2010

src/main/java/org/woehlke/learn/learnneo4j/configuration/StartupListener.java

@@ -1,7 +1,7 @@
 package org.woehlke.learn.learnneo4j.configuration;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -15,7 +15,7 @@
 @Component
 public class StartupListener implements ApplicationListener<ContextRefreshedEvent> {
 
-    private static Logger log = LoggerFactory.getLogger(StartupListener.class.getName());
+    private static final Log log = LogFactory.getLog(StartupListener.class);
 
     private final CategoryRepository categoryRepository;
 

src/main/java/org/woehlke/learn/learnneo4j/frontend/control/closed/terminal/TerminalController.java

@@ -1,6 +1,8 @@
 package org.woehlke.learn.learnneo4j.frontend.control.closed.terminal;
 
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -12,18 +14,21 @@
 @RequestMapping("/adm/")
 public class TerminalController {
 
-    private final TerminalService terminalService;
-
-    @Autowired
-    public TerminalController(TerminalService terminalService) {
-        this.terminalService = terminalService;
-    }
-
     @GetMapping("/portinfo/available/fetch")
     public String greeting(@RequestParam(name="name", required=false, defaultValue="World") String name, Model model) {
         String result = "DONE";
         terminalService.getAllAvailablePorts();
         model.addAttribute("result", result);
         return "adm/portinfo/available/fetch";
     }
+
+    private static final Log log = LogFactory.getLog(TerminalController.class);
+
+    private final TerminalService terminalService;
+
+    @Autowired
+    public TerminalController(TerminalService terminalService) {
+        this.terminalService = terminalService;
+    }
+
 }

src/main/java/org/woehlke/learn/learnneo4j/frontend/control/closed/terminal/TerminalServiceImpl.java

@@ -1,20 +1,21 @@
 package org.woehlke.learn.learnneo4j.frontend.control.closed.terminal;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.stereotype.Service;
 import org.woehlke.learn.learnneo4j.middleware.StreamGobbler;
 
+import javax.transaction.Transactional;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.concurrent.Executors;
 
 @Service
+@Transactional
 public class TerminalServiceImpl implements TerminalService {
 
-    private static Logger log = LoggerFactory.getLogger(TerminalServiceImpl.class.getName());
-
+    @Override
     public void getAllAvailablePorts() {
         int exitCode = 0;
         try {
@@ -47,4 +48,6 @@ public void getAllAvailablePorts() {
         }
         assert exitCode == 0;
     }
+
+    private static final Log log = LogFactory.getLog(TerminalServiceImpl.class);
 }

src/main/java/org/woehlke/learn/learnneo4j/frontend/control/open/home/WelcomeController.java

@@ -1,23 +1,28 @@
 package org.woehlke.learn.learnneo4j.frontend.control.open.home;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-
 @Controller
 public class WelcomeController {
 
+    @GetMapping("/welcome")
+    public String home(Model model) {
+        model.addAttribute("title", "Home");
+        return "open/welcome";
+    }
+
     private final WelcomeService welcomeService;
 
     @Autowired
     public WelcomeController(WelcomeService welcomeService) {
         this.welcomeService = welcomeService;
     }
 
-    @GetMapping("/welcome")
-    public String home(Model model) {
-        model.addAttribute("title","Home");
-        return "open/welcome";
-    }
+
+    private static final Log log = LogFactory.getLog(WelcomeController.class);
+
 }

src/main/java/org/woehlke/learn/learnneo4j/frontend/control/open/home/WelcomeServiceImpl.java

@@ -1,6 +1,8 @@
 package org.woehlke.learn.learnneo4j.frontend.control.open.home;
 
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.woehlke.learn.learnneo4j.model.graph.maintainer.MaintainerRepository;
@@ -10,7 +12,10 @@
 import org.woehlke.learn.learnneo4j.model.graph.category.CategoryRepository;
 import org.woehlke.learn.learnneo4j.model.graph.license.LicenseRepository;
 
+import javax.transaction.Transactional;
+
 @Service
+@Transactional
 public class WelcomeServiceImpl implements WelcomeService {
 
     private final PortRepository portRepository;
@@ -35,4 +40,5 @@ public WelcomeServiceImpl(PortRepository portRepository, CategoryRepository cate
         this.variantRepository = variantRepository;
     }
 
+    private static final Log log = LogFactory.getLog(WelcomeServiceImpl.class);
 }

src/main/java/org/woehlke/learn/learnneo4j/middleware/StreamGobbler.java

@@ -1,14 +1,13 @@
 package org.woehlke.learn.learnneo4j.middleware;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import java.io.*;
 import java.util.concurrent.Callable;
 
 public class StreamGobbler implements Callable<StreamGobbler> {
 
-    private static Logger log = LoggerFactory.getLogger(StreamGobbler.class.getName());
+    private static final Log log = LogFactory.getLog(StreamGobbler.class);
 
     protected final InputStream inStream;
     protected final OutputStream outStream;

src/main/java/org/woehlke/learn/learnneo4j/model/graph/category/CategoryController.java

@@ -1,7 +1,7 @@
 package org.woehlke.learn.learnneo4j.model.graph.category;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -17,7 +17,7 @@
 @RequestMapping("/node/category")
 public class CategoryController {
 
-    private static Logger log = LoggerFactory.getLogger(CategoryController.class.getName());
+    private static final Log log = LogFactory.getLog(CategoryController.class);
 
     private final CategoryService categoryService;
 

src/main/java/org/woehlke/learn/learnneo4j/model/graph/category/CategoryServiceImpl.java

@@ -1,5 +1,7 @@
 package org.woehlke.learn.learnneo4j.model.graph.category;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,4 +21,6 @@ protected CategoryRepository getRepository(){
         return (CategoryRepository) super.getRepository();
     }
 
+    private static final Log log = LogFactory.getLog(CategoryServiceImpl.class);
+
 }

src/main/java/org/woehlke/learn/learnneo4j/model/graph/license/LicenseController.java

@@ -1,7 +1,7 @@
 package org.woehlke.learn.learnneo4j.model.graph.license;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -13,7 +13,7 @@
 @RequestMapping("/node/license")
 public class LicenseController {
 
-    private static Logger log = LoggerFactory.getLogger(LicenseController.class.getName());
+    private static final Log log = LogFactory.getLog(LicenseController.class);
 
     private final LicenseService licenseService;
 

src/main/java/org/woehlke/learn/learnneo4j/model/graph/license/LicenseServiceImpl.java

@@ -1,5 +1,7 @@
 package org.woehlke.learn.learnneo4j.model.graph.license;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -19,4 +21,6 @@ protected LicenseRepository getRepository(){
         return (LicenseRepository) super.getRepository();
     }
 
+    private static final Log log = LogFactory.getLog(LicenseServiceImpl.class);
+
 }