From 03e67a87a8909c076795f7cac9b82b82aa878091 Mon Sep 17 00:00:00 2001 From: Umut Ay Date: Tue, 26 Nov 2024 09:47:41 +0100 Subject: [PATCH 1/2] Removed lombok --- pom.xml | 11 +--- src/main/java/utils/email/EmailUtilities.java | 59 ++++++++++++++--- src/test/java/petstore/models/Pet.java | 66 ++++++++++++++++--- 3 files changed, 107 insertions(+), 29 deletions(-) diff --git a/pom.xml b/pom.xml index 3880b96..3023726 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.umutayb Utilities - 1.6.8 + 1.6.8-SNAPSHOT jar Java-Utilities @@ -58,7 +58,6 @@ 1.8 4.8.0 2.9.0 - 1.18.26 4.9.3 17 @@ -140,14 +139,6 @@ ${retrofit.version} - - - org.projectlombok - lombok - ${lombok.version} - provided - - org.apache.poi diff --git a/src/main/java/utils/email/EmailUtilities.java b/src/main/java/utils/email/EmailUtilities.java index 11ec4d2..0b90d8d 100644 --- a/src/main/java/utils/email/EmailUtilities.java +++ b/src/main/java/utils/email/EmailUtilities.java @@ -5,10 +5,6 @@ import jakarta.mail.internet.InternetAddress; import jakarta.mail.internet.MimeBodyPart; import jakarta.mail.internet.MimeMessage; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.Getter; -import lombok.NoArgsConstructor; import utils.DateUtilities; import utils.Printer; import utils.reflection.ReflectionUtilities; @@ -19,7 +15,7 @@ import static utils.arrays.lambda.Collectors.toSingleton; -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "UnusedReturnValue"}) public class EmailUtilities { /** @@ -115,9 +111,12 @@ public static class Inbox { * List of email messages represented as a list of maps where each map contains email fields as keys * and their corresponding values as values. */ - @Getter public List messages = new ArrayList<>(); + public List getMessages() { + return messages; + } + /** * Enumeration of email fields used as keys in the map representation of email messages. */ @@ -126,11 +125,53 @@ public enum EmailField {SUBJECT, SENDER, CONTENT, @Deprecated(since = "1.6.2", f /** * This class represents an email message. */ - @Data - @AllArgsConstructor - @NoArgsConstructor public static class EmailMessage { String from; + + public String getSentDate() { + return sentDate; + } + + public void setSentDate(String sentDate) { + this.sentDate = sentDate; + } + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public String getMessageContent() { + return messageContent; + } + + public void setMessageContent(String messageContent) { + this.messageContent = messageContent; + } + + public String getAttachments() { + return attachments; + } + + public void setAttachments(String attachments) { + this.attachments = attachments; + } + + public String getFileName() { + return fileName; + } + + public String getFrom() { + return from; + } + + public void setFrom(String from) { + this.from = from; + } + String sentDate; String subject; String messageContent; diff --git a/src/test/java/petstore/models/Pet.java b/src/test/java/petstore/models/Pet.java index c0a2eda..1a01b00 100644 --- a/src/test/java/petstore/models/Pet.java +++ b/src/test/java/petstore/models/Pet.java @@ -1,14 +1,7 @@ package petstore.models; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - import java.util.List; -@Data -@NoArgsConstructor public class Pet { Long id; DataModel category; @@ -25,12 +18,65 @@ public Pet(DataModel category, String name, List photoUrls, List getPhotoUrls() { + return photoUrls; + } + + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + public List getTags() { + return tags; + } + + public void setTags(List tags) { + this.tags = tags; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + public static class DataModel { Long id; String name; + + public DataModel(Long id, String name) { + this.id = id; + this.name = name; + } } } From b859d288382cb2f8fbf3f3128e0a2e4847b158cc Mon Sep 17 00:00:00 2001 From: Umut Ay Date: Tue, 26 Nov 2024 10:36:49 +0100 Subject: [PATCH 2/2] Fixed unit tests --- src/main/java/utils/email/EmailUtilities.java | 10 +++++----- src/test/java/AppTest.java | 4 ++-- src/test/java/petstore/models/Pet.java | 12 ++++++++++++ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/utils/email/EmailUtilities.java b/src/main/java/utils/email/EmailUtilities.java index 0b90d8d..d68f5e0 100644 --- a/src/main/java/utils/email/EmailUtilities.java +++ b/src/main/java/utils/email/EmailUtilities.java @@ -111,7 +111,7 @@ public static class Inbox { * List of email messages represented as a list of maps where each map contains email fields as keys * and their corresponding values as values. */ - public List messages = new ArrayList<>(); + public static List messages = new ArrayList<>(); public List getMessages() { return messages; @@ -216,7 +216,7 @@ public void setFileName(String fileName){ * @return the email message matching the filter criteria */ public EmailMessage getMessageBy(List> filterPairs) { - return this.messages.stream() + return messages.stream() .filter(message -> emailMatch(message, filterPairs)) .collect(toSingleton()); } @@ -322,7 +322,7 @@ public static void load(Inbox inbox, int timeout, int expectedMessageCount, bool timeout, () -> { inbox.load(print, save, saveAttachments, filterPairs); - return inbox.messages.size() >= expectedMessageCount; + return messages.size() >= expectedMessageCount; } ); } @@ -383,7 +383,7 @@ public void load(boolean print, boolean save, boolean saveAttachments, List photoUrls, List photoUrls, List tags, String status) { + this.id = id; + this.category = category; + this.name = name; + this.photoUrls = photoUrls; + this.tags = tags; + this.status = status; + } + public Long getId() { return id; } @@ -77,6 +86,9 @@ public DataModel(Long id, String name) { this.id = id; this.name = name; } + + public DataModel() { + } } }