From 93a550ab39900e81dc2713380513a14fd6ab6606 Mon Sep 17 00:00:00 2001
From: Aleksei <a.gryczewski999@gmail.com>
Date: Tue, 25 Feb 2020 15:31:34 -0500
Subject: [PATCH] Made all builder properties optional.

This may be detrimental. Most, if not all instances of outfit creation will be done in a controlled manner, so it seems logical this way given the use of futures and optionals.
---
 .../database/controllers/OutfitController.java | 10 +++++++---
 .../fsbot/database/models/Outfit.java          | 18 +++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
index e37f152..09ad3b1 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/controllers/OutfitController.java
@@ -172,8 +172,8 @@ public class OutfitController {
         if (rs.next()) {
             count = rs.getInt("count");
         }
-        FSDB.get().close(rs);
 
+        FSDB.get().close(rs);
         return count;
     }
 
@@ -184,13 +184,17 @@ public class OutfitController {
         if (rs.next()) {
             count = rs.getInt("count");
         }
-        FSDB.get().close(rs);
 
+        FSDB.get().close(rs);
         return count;
     }
 
     private static Outfit mapObject(ResultSet rs) throws SQLException {
-        return new Outfit.OutfitBuilder(rs.getString("id"), rs.getString("link"), rs.getString("submitter"), rs.getString("tag"))
+        return new Outfit.OutfitBuilder()
+                .setId(rs.getString("id"))
+                .setLink(rs.getString("link"))
+                .setSubmitter(rs.getString("submitter"))
+                .setTag(rs.getString("tag"))
                 .setCreated(new Timestamp(rs.getLong("created")))
                 .setUpdated(new Timestamp((rs.getLong("updated"))))
                 .setDeleted(rs.getBoolean("deleted"))
diff --git a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
index 88ecdd8..a33225e 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/models/Outfit.java
@@ -115,11 +115,27 @@ public class Outfit extends DatabaseModel {
         private int displayCount = 0;
         private String deleteHash = "";
 
-        public OutfitBuilder(String id, String link, String submitter, String tag) {
+        public OutfitBuilder() {
+        }
+
+        public OutfitBuilder setId(String id) {
             this.id = id;
+            return this;
+        }
+
+        public OutfitBuilder setLink(String link) {
             this.link = link;
+            return this;
+        }
+
+        public OutfitBuilder setSubmitter(String submitter) {
             this.submitter = submitter;
+            return this;
+        }
+
+        public OutfitBuilder setTag(String tag) {
             this.tag = tag;
+            return this;
         }
 
         public OutfitBuilder setCreated(Timestamp created) {