From c6b6c8123fb1add1f469cf8d572375309fcdb48c Mon Sep 17 00:00:00 2001 From: "mahendran.mookkiah" Date: Sat, 22 Jul 2017 18:35:18 -0400 Subject: [PATCH] #587 sonarqube bugs --- .../iluwatar/intercepting/filter/Client.java | 41 ++++++++----------- .../intercepting/filter/FilterChain.java | 5 --- .../iluwatar/intercepting/filter/Order.java | 12 +++--- .../intercepting/filter/OrderFilter.java | 2 +- .../iluwatar/intercepting/filter/Target.java | 2 +- .../intercepting/filter/OrderTest.java | 4 +- 6 files changed, 26 insertions(+), 40 deletions(-) diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java index f404ee046..60b888dc7 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Client.java +++ b/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 {@link FilterManager}. + * The Client class is responsible for handling the input and running them through filters inside the + * {@link FilterManager}. * - * This is where {@link Filter}s come to play as the client pre-processes the request before being - * displayed in the {@link Target}. + * This is where {@link Filter}s come to play as the client pre-processes the request before being displayed in the + * {@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() { - @Override - public void actionPerformed(ActionEvent e) { - for (JTextArea i : jtAreas) { - i.setText(""); - } - for (JTextField i : jtFields) { - i.setText(""); - } + clearButton.addActionListener(e -> { + for (JTextArea i : jtAreas) { + i.setText(""); + } + for (JTextField i : jtFields) { + i.setText(""); } }); - processButton.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - Order order = - new Order(jtFields[0].getText(), jtFields[1].getText(), jtAreas[0].getText(), - jtFields[2].getText(), jtAreas[1].getText()); - jl.setText(sendRequest(order)); - } + processButton.addActionListener(e -> { + Order 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); diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java index 7012fb273..1e0c0de35 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/FilterChain.java +++ b/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 diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java index c74cd1b00..c29898652 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Order.java +++ b/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() { - return order; + public String getOrderItem() { + return orderItem; } - public void setOrder(String order) { - this.order = order; + public void setOrderItem(String order) { + this.orderItem = order; } } diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java index 8c2ec4d9f..bc9ff7d90 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/OrderFilter.java +++ b/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; diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java index 803c0d5c6..6652d1eb4 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java +++ b/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; diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java index 9148cc84c..f52f6deec 100644 --- a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/OrderTest.java +++ b/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); - assertEquals(EXPECTED_VALUE, order.getOrder()); + order.setOrderItem(EXPECTED_VALUE); + assertEquals(EXPECTED_VALUE, order.getOrderItem()); } }