Refactored project.

src/main/java/com/andrewlalis/perfin/PerfinApp.java

@@ -3,6 +3,7 @@ package com.andrewlalis.perfin;
 import com.andrewlalis.javafx_scene_router.AnchorPaneRouterView;
 import com.andrewlalis.javafx_scene_router.SceneRouter;
 import com.andrewlalis.perfin.model.Profile;
+import com.andrewlalis.perfin.view.SceneUtil;
 import com.andrewlalis.perfin.view.StartupSplashScreen;
 import javafx.application.Application;
 import javafx.application.Platform;

src/main/java/com/andrewlalis/perfin/control/AccountViewController.java

@@ -1,7 +1,7 @@
 package com.andrewlalis.perfin.control;
 
 import com.andrewlalis.javafx_scene_router.RouteSelectionListener;
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
 import com.andrewlalis.perfin.model.Account;
 import com.andrewlalis.perfin.model.Profile;
 import javafx.fxml.FXML;

src/main/java/com/andrewlalis/perfin/control/AccountsViewController.java

@@ -2,7 +2,7 @@ package com.andrewlalis.perfin.control;
 
 import com.andrewlalis.javafx_scene_router.RouteSelectionListener;
 import com.andrewlalis.perfin.view.component.AccountTile;
-import com.andrewlalis.perfin.data.CurrencyUtil;
+import com.andrewlalis.perfin.data.util.CurrencyUtil;
 import com.andrewlalis.perfin.data.pagination.PageRequest;
 import com.andrewlalis.perfin.data.pagination.Sort;
 import com.andrewlalis.perfin.model.Profile;

src/main/java/com/andrewlalis/perfin/control/CreateTransactionController.java

@@ -1,7 +1,7 @@
 package com.andrewlalis.perfin.control;
 
 import com.andrewlalis.javafx_scene_router.RouteSelectionListener;
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
 import com.andrewlalis.perfin.model.Account;
 import com.andrewlalis.perfin.model.CreditAndDebitAccounts;
 import com.andrewlalis.perfin.model.Profile;

src/main/java/com/andrewlalis/perfin/control/ProfilesViewController.java

@@ -1,6 +1,6 @@
 package com.andrewlalis.perfin.control;
 
-import com.andrewlalis.perfin.data.FileUtil;
+import com.andrewlalis.perfin.data.util.FileUtil;
 import com.andrewlalis.perfin.model.Profile;
 import com.andrewlalis.perfin.view.ProfilesStage;
 import javafx.beans.binding.BooleanExpression;

src/main/java/com/andrewlalis/perfin/control/TransactionViewController.java

@@ -1,7 +1,7 @@
 package com.andrewlalis.perfin.control;
 
-import com.andrewlalis.perfin.data.CurrencyUtil;
+import com.andrewlalis.perfin.data.util.CurrencyUtil;
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
 import com.andrewlalis.perfin.model.Attachment;
 import com.andrewlalis.perfin.model.CreditAndDebitAccounts;
 import com.andrewlalis.perfin.model.Profile;

src/main/java/com/andrewlalis/perfin/control/TransactionsViewController.java

@@ -1,8 +1,8 @@
 package com.andrewlalis.perfin.control;
 
 import com.andrewlalis.javafx_scene_router.RouteSelectionListener;
-import com.andrewlalis.perfin.Pair;
+import com.andrewlalis.perfin.data.util.Pair;
-import com.andrewlalis.perfin.SceneUtil;
+import com.andrewlalis.perfin.view.SceneUtil;
 import com.andrewlalis.perfin.data.pagination.Page;
 import com.andrewlalis.perfin.data.pagination.PageRequest;
 import com.andrewlalis.perfin.data.pagination.Sort;

src/main/java/com/andrewlalis/perfin/data/DataSource.java

@@ -1,6 +1,9 @@
 package com.andrewlalis.perfin.data;
 
 import com.andrewlalis.perfin.data.pagination.PageRequest;
+import com.andrewlalis.perfin.data.util.CurrencyUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
+import com.andrewlalis.perfin.data.util.ThrowableConsumer;
 import com.andrewlalis.perfin.model.Account;
 import javafx.application.Platform;
 

src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountEntryRepository.java

@@ -2,7 +2,7 @@ package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.AccountEntryRepository;
 import com.andrewlalis.perfin.data.AccountHistoryItemRepository;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
 import com.andrewlalis.perfin.model.AccountEntry;
 
 import java.math.BigDecimal;

src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountHistoryItemRepository.java

@@ -1,7 +1,7 @@
 package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.AccountHistoryItemRepository;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
 import com.andrewlalis.perfin.model.history.AccountHistoryItemType;
 
 import java.sql.Connection;

src/main/java/com/andrewlalis/perfin/data/impl/JdbcAccountRepository.java

@@ -1,8 +1,8 @@
 package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.AccountRepository;
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
 import com.andrewlalis.perfin.data.pagination.Page;
 import com.andrewlalis.perfin.data.pagination.PageRequest;
 import com.andrewlalis.perfin.model.Account;

src/main/java/com/andrewlalis/perfin/data/impl/JdbcAttachmentRepository.java

@@ -1,8 +1,8 @@
 package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.AttachmentRepository;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
-import com.andrewlalis.perfin.data.FileUtil;
+import com.andrewlalis.perfin.data.util.FileUtil;
 import com.andrewlalis.perfin.model.Attachment;
 import com.github.f4b6a3.ulid.UlidCreator;
 

src/main/java/com/andrewlalis/perfin/data/impl/JdbcBalanceRecordRepository.java

@@ -3,7 +3,7 @@ package com.andrewlalis.perfin.data.impl;
 import com.andrewlalis.perfin.data.AccountHistoryItemRepository;
 import com.andrewlalis.perfin.data.AttachmentRepository;
 import com.andrewlalis.perfin.data.BalanceRecordRepository;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
 import com.andrewlalis.perfin.model.Attachment;
 import com.andrewlalis.perfin.model.BalanceRecord;
 

src/main/java/com/andrewlalis/perfin/data/impl/JdbcDataSource.java

@@ -1,6 +1,7 @@
 package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.*;
+import com.andrewlalis.perfin.data.util.UncheckedSqlException;
 
 import java.nio.file.Path;
 import java.sql.Connection;

src/main/java/com/andrewlalis/perfin/data/impl/JdbcTransactionRepository.java

@@ -2,7 +2,7 @@ package com.andrewlalis.perfin.data.impl;
 
 import com.andrewlalis.perfin.data.AccountEntryRepository;
 import com.andrewlalis.perfin.data.AttachmentRepository;
-import com.andrewlalis.perfin.data.DbUtil;
+import com.andrewlalis.perfin.data.util.DbUtil;
 import com.andrewlalis.perfin.data.TransactionRepository;
 import com.andrewlalis.perfin.data.pagination.Page;
 import com.andrewlalis.perfin.data.pagination.PageRequest;

src/main/java/com/andrewlalis/perfin/data/util/CurrencyUtil.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

src/main/java/com/andrewlalis/perfin/data/util/DateUtil.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;

src/main/java/com/andrewlalis/perfin/data/util/DbUtil.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import com.andrewlalis.perfin.data.pagination.Page;
 import com.andrewlalis.perfin.data.pagination.PageRequest;

src/main/java/com/andrewlalis/perfin/data/util/FileUtil.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.io.IOException;
 import java.nio.file.FileVisitResult;

src/main/java/com/andrewlalis/perfin/data/util/Pair.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin;
+package com.andrewlalis.perfin.data.util;
 
 public record Pair<A, B>(A first, B second) {
     public static <A, B> Pair<A, B> of(A first, B second) {

src/main/java/com/andrewlalis/perfin/data/util/ResultSetMapper.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;

src/main/java/com/andrewlalis/perfin/data/util/SQLRunnable.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.sql.SQLException;
 

src/main/java/com/andrewlalis/perfin/data/util/SQLSupplier.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.sql.SQLException;
 

src/main/java/com/andrewlalis/perfin/data/util/ThrowableConsumer.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 @FunctionalInterface
 public interface ThrowableConsumer<T> {

src/main/java/com/andrewlalis/perfin/data/util/UncheckedSqlException.java

@@ -1,4 +1,4 @@
-package com.andrewlalis.perfin.data;
+package com.andrewlalis.perfin.data.util;
 
 import java.sql.SQLException;
 

src/main/java/com/andrewlalis/perfin/model/Attachment.java

@@ -1,6 +1,6 @@
 package com.andrewlalis.perfin.model;
 
-import com.andrewlalis.perfin.data.FileUtil;
+import com.andrewlalis.perfin.data.util.FileUtil;
 
 import java.nio.file.Path;
 import java.time.LocalDateTime;

src/main/java/com/andrewlalis/perfin/model/TransactionAttachment.java

@@ -1,6 +1,6 @@
 package com.andrewlalis.perfin.model;
 
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
 
 import java.nio.file.Path;
 import java.time.LocalDateTime;

src/main/java/com/andrewlalis/perfin/view/ProfilesStage.java

@@ -1,6 +1,5 @@
 package com.andrewlalis.perfin.view;
 
-import com.andrewlalis.perfin.SceneUtil;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.Window;

src/main/java/com/andrewlalis/perfin/view/SceneUtil.java

@@ -1,5 +1,6 @@
-package com.andrewlalis.perfin;
+package com.andrewlalis.perfin.view;
 
+import com.andrewlalis.perfin.data.util.Pair;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;

src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java

@@ -1,6 +1,6 @@
 package com.andrewlalis.perfin.view;
 
-import com.andrewlalis.perfin.data.ThrowableConsumer;
+import com.andrewlalis.perfin.data.util.ThrowableConsumer;
 import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.scene.control.TextArea;

src/main/java/com/andrewlalis/perfin/view/component/TransactionTile.java

@@ -1,7 +1,7 @@
 package com.andrewlalis.perfin.view.component;
 
-import com.andrewlalis.perfin.data.CurrencyUtil;
+import com.andrewlalis.perfin.data.util.CurrencyUtil;
-import com.andrewlalis.perfin.data.DateUtil;
+import com.andrewlalis.perfin.data.util.DateUtil;
 import com.andrewlalis.perfin.model.CreditAndDebitAccounts;
 import com.andrewlalis.perfin.model.Profile;
 import com.andrewlalis.perfin.model.Transaction;