Build SearchFilter directly in CommandLineArgs

Null check on isFiltered method.
replydev · Feb 22, 2023 · 2de4731 · 2de4731
1 parent cc362a1
commit 2de4731
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 28 deletions.
diff --git a/src/main/java/me/replydev/qubo/CommandLineArgs.java b/src/main/java/me/replydev/qubo/CommandLineArgs.java
@@ -4,6 +4,7 @@
 import lombok.experimental.NonFinal;
 import me.replydev.utils.IpList;
 import me.replydev.utils.PortList;
+import me.replydev.utils.SearchFilter;
 import org.apache.commons.cli.*;
 
 @Value
@@ -14,9 +15,7 @@ public class CommandLineArgs {
     PortList portRange;
     boolean skipCommon;
     int timeout;
-    String filterVersion;
-    String filterMotd;
-    int filterPlayers;
+    SearchFilter searchFilter;
     int count;
 
     @NonFinal
@@ -35,9 +34,13 @@ public CommandLineArgs(String[] command) throws NumberFormatException {
         skipCommon = !cmd.hasOption("all");
         timeout = Integer.parseInt(cmd.getOptionValue("t"));
 
-        filterVersion = cmd.getOptionValue("v", null);
-        filterMotd = cmd.getOptionValue("m", null);
-        filterPlayers = Integer.parseInt(cmd.getOptionValue("o", "0"));
+        searchFilter =
+            SearchFilter
+                .builder()
+                .version(cmd.getOptionValue("v", null))
+                .motd(cmd.getOptionValue("m", null))
+                .minimumPlayers(Integer.parseInt(cmd.getOptionValue("o", "0")))
+                .build();
 
         count = Integer.parseInt(cmd.getOptionValue("c", "1"));
     }

diff --git a/src/main/java/me/replydev/qubo/PingRunnable.java b/src/main/java/me/replydev/qubo/PingRunnable.java
@@ -1,6 +1,7 @@
 package me.replydev.qubo;
 
 import java.io.IOException;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicInteger;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
@@ -64,10 +65,18 @@ private boolean isFiltered(ServerResponse serverResponse) {
             return true;
         }
 
-        if (serverResponse.getDescription().getText().contains(filter.getMotd())) {
+        if (
+            serverResponse
+                .getDescription()
+                .getText()
+                .contains(Optional.ofNullable(filter.getMotd()).orElse(""))
+        ) {
             return true;
         }
 
-        return serverResponse.getVersion().getName().contains(filter.getVersion());
+        return serverResponse
+            .getVersion()
+            .getName()
+            .contains(Optional.ofNullable(filter.getVersion()).orElse(""));
     }
 }
diff --git a/src/main/java/me/replydev/qubo/QuboInstance.java b/src/main/java/me/replydev/qubo/QuboInstance.java
@@ -13,7 +13,6 @@
 import lombok.extern.slf4j.Slf4j;
 import me.replydev.utils.IpList;
 import me.replydev.utils.PortList;
-import me.replydev.utils.SearchFilter;
 import org.replydev.mcping.PingOptions;
 
 @Slf4j
@@ -43,21 +42,10 @@ public class QuboInstance {
     @Getter
     private final AtomicInteger unfilteredFoundServers;
 
-    @Getter
-    private final SearchFilter filter;
-
     public QuboInstance(CommandLineArgs commandLineArgs) {
         this.commandLineArgs = commandLineArgs;
         this.foundServers = new AtomicInteger();
         this.unfilteredFoundServers = new AtomicInteger();
-
-        SearchFilter filter = new SearchFilter();
-
-        if (commandLineArgs.getFilterPlayers() != 0) filter.setMinimumPlayers(commandLineArgs.getFilterPlayers());
-        if (commandLineArgs.getFilterMotd() != null) filter.setMotd(commandLineArgs.getFilterMotd());
-        if (commandLineArgs.getFilterVersion() != null) filter.setMotd(commandLineArgs.getFilterVersion());
-
-        this.filter = filter;
     }
 
     public void run() {
@@ -108,7 +96,7 @@ private boolean checkServersExecutor() throws InterruptedException, NumberFormat
                         .foundServers(foundServers)
                         .unfilteredFoundServers(unfilteredFoundServers)
                         .count(commandLineArgs.getCount())
-                        .filter(filter)
+                        .filter(commandLineArgs.getSearchFilter())
                         .build();
 
                     checkService.execute(pingJob);

diff --git a/src/main/java/me/replydev/utils/SearchFilter.java b/src/main/java/me/replydev/utils/SearchFilter.java
@@ -1,15 +1,16 @@
 package me.replydev.utils;
 
-import lombok.Getter;
-import lombok.Setter;
+import lombok.Builder;
+import lombok.Value;
 
 /**
  * @author Swofty#0001
  */
-@Getter
-@Setter
+@Value
+@Builder
 public class SearchFilter {
-	private int minimumPlayers = -1;
-	private String version = null;
-	private String motd = null;
+
+    int minimumPlayers;
+    String version;
+    String motd;
 }