Skip to content

Commit c6b6c81

Browse files
committed
iluwatar#587 sonarqube bugs
1 parent ac721c6 commit c6b6c81

File tree

6 files changed

+26
-40
lines changed

6 files changed

+26
-40
lines changed

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

+16-25
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
import java.awt.BorderLayout;
2626
import java.awt.GridLayout;
27-
import java.awt.event.ActionEvent;
28-
import java.awt.event.ActionListener;
2927

3028
import javax.swing.JButton;
3129
import javax.swing.JFrame;
@@ -37,20 +35,20 @@
3735
import javax.swing.SwingUtilities;
3836

3937
/**
40-
* The Client class is responsible for handling the input and running them through filters inside
41-
* the {@link FilterManager}.
38+
* The Client class is responsible for handling the input and running them through filters inside the
39+
* {@link FilterManager}.
4240
*
43-
* This is where {@link Filter}s come to play as the client pre-processes the request before being
44-
* displayed in the {@link Target}.
41+
* This is where {@link Filter}s come to play as the client pre-processes the request before being displayed in the
42+
* {@link Target}.
4543
*
4644
* @author joshzambales
4745
*
4846
*/
49-
public class Client extends JFrame {
47+
public class Client extends JFrame { // NOSONAR
5048

5149
private static final long serialVersionUID = 1L;
5250

53-
private FilterManager filterManager;
51+
private transient FilterManager filterManager;
5452
private JLabel jl;
5553
private JTextField[] jtFields;
5654
private JTextArea[] jtAreas;
@@ -98,26 +96,19 @@ private void setup() {
9896
panel.add(clearButton);
9997
panel.add(processButton);
10098

101-
clearButton.addActionListener(new ActionListener() {
102-
@Override
103-
public void actionPerformed(ActionEvent e) {
104-
for (JTextArea i : jtAreas) {
105-
i.setText("");
106-
}
107-
for (JTextField i : jtFields) {
108-
i.setText("");
109-
}
99+
clearButton.addActionListener(e -> {
100+
for (JTextArea i : jtAreas) {
101+
i.setText("");
102+
}
103+
for (JTextField i : jtFields) {
104+
i.setText("");
110105
}
111106
});
112107

113-
processButton.addActionListener(new ActionListener() {
114-
@Override
115-
public void actionPerformed(ActionEvent e) {
116-
Order order =
117-
new Order(jtFields[0].getText(), jtFields[1].getText(), jtAreas[0].getText(),
118-
jtFields[2].getText(), jtAreas[1].getText());
119-
jl.setText(sendRequest(order));
120-
}
108+
processButton.addActionListener(e -> {
109+
Order order = new Order(jtFields[0].getText(), jtFields[1].getText(), jtAreas[0].getText(), jtFields[2].getText(),
110+
jtAreas[1].getText());
111+
jl.setText(sendRequest(order));
121112
});
122113

123114
JRootPane rootPane = SwingUtilities.getRootPane(processButton);

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

-5
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ public class FilterChain {
3232

3333
private Filter chain;
3434

35-
/**
36-
* Constructor
37-
*/
38-
public FilterChain() {
39-
}
4035

4136
/**
4237
* Adds filter

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Order {
3232
private String contactNumber;
3333
private String address;
3434
private String depositNumber;
35-
private String order;
35+
private String orderItem;
3636

3737
public Order() {}
3838

@@ -44,7 +44,7 @@ public Order(String name, String contactNumber, String address, String depositNu
4444
this.contactNumber = contactNumber;
4545
this.address = address;
4646
this.depositNumber = depositNumber;
47-
this.order = order;
47+
this.orderItem = order;
4848
}
4949

5050
public String getName() {
@@ -79,11 +79,11 @@ public void setDepositNumber(String depositNumber) {
7979
this.depositNumber = depositNumber;
8080
}
8181

82-
public String getOrder() {
83-
return order;
82+
public String getOrderItem() {
83+
return orderItem;
8484
}
8585

86-
public void setOrder(String order) {
87-
this.order = order;
86+
public void setOrderItem(String order) {
87+
this.orderItem = order;
8888
}
8989
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class OrderFilter extends AbstractFilter {
3333
@Override
3434
public String execute(Order order) {
3535
String result = super.execute(order);
36-
if (order.getOrder() == null || order.getOrder().isEmpty()) {
36+
if (order.getOrderItem() == null || order.getOrderItem().isEmpty()) {
3737
return result + "Invalid order! ";
3838
} else {
3939
return result;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* @author mjoshzambales
4343
*
4444
*/
45-
public class Target extends JFrame {
45+
public class Target extends JFrame { //NOSONAR
4646

4747
private static final long serialVersionUID = 1L;
4848

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ public void testSetDepositNumber() throws Exception {
6666
@Test
6767
public void testSetOrder() throws Exception {
6868
final Order order = new Order();
69-
order.setOrder(EXPECTED_VALUE);
70-
assertEquals(EXPECTED_VALUE, order.getOrder());
69+
order.setOrderItem(EXPECTED_VALUE);
70+
assertEquals(EXPECTED_VALUE, order.getOrderItem());
7171
}
7272

7373
}

0 commit comments

Comments
 (0)