#587 sonarqube bugs

This commit is contained in:
mahendran.mookkiah 2017-07-22 18:35:18 -04:00
parent ac721c695c
commit c6b6c8123f
6 changed files with 26 additions and 40 deletions

View File

@ -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);

View File

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

View File

@ -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;
}
}

View File

@ -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;

View File

@ -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;

View File

@ -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());
}
}