VRNSKY-18. Changes after review

Author: vrnsky

chapter10/Annotations/src/main/resources/log4j.properties

@@ -7,8 +7,11 @@
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import repos.AdvertRepo;
 import repos.CarRepo;
+
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
@@ -21,23 +24,21 @@
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * @author evrnsky(vrnsky at protonmail.ch)
  * @version 0.1
  * @since 30.03.2017
- *
+ * <p>
  * This servlet add new advert to the system.
  */
 @WebServlet("/newadvert")
-public class Adverter extends HttpServlet  {
+public class Adverter extends HttpServlet {
 
     /**
      * Instance of logger.
      */
-    private static final Logger LOG = Logger.getLogger(Adverter.class.getSimpleName());
+    private static final Logger log = LoggerFactory.getLogger(Adverter.class.getSimpleName());
 
     /**
      * Contains data which collected from the form.
@@ -46,10 +47,11 @@ public class Adverter extends HttpServlet  {
 
     /**
      * Forward request to the view.
-     * @param req from client to server.
+     *
+     * @param req  from client to server.
      * @param resp from server to client.
      * @throws ServletException if request for post could not be handled.
-     * @throws IOException if io error detected.
+     * @throws IOException      if io error detected.
      */
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -58,10 +60,11 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws Se
 
     /**
      * Collect data from form and processing it, and at the end add new advert.
-     * @param req from client to server.
+     *
+     * @param req  from client to server.
      * @param resp from server to client.
      * @throws ServletException if request for POST could not be handled.
-     * @throws IOException if an i/o error detected.
+     * @throws IOException      if an i/o error detected.
      */
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -77,20 +80,21 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws S
                 fillMapFromParsedRequest((User) session.getAttribute("user"), items);
                 FORM.clear();
             } catch (FileUploadException fue) {
-                LOG.log(Level.SEVERE, fue.getMessage(), fue);
+                log.error(fue.getMessage(), fue);
             }
 
         }
     }
 
     /**
      * Process data collecting at the post method and adding new advert.
-     * @param user instance of user class.
+     *
+     * @param user  instance of user class.
      * @param items data from client part of app.
      */
     private void fillMapFromParsedRequest(User user, List<FileItem> items) {
-        for (FileItem item: items) {
-            LOG.log(Level.INFO, String.format("Field:%s | Value:%s", item.getFieldName(), item.getString()));
+        for (FileItem item : items) {
+            log.info("Field:{} | Value:{}", item.getFieldName(), item.getString());
             if (item.isFormField()) {
                 FORM.put(item.getFieldName(), item.getString());
             } else {

chapter10/Config/src/main/resources/log4j.properties

@@ -1,13 +1,15 @@
 package file;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.logging.Logger;
 
 
 /**
@@ -24,7 +26,7 @@ public class TextSearcher extends Thread {
     /**
      * Logger for this class.
      */
-    private static final Logger LOG = Logger.getLogger(TextSearcher.class.getSimpleName());
+    private static final Logger log = LoggerFactory.getLogger(TextSearcher.class.getSimpleName());
 
     /**
      * Flag which signal about find text or not.
@@ -140,9 +142,9 @@ private boolean search(String disk) {
      */
     private void processingFile(File file, String text) {
         this.founded = readFile(file.getAbsolutePath(), text);
-        LOG.info(String.format("SEARCH AT: %s", file.getAbsolutePath()));
+        log.info(String.format("SEARCH AT: %s", file.getAbsolutePath()));
         if (this.founded) {
-            LOG.info(String.format("FOUND AT: %s", file.getAbsolutePath()));
+            log.info(String.format("FOUND AT: %s", file.getAbsolutePath()));
             synchronized (this.resultFiles) {
                 this.resultFiles.add(file.getAbsolutePath());
             }

chapter10/Mapping/src/main/java/controllers/Adverter.java

@@ -1,9 +1,10 @@
 package pool;
 
 
-import java.util.LinkedList;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.util.LinkedList;
 
 /**
  * @author evrnsky
@@ -17,7 +18,7 @@ public class ThreadPool {
     /**
      * Instance of logger.
      */
-    private static final Logger LOG = Logger.getLogger(ThreadPool.class.getSimpleName());
+    private static final Logger log = LoggerFactory.getLogger(ThreadPool.class.getSimpleName());
 
     /**
      * Boundary for count of thread which may accept this queue.
@@ -69,13 +70,14 @@ public void run() {
                 synchronized (queue) {
                     while (queue.isEmpty()) {
                         try {
-                            LOG.info("Pool at this moment is empty and wait task.");
+                            log.info("Pool at this moment is empty and wait task");
                             queue.wait();
                         } catch (InterruptedException e) {
-                            e.printStackTrace();
+                            log.warn("Thread interrupted while waiting for tasks: {}", e.getMessage());
+                            Thread.currentThread().interrupt();
                         }
                     }
-                    LOG.info("Pool going execute head of the list async task.");
+                    log.info("Pool going execute head of the list async task.");
                     r = queue.removeFirst();
                 }
 

chapter10/Mapping/src/main/resources/log4j.properties

@@ -1,8 +1,9 @@
 package queue;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
-import java.util.logging.Logger;
 
 /**
  * @author evrnsky
@@ -17,7 +18,7 @@ public class BlockingQueue<T> {
     /**
      * Instance of logger.
      */
-    private static final Logger LOG = Logger.getLogger(BlockingQueue.class.getSimpleName());
+    private static final Logger log = LoggerFactory.getLogger(BlockingQueue.class.getSimpleName());
 
     /**
      * Head of the queue.
@@ -60,11 +61,11 @@ public void add(T data) {
             if (this.tail == 0) {
                 this.tail++;
                 this.objects.add(data);
-                LOG.info("Now all threads get signal about resource is free.");
+                log.info("Now all threads get signal about resource is free.");
                 lock.notifyAll();
             } else if (this.tail != this.objects.size()) {
                 this.objects.add(data);
-                LOG.info("Now all threads get signal about resource is free.");
+                log.info("Now all threads get signal about resource is free.");
                 this.lock.notifyAll();
             } else {
                 throw new IllegalStateException("Queue is full.");
@@ -81,7 +82,7 @@ public T poll() {
         synchronized (lock) {
             while (this.isEmpty()) {
                 try {
-                    LOG.info("Wait until producer put data to the queue.");
+                    log.info("Wait until producer put data to the queue.");
                     lock.wait();
                 } catch (InterruptedException e) {
                     e.printStackTrace();

chapter11/IoC/src/main/resources/log4j.properties

@@ -1,7 +1,9 @@
 package queue;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
 
 /**
  * @author evrnsky
@@ -14,7 +16,7 @@ public class ProducerCustomer {
     /**
      * Instance of logger, show usefully information about program execution.
      */
-    private static final Logger LOG = Logger.getLogger(ProducerCustomer.class.getSimpleName());
+    private static final Logger log = LoggerFactory.getLogger(ProducerCustomer.class.getSimpleName());
 
     /**
      * Instance of blocking queue which provide a thread safe access to the elements.
@@ -30,7 +32,7 @@ public class ProducerCustomer {
      * Producer method which put data to the end of the queue.
      */
     public void produce() {
-        LOG.info(String.format("%s %s", "Now push to the end of queue is", number.get()));
+        log.info("{} {}", "Now push to the end of queue is", number.get());
         queue.add(String.format("%s", number.get()));
         number.incrementAndGet();
     }
@@ -39,29 +41,24 @@ public void produce() {
      * Consume method which takes data from the head of the queue.
      */
     public void consume() {
-        LOG.info(String.format("%s %s", "Received from producer: ", queue.poll()));
+        String item = queue.poll();
+        if (item != null) {
+            log.info("Received from producer: {}", item);
+        } else {
+            log.warn("Received a null from queue");
+        }
     }
 
     /**
      * Entry point of app.
+     *
      * @param args keys for app.
-     * @throws InterruptedException if some problem with threads.
      */
-    public static void main(String[] args) throws InterruptedException {
+    public static void main(String[] args) {
         ProducerCustomer template = new ProducerCustomer();
-        Runnable producer = new Runnable() {
-            @Override
-            public void run() {
-                template.produce();
-            }
-        };
+        Runnable producer = template::produce;
 
-        Runnable consumer = new Runnable() {
-            @Override
-            public void run() {
-                template.consume();
-            }
-        };
+        Runnable consumer = template::consume;
 
         Thread publisher = new Thread(producer);
         Thread subscriber = new Thread(consumer);