docs: improve intercepting filter

This commit is contained in:
Ilkka Seppälä
2024-05-01 10:47:14 +03:00
parent 1430735db5
commit 943f3fbb26
6 changed files with 127 additions and 190 deletions
@@ -27,6 +27,7 @@ package com.iluwatar.intercepting.filter;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.io.Serial;
import java.util.Arrays;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -49,6 +50,7 @@ import javax.swing.WindowConstants;
*/
public class Client extends JFrame { // NOSONAR
@Serial
private static final long serialVersionUID = 1L;
private transient FilterManager filterManager;
@@ -37,8 +37,7 @@ public class ContactFilter extends AbstractFilter {
public String execute(Order order) {
var result = super.execute(order);
var contactNumber = order.getContactNumber();
if (contactNumber == null || contactNumber.isEmpty()
|| contactNumber.matches(".*[^\\d]+.*")
if (contactNumber == null || contactNumber.matches(".*[^\\d]+.*")
|| contactNumber.length() != 11) {
return result + "Invalid contact number! ";
} else {
@@ -24,9 +24,19 @@
*/
package com.iluwatar.intercepting.filter;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
/**
* Order class carries the order data.
*/
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class Order {
private String name;
@@ -34,61 +44,4 @@ public class Order {
private String address;
private String depositNumber;
private String orderItem;
public Order() {
}
/**
* Constructor.
*/
public Order(
String name, String contactNumber, String address,
String depositNumber, String order
) {
this.name = name;
this.contactNumber = contactNumber;
this.address = address;
this.depositNumber = depositNumber;
this.orderItem = order;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getContactNumber() {
return contactNumber;
}
public void setContactNumber(String contactNumber) {
this.contactNumber = contactNumber;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getDepositNumber() {
return depositNumber;
}
public void setDepositNumber(String depositNumber) {
this.depositNumber = depositNumber;
}
public String getOrderItem() {
return orderItem;
}
public void setOrderItem(String order) {
this.orderItem = order;
}
}
@@ -28,6 +28,7 @@ import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.Serial;
import java.util.stream.IntStream;
import javax.swing.JButton;
import javax.swing.JFrame;
@@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel;
*/
public class Target extends JFrame { //NOSONAR
@Serial
private static final long serialVersionUID = 1L;
private final JTable jt;
@@ -25,7 +25,7 @@
package com.iluwatar.intercepting.filter;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
@@ -41,6 +41,6 @@ class TargetTest {
final var target = new Target();
assertEquals(target.getSize().getWidth(), Double.valueOf(640));
assertEquals(target.getSize().getHeight(), Double.valueOf(480));
assertEquals(true,target.isVisible());
assertTrue(target.isVisible());
}
}