Merge pull request #599 from mookkiah/587_intercepting-filter

#587 sonarqube bugs

intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java

@@ -24,8 +24,6 @@ package com.iluwatar.intercepting.filter;
 
 import java.awt.BorderLayout;
 import java.awt.GridLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JFrame;
@@ -37,20 +35,20 @@ import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
 
 /**
- * The Client class is responsible for handling the input and running them through filters inside
+ * The Client class is responsible for handling the input and running them through filters inside the
- * the {@link FilterManager}.
+ * {@link FilterManager}.
  *
- * This is where {@link Filter}s come to play as the client pre-processes the request before being
+ * This is where {@link Filter}s come to play as the client pre-processes the request before being displayed in the
- * displayed in the {@link Target}.
+ * {@link Target}.
  * 
  * @author joshzambales
  *
  */
-public class Client extends JFrame {
+public class Client extends JFrame { // NOSONAR
 
   private static final long serialVersionUID = 1L;
 
-  private FilterManager filterManager;
+  private transient FilterManager filterManager;
   private JLabel jl;
   private JTextField[] jtFields;
   private JTextArea[] jtAreas;
@@ -98,26 +96,19 @@ public class Client extends JFrame {
     panel.add(clearButton);
     panel.add(processButton);
 
-    clearButton.addActionListener(new ActionListener() {
+    clearButton.addActionListener(e -> {
-      @Override
+      for (JTextArea i : jtAreas) {
-      public void actionPerformed(ActionEvent e) {
+        i.setText("");
-        for (JTextArea i : jtAreas) {
+      }
-          i.setText("");
+      for (JTextField i : jtFields) {
-        }
+        i.setText("");
-        for (JTextField i : jtFields) {
-          i.setText("");
-        }
       }
     });
 
-    processButton.addActionListener(new ActionListener() {
+    processButton.addActionListener(e -> {
-      @Override
+      Order order = new Order(jtFields[0].getText(), jtFields[1].getText(), jtAreas[0].getText(), jtFields[2].getText(),
-      public void actionPerformed(ActionEvent e) {
+          jtAreas[1].getText());
-        Order order =
+      jl.setText(sendRequest(order));
-            new Order(jtFields[0].getText(), jtFields[1].getText(), jtAreas[0].getText(),
-                jtFields[2].getText(), jtAreas[1].getText());
-        jl.setText(sendRequest(order));
-      }
     });
 
     JRootPane rootPane = SwingUtilities.getRootPane(processButton);

intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java

@@ -32,11 +32,6 @@ public class FilterChain {
 
   private Filter chain;
 
-  /**
-   * Constructor
-   */
-  public FilterChain() {
-  }
 
   /**
    * Adds filter

intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java

@@ -32,7 +32,7 @@ public class Order {
   private String contactNumber;
   private String address;
   private String depositNumber;
-  private String order;
+  private String orderItem;
 
   public Order() {}
 
@@ -44,7 +44,7 @@ public class Order {
     this.contactNumber = contactNumber;
     this.address = address;
     this.depositNumber = depositNumber;
-    this.order = order;
+    this.orderItem = order;
   }
 
   public String getName() {
@@ -79,11 +79,11 @@ public class Order {
     this.depositNumber = depositNumber;
   }
 
-  public String getOrder() {
+  public String getOrderItem() {
-    return order;
+    return orderItem;
   }
 
-  public void setOrder(String order) {
+  public void setOrderItem(String order) {
-    this.order = order;
+    this.orderItem = order;
   }
 }

intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java

@@ -33,7 +33,7 @@ public class OrderFilter extends AbstractFilter {
   @Override
   public String execute(Order order) {
     String result = super.execute(order);
-    if (order.getOrder() == null || order.getOrder().isEmpty()) {
+    if (order.getOrderItem() == null || order.getOrderItem().isEmpty()) {
       return result + "Invalid order! ";
     } else {
       return result;

intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java

@@ -42,7 +42,7 @@ import javax.swing.table.DefaultTableModel;
  * @author mjoshzambales
  *
  */
-public class Target extends JFrame {
+public class Target extends JFrame { //NOSONAR
 
   private static final long serialVersionUID = 1L;
 

intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java

@@ -66,8 +66,8 @@ public class OrderTest {
   @Test
   public void testSetOrder() throws Exception {
     final Order order = new Order();
-    order.setOrder(EXPECTED_VALUE);
+    order.setOrderItem(EXPECTED_VALUE);
-    assertEquals(EXPECTED_VALUE, order.getOrder());
+    assertEquals(EXPECTED_VALUE, order.getOrderItem());
   }
 
 }