Minor refactorings and code style changes (#807)
* Made minor changes in some patterns such as removed throws clause where not needed, changed incorrect order of arguments in assertEquals * Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments * Removed unused import from Promise * Addressed review comments * Addressed checkstyle issue
This commit is contained in:
@ -22,9 +22,6 @@
|
||||
*/
|
||||
package com.iluwatar.intercepting.filter;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.GridLayout;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
@ -33,6 +30,9 @@ import javax.swing.JRootPane;
|
||||
import javax.swing.JTextArea;
|
||||
import javax.swing.JTextField;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.WindowConstants;
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.GridLayout;
|
||||
|
||||
/**
|
||||
* The Client class is responsible for handling the input and running them through filters inside the
|
||||
@ -60,7 +60,7 @@ public class Client extends JFrame { // NOSONAR
|
||||
*/
|
||||
public Client() {
|
||||
super("Client System");
|
||||
setDefaultCloseOperation(EXIT_ON_CLOSE);
|
||||
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
setSize(300, 300);
|
||||
jl = new JLabel("RUNNING...");
|
||||
jtFields = new JTextField[3];
|
||||
|
@ -22,11 +22,6 @@
|
||||
*/
|
||||
package com.iluwatar.intercepting.filter;
|
||||
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JPanel;
|
||||
@ -34,7 +29,12 @@ import javax.swing.JRootPane;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.JTable;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.WindowConstants;
|
||||
import javax.swing.table.DefaultTableModel;
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.event.ActionEvent;
|
||||
import java.awt.event.ActionListener;
|
||||
|
||||
/**
|
||||
* This is where the requests are displayed after being validated by filters.
|
||||
@ -47,7 +47,6 @@ public class Target extends JFrame { //NOSONAR
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private JTable jt;
|
||||
private JScrollPane jsp;
|
||||
private DefaultTableModel dtm;
|
||||
private JButton del;
|
||||
|
||||
@ -56,7 +55,7 @@ public class Target extends JFrame { //NOSONAR
|
||||
*/
|
||||
public Target() {
|
||||
super("Order System");
|
||||
setDefaultCloseOperation(EXIT_ON_CLOSE);
|
||||
setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
|
||||
setSize(640, 480);
|
||||
dtm =
|
||||
new DefaultTableModel(new Object[] {"Name", "Contact Number", "Address", "Deposit Number",
|
||||
@ -73,7 +72,7 @@ public class Target extends JFrame { //NOSONAR
|
||||
bot.setLayout(new BorderLayout());
|
||||
bot.add(del, BorderLayout.EAST);
|
||||
add(bot, BorderLayout.SOUTH);
|
||||
jsp = new JScrollPane(jt);
|
||||
JScrollPane jsp = new JScrollPane(jt);
|
||||
jsp.setPreferredSize(new Dimension(500, 250));
|
||||
add(jsp, BorderLayout.CENTER);
|
||||
|
||||
|
@ -40,7 +40,7 @@ import static org.mockito.Mockito.when;
|
||||
public class FilterManagerTest {
|
||||
|
||||
@Test
|
||||
public void testFilterRequest() throws Exception {
|
||||
public void testFilterRequest() {
|
||||
final Target target = mock(Target.class);
|
||||
final FilterManager filterManager = new FilterManager();
|
||||
assertEquals("RUNNING...", filterManager.filterRequest(mock(Order.class)));
|
||||
@ -48,7 +48,7 @@ public class FilterManagerTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAddFilter() throws Exception {
|
||||
public void testAddFilter() {
|
||||
final Target target = mock(Target.class);
|
||||
final FilterManager filterManager = new FilterManager();
|
||||
|
||||
|
@ -89,7 +89,7 @@ public class FilterTest {
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("getTestData")
|
||||
public void testExecute(Filter filter, Order order, String expectedResult) throws Exception {
|
||||
public void testExecute(Filter filter, Order order, String expectedResult) {
|
||||
final String result = filter.execute(order);
|
||||
assertNotNull(result);
|
||||
assertEquals(expectedResult, result.trim());
|
||||
@ -97,7 +97,7 @@ public class FilterTest {
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("getTestData")
|
||||
public void testNext(Filter filter) throws Exception {
|
||||
public void testNext(Filter filter) {
|
||||
assertNull(filter.getNext());
|
||||
assertSame(filter, filter.getLast());
|
||||
}
|
||||
|
@ -36,35 +36,35 @@ public class OrderTest {
|
||||
private static final String EXPECTED_VALUE = "test";
|
||||
|
||||
@Test
|
||||
public void testSetName() throws Exception {
|
||||
public void testSetName() {
|
||||
final Order order = new Order();
|
||||
order.setName(EXPECTED_VALUE);
|
||||
assertEquals(EXPECTED_VALUE, order.getName());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetContactNumber() throws Exception {
|
||||
public void testSetContactNumber() {
|
||||
final Order order = new Order();
|
||||
order.setContactNumber(EXPECTED_VALUE);
|
||||
assertEquals(EXPECTED_VALUE, order.getContactNumber());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetAddress() throws Exception {
|
||||
public void testSetAddress() {
|
||||
final Order order = new Order();
|
||||
order.setAddress(EXPECTED_VALUE);
|
||||
assertEquals(EXPECTED_VALUE, order.getAddress());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetDepositNumber() throws Exception {
|
||||
public void testSetDepositNumber() {
|
||||
final Order order = new Order();
|
||||
order.setDepositNumber(EXPECTED_VALUE);
|
||||
assertEquals(EXPECTED_VALUE, order.getDepositNumber());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetOrder() throws Exception {
|
||||
public void testSetOrder() {
|
||||
final Order order = new Order();
|
||||
order.setOrderItem(EXPECTED_VALUE);
|
||||
assertEquals(EXPECTED_VALUE, order.getOrderItem());
|
||||
|
Reference in New Issue
Block a user