From 0a183c53fa855ddeb35791a6eb13f43b40e162d0 Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 16:42:37 +0200 Subject: [PATCH 1/8] refactor: Delete redundant dependencies. Add JaCoCo, Site and JavaDocs plugins. --- pom.xml | 95 ++++++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index bff6a52..15e1d8c 100644 --- a/pom.xml +++ b/pom.xml @@ -33,24 +33,6 @@ 25.0.1 - - org.openjfx - javafx-fxml - 25.0.1 - - - - org.openjfx - javafx-web - 25.0.1 - - - - org.openjfx - javafx-swing - 25.0.1 - - org.openjfx javafx-media @@ -62,9 +44,9 @@ junit-jupiter 6.0.1 test - + - + @@ -86,28 +68,57 @@ - - org.codehaus.mojo - exec-maven-plugin - 3.6.3 - - edu.ntnu.idi.idatt.Main - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.3.0 - - - - true - edu.ntnu.idi.idatt.Main - - - - + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + + + + org.jacoco + jacoco-maven-plugin + 0.8.14 + + + + + prepare-agent + + prepare-agent + + + + + + report + verify + + report + + + + + + + org.apache.maven.plugins + maven-site-plugin + 4.0.0-M9 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.3.0 + + + + true + edu.ntnu.idi.idatt.Launcher + + + + From 2f0646e316a36242083cff3e0c5049380abaaf98 Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 16:43:21 +0200 Subject: [PATCH 2/8] refactor: A formal entry point for the application. Main.class -> Launcher.class --- .../java/edu/ntnu/idi/idatt/Launcher.java | 30 +++++++++++++++++++ src/main/java/edu/ntnu/idi/idatt/Main.java | 11 ------- 2 files changed, 30 insertions(+), 11 deletions(-) create mode 100644 src/main/java/edu/ntnu/idi/idatt/Launcher.java delete mode 100644 src/main/java/edu/ntnu/idi/idatt/Main.java diff --git a/src/main/java/edu/ntnu/idi/idatt/Launcher.java b/src/main/java/edu/ntnu/idi/idatt/Launcher.java new file mode 100644 index 0000000..601d11e --- /dev/null +++ b/src/main/java/edu/ntnu/idi/idatt/Launcher.java @@ -0,0 +1,30 @@ +package edu.ntnu.idi.idatt; + +import javafx.application.Application; +import javafx.scene.Scene; +import javafx.scene.layout.VBox; +import javafx.stage.Stage; + +public final class Launcher { + + /** + * Entry point of application. + */ + static void main() { + Application.launch(StockGame.class); + } + + public static final class StockGame extends Application { + + @Override + public void start(Stage stage) { + stage.setWidth(1200); + stage.setHeight(700); + stage.setTitle("Stock Game"); + stage.setScene(new Scene(new VBox())); + stage.show(); + } + + } + +} diff --git a/src/main/java/edu/ntnu/idi/idatt/Main.java b/src/main/java/edu/ntnu/idi/idatt/Main.java deleted file mode 100644 index a7ee785..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/Main.java +++ /dev/null @@ -1,11 +0,0 @@ -package edu.ntnu.idi.idatt; - -public class Main { - - // Logger system !! - - static void main() { - System.out.println("Hello world!"); - } - -} From fcfcdeb6dbfeacc47231c93bc8435b3afff62921 Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 16:44:02 +0200 Subject: [PATCH 3/8] fix: Improper JavaDocs --- src/main/java/edu/ntnu/idi/idatt/Exchange.java | 6 +++--- src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/ntnu/idi/idatt/Exchange.java b/src/main/java/edu/ntnu/idi/idatt/Exchange.java index 7214ffa..74a7dbc 100644 --- a/src/main/java/edu/ntnu/idi/idatt/Exchange.java +++ b/src/main/java/edu/ntnu/idi/idatt/Exchange.java @@ -32,8 +32,8 @@ public class Exchange extends ExchangeLoader { /** * Constructor for Exchange class * - * @param name - Name of the current stock Exchange - * @param stocks - List of aviable stocks for this exchange. + * @param name - Name of the current stock Exchange + * @param path - Path to .csv file. */ public Exchange(String name, String path) { super(path); @@ -180,7 +180,7 @@ public Transaction buy(String symbol, BigDecimal quantity, Player player) { * * @see Sale * - * @param Share - The instance of the sold share. + * @param share - The instance of the sold share. * @param player - which player did this event. * @return The given transaction details. (Transaction). * @see Transaction diff --git a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java b/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java index 5f50a6a..d4d9ea7 100644 --- a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java +++ b/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java @@ -44,7 +44,7 @@ protected ExchangeLoader(URL path) { /** * Method for loading from stocks from file * - * @return List of loaded stocks. + * @return a list of loaded stocks. * @throws IOException on BufferedReader error */ protected List load() throws IOException { From 608ed604678dca631fa132c10b4e22168e5ec2b4 Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 16:47:45 +0200 Subject: [PATCH 4/8] chore: Update CD/CI Pipeline for automization for Github Pages deployment. --- .github/workflows/maven.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 71d6ce6..ee9c969 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,3 +25,13 @@ jobs: - name: Test with Maven run: mvn -B test --file pom.xml + - name: Build site + JavaDocs & JaCoCo + run: mvn clean verify site + + - name: Deploy to Github Pages + uses: peaceiris/actions-gh-pages@v4 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: target/site/ + publish_branch: gh-pages + From 89b8c4f20e0cd4f8c835f2eb5dbcce0a3465eb94 Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 17:13:07 +0200 Subject: [PATCH 5/8] refactor: Structured packages. Manually remap imports. --- .../Controller/exchangePageController.java | 4 ---- .../idatt/Controller/mainPageController.java | 4 ---- src/main/java/edu/ntnu/idi/idatt/Observer.java | 6 ------ .../edu/ntnu/idi/idatt/View/exchangePage.java | 4 ---- .../java/edu/ntnu/idi/idatt/View/mainPage.java | 4 ---- .../edu/ntnu/idi/idatt/common/Observer.java | 6 ++++++ .../ntnu/idi/idatt/{ => model}/Exchange.java | 18 +++++++++--------- .../idatt/{marked => model/market}/Stock.java | 2 +- .../idi/idatt/{ => model/player}/Player.java | 8 +++----- .../{marked => model/portfolio}/Portfolio.java | 5 ++--- .../{marked => model/portfolio}/Share.java | 4 +++- .../{ => model}/transaction/Purchase.java | 8 ++++---- .../idatt/{ => model}/transaction/Sale.java | 8 ++++---- .../{ => model}/transaction/Transaction.java | 8 ++++---- .../transaction/TransactionArchive.java | 2 +- .../transaction}/PurchaseCalculator.java | 6 +++--- .../transaction}/SaleCalculator.java | 4 ++-- .../transaction}/TransactionCalculator.java | 2 +- .../{file => storage}/ExchangeLoader.java | 4 ++-- 19 files changed, 45 insertions(+), 62 deletions(-) delete mode 100644 src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java delete mode 100644 src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java delete mode 100644 src/main/java/edu/ntnu/idi/idatt/Observer.java delete mode 100644 src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java delete mode 100644 src/main/java/edu/ntnu/idi/idatt/View/mainPage.java create mode 100644 src/main/java/edu/ntnu/idi/idatt/common/Observer.java rename src/main/java/edu/ntnu/idi/idatt/{ => model}/Exchange.java (93%) rename src/main/java/edu/ntnu/idi/idatt/{marked => model/market}/Stock.java (98%) rename src/main/java/edu/ntnu/idi/idatt/{ => model/player}/Player.java (91%) rename src/main/java/edu/ntnu/idi/idatt/{marked => model/portfolio}/Portfolio.java (93%) rename src/main/java/edu/ntnu/idi/idatt/{marked => model/portfolio}/Share.java (91%) rename src/main/java/edu/ntnu/idi/idatt/{ => model}/transaction/Purchase.java (79%) rename src/main/java/edu/ntnu/idi/idatt/{ => model}/transaction/Sale.java (79%) rename src/main/java/edu/ntnu/idi/idatt/{ => model}/transaction/Transaction.java (85%) rename src/main/java/edu/ntnu/idi/idatt/{ => model}/transaction/TransactionArchive.java (97%) rename src/main/java/edu/ntnu/idi/idatt/{calculator => service/transaction}/PurchaseCalculator.java (93%) rename src/main/java/edu/ntnu/idi/idatt/{calculator => service/transaction}/SaleCalculator.java (95%) rename src/main/java/edu/ntnu/idi/idatt/{calculator => service/transaction}/TransactionCalculator.java (92%) rename src/main/java/edu/ntnu/idi/idatt/{file => storage}/ExchangeLoader.java (96%) diff --git a/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java b/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java deleted file mode 100644 index 4f8c5cc..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/Controller/exchangePageController.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.ntnu.idi.idatt.Controller; - -public class exchangePageController { -} diff --git a/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java b/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java deleted file mode 100644 index c1162c7..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/Controller/mainPageController.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.ntnu.idi.idatt.Controller; - -public class mainPageController { -} diff --git a/src/main/java/edu/ntnu/idi/idatt/Observer.java b/src/main/java/edu/ntnu/idi/idatt/Observer.java deleted file mode 100644 index 24b264b..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/Observer.java +++ /dev/null @@ -1,6 +0,0 @@ -package edu.ntnu.idi.idatt; - -public interface Observer { - - void update(); -} \ No newline at end of file diff --git a/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java b/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java deleted file mode 100644 index d274afe..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/View/exchangePage.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.ntnu.idi.idatt.View; - -public class exchangePage { -} diff --git a/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java b/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java deleted file mode 100644 index 733d0cb..0000000 --- a/src/main/java/edu/ntnu/idi/idatt/View/mainPage.java +++ /dev/null @@ -1,4 +0,0 @@ -package edu.ntnu.idi.idatt.View; - -public class mainPage { -} diff --git a/src/main/java/edu/ntnu/idi/idatt/common/Observer.java b/src/main/java/edu/ntnu/idi/idatt/common/Observer.java new file mode 100644 index 0000000..ba340a4 --- /dev/null +++ b/src/main/java/edu/ntnu/idi/idatt/common/Observer.java @@ -0,0 +1,6 @@ +package edu.ntnu.idi.idatt.common; + +public interface Observer { + + void update(); +} diff --git a/src/main/java/edu/ntnu/idi/idatt/Exchange.java b/src/main/java/edu/ntnu/idi/idatt/model/Exchange.java similarity index 93% rename from src/main/java/edu/ntnu/idi/idatt/Exchange.java rename to src/main/java/edu/ntnu/idi/idatt/model/Exchange.java index 74a7dbc..84d2d9d 100644 --- a/src/main/java/edu/ntnu/idi/idatt/Exchange.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/Exchange.java @@ -1,16 +1,16 @@ -package edu.ntnu.idi.idatt; - -import edu.ntnu.idi.idatt.file.ExchangeLoader; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; -import edu.ntnu.idi.idatt.transaction.Purchase; -import edu.ntnu.idi.idatt.transaction.Sale; -import edu.ntnu.idi.idatt.transaction.Transaction; +package edu.ntnu.idi.idatt.model; import java.io.IOException; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; + +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; +import edu.ntnu.idi.idatt.model.transaction.Purchase; +import edu.ntnu.idi.idatt.model.transaction.Sale; +import edu.ntnu.idi.idatt.model.transaction.Transaction; +import edu.ntnu.idi.idatt.storage.ExchangeLoader; /** * Exchange class diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Stock.java b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java similarity index 98% rename from src/main/java/edu/ntnu/idi/idatt/marked/Stock.java rename to src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java index d84e7bb..88bdfeb 100644 --- a/src/main/java/edu/ntnu/idi/idatt/marked/Stock.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/market/Stock.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.market; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/src/main/java/edu/ntnu/idi/idatt/Player.java b/src/main/java/edu/ntnu/idi/idatt/model/player/Player.java similarity index 91% rename from src/main/java/edu/ntnu/idi/idatt/Player.java rename to src/main/java/edu/ntnu/idi/idatt/model/player/Player.java index 8f798e7..f75b184 100644 --- a/src/main/java/edu/ntnu/idi/idatt/Player.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/player/Player.java @@ -1,11 +1,9 @@ -package edu.ntnu.idi.idatt; +package edu.ntnu.idi.idatt.model.player; -import edu.ntnu.idi.idatt.marked.Portfolio; -import edu.ntnu.idi.idatt.transaction.TransactionArchive; +import edu.ntnu.idi.idatt.model.portfolio.Portfolio; +import edu.ntnu.idi.idatt.model.transaction.TransactionArchive; import java.math.BigDecimal; -import java.util.HashSet; -import java.util.Map; public class Player { diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java similarity index 93% rename from src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java rename to src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java index e377d5f..0b9e940 100644 --- a/src/main/java/edu/ntnu/idi/idatt/marked/Portfolio.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Portfolio.java @@ -1,11 +1,10 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.portfolio; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; -import edu.ntnu.idi.idatt.calculator.SaleCalculator; +import edu.ntnu.idi.idatt.service.transaction.SaleCalculator; /** * Portfolio class diff --git a/src/main/java/edu/ntnu/idi/idatt/marked/Share.java b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java similarity index 91% rename from src/main/java/edu/ntnu/idi/idatt/marked/Share.java rename to src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java index 0cc7432..2bbaf0f 100644 --- a/src/main/java/edu/ntnu/idi/idatt/marked/Share.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/portfolio/Share.java @@ -1,7 +1,9 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.portfolio; import java.math.BigDecimal; +import edu.ntnu.idi.idatt.model.market.Stock; + /** * Share class * diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java similarity index 79% rename from src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java index ac9152f..6423f5c 100644 --- a/src/main/java/edu/ntnu/idi/idatt/transaction/Purchase.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Purchase.java @@ -1,8 +1,8 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; -import edu.ntnu.idi.idatt.Player; -import edu.ntnu.idi.idatt.calculator.PurchaseCalculator; -import edu.ntnu.idi.idatt.marked.Share; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; +import edu.ntnu.idi.idatt.service.transaction.PurchaseCalculator; /** * Purchase class diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java similarity index 79% rename from src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java index e0b6292..d0debd8 100644 --- a/src/main/java/edu/ntnu/idi/idatt/transaction/Sale.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Sale.java @@ -1,8 +1,8 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; -import edu.ntnu.idi.idatt.Player; -import edu.ntnu.idi.idatt.calculator.SaleCalculator; -import edu.ntnu.idi.idatt.marked.Share; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; +import edu.ntnu.idi.idatt.service.transaction.SaleCalculator; /** * Sale class diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java similarity index 85% rename from src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java index f28629e..e42a892 100644 --- a/src/main/java/edu/ntnu/idi/idatt/transaction/Transaction.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/Transaction.java @@ -1,8 +1,8 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; -import edu.ntnu.idi.idatt.Player; -import edu.ntnu.idi.idatt.calculator.TransactionCalculator; -import edu.ntnu.idi.idatt.marked.Share; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; +import edu.ntnu.idi.idatt.service.transaction.TransactionCalculator; /** * Transaction class diff --git a/src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java b/src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java similarity index 97% rename from src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java rename to src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java index e07e8c9..2dd77d4 100644 --- a/src/main/java/edu/ntnu/idi/idatt/transaction/TransactionArchive.java +++ b/src/main/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchive.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java similarity index 93% rename from src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java index fd7847f..e43a80f 100644 --- a/src/main/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculator.java +++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculator.java @@ -1,9 +1,9 @@ -package edu.ntnu.idi.idatt.calculator; - -import edu.ntnu.idi.idatt.marked.Share; +package edu.ntnu.idi.idatt.service.transaction; import java.math.BigDecimal; +import edu.ntnu.idi.idatt.model.portfolio.Share; + /** * PurchaseCalculator class * diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java similarity index 95% rename from src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java index 6c65302..8bbe827 100644 --- a/src/main/java/edu/ntnu/idi/idatt/calculator/SaleCalculator.java +++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculator.java @@ -1,6 +1,6 @@ -package edu.ntnu.idi.idatt.calculator; +package edu.ntnu.idi.idatt.service.transaction; -import edu.ntnu.idi.idatt.marked.Share; +import edu.ntnu.idi.idatt.model.portfolio.Share; import java.math.BigDecimal; diff --git a/src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java b/src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java similarity index 92% rename from src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java rename to src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java index fdfa9b1..8b75337 100644 --- a/src/main/java/edu/ntnu/idi/idatt/calculator/TransactionCalculator.java +++ b/src/main/java/edu/ntnu/idi/idatt/service/transaction/TransactionCalculator.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.calculator; +package edu.ntnu.idi.idatt.service.transaction; import java.math.BigDecimal; diff --git a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java b/src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java similarity index 96% rename from src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java rename to src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java index d4d9ea7..71b4e18 100644 --- a/src/main/java/edu/ntnu/idi/idatt/file/ExchangeLoader.java +++ b/src/main/java/edu/ntnu/idi/idatt/storage/ExchangeLoader.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.file; +package edu.ntnu.idi.idatt.storage; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; public class ExchangeLoader { From 53109c9ffbea34ed6f5401ccd06e360b07ce690d Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 17:20:22 +0200 Subject: [PATCH 6/8] refactor: Test packages. --- .../edu/ntnu/idi/idatt/{ => model}/ExchangeTest.java | 7 ++++--- .../idi/idatt/{marked => model/market}/StockTest.java | 2 +- .../ntnu/idi/idatt/{ => model/player}/PlayerTest.java | 8 ++++---- .../idatt/{marked => model/portfolio}/PortfolioTest.java | 2 +- .../idi/idatt/{marked => model/portfolio}/ShareTest.java | 4 +++- .../idi/idatt/{ => model}/transaction/PurchaseTest.java | 8 ++++---- .../ntnu/idi/idatt/{ => model}/transaction/SaleTest.java | 9 ++++----- .../{ => model}/transaction/TransactionArchiveTest.java | 6 +++--- .../transaction}/PurchaseCalculatorTest.java | 6 +++--- .../transaction}/SaleCalculatorTest.java | 6 +++--- .../idi/idatt/{file => storage}/ExchangeLoaderTest.java | 4 ++-- 11 files changed, 32 insertions(+), 30 deletions(-) rename src/test/java/edu/ntnu/idi/idatt/{ => model}/ExchangeTest.java (96%) rename src/test/java/edu/ntnu/idi/idatt/{marked => model/market}/StockTest.java (97%) rename src/test/java/edu/ntnu/idi/idatt/{ => model/player}/PlayerTest.java (92%) rename src/test/java/edu/ntnu/idi/idatt/{marked => model/portfolio}/PortfolioTest.java (98%) rename src/test/java/edu/ntnu/idi/idatt/{marked => model/portfolio}/ShareTest.java (89%) rename src/test/java/edu/ntnu/idi/idatt/{ => model}/transaction/PurchaseTest.java (90%) rename src/test/java/edu/ntnu/idi/idatt/{ => model}/transaction/SaleTest.java (91%) rename src/test/java/edu/ntnu/idi/idatt/{ => model}/transaction/TransactionArchiveTest.java (95%) rename src/test/java/edu/ntnu/idi/idatt/{calculator => service/transaction}/PurchaseCalculatorTest.java (89%) rename src/test/java/edu/ntnu/idi/idatt/{calculator => service/transaction}/SaleCalculatorTest.java (93%) rename src/test/java/edu/ntnu/idi/idatt/{file => storage}/ExchangeLoaderTest.java (96%) diff --git a/src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java b/src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java similarity index 96% rename from src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java index 02cb3d7..3c9f878 100644 --- a/src/test/java/edu/ntnu/idi/idatt/ExchangeTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/ExchangeTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt; +package edu.ntnu.idi.idatt.model; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -17,8 +17,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Stock; -import edu.ntnu.idi.idatt.transaction.Transaction; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.transaction.Transaction; class ExchangeTest { diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java b/src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java similarity index 97% rename from src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java index 941d9c5..5b27600 100644 --- a/src/test/java/edu/ntnu/idi/idatt/marked/StockTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/market/StockTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.market; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/edu/ntnu/idi/idatt/PlayerTest.java b/src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java similarity index 92% rename from src/test/java/edu/ntnu/idi/idatt/PlayerTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java index e292971..16bbb95 100644 --- a/src/test/java/edu/ntnu/idi/idatt/PlayerTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/player/PlayerTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt; +package edu.ntnu.idi.idatt.model.player; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -9,9 +9,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; -import edu.ntnu.idi.idatt.transaction.Purchase; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.portfolio.Share; +import edu.ntnu.idi.idatt.model.transaction.Purchase; class PlayerTest { diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java similarity index 98% rename from src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java index e3a6898..f361d0e 100644 --- a/src/test/java/edu/ntnu/idi/idatt/marked/PortfolioTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.portfolio; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java similarity index 89% rename from src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java index ac69822..cefea8b 100644 --- a/src/test/java/edu/ntnu/idi/idatt/marked/ShareTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/ShareTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.marked; +package edu.ntnu.idi.idatt.model.portfolio; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,6 +8,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import edu.ntnu.idi.idatt.model.market.Stock; + public class ShareTest { private Share share; diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java similarity index 90% rename from src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java index 25f9c9e..caf44c1 100644 --- a/src/test/java/edu/ntnu/idi/idatt/transaction/PurchaseTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/PurchaseTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,9 +10,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.Player; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; /** * Testing for Purchase class diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java similarity index 91% rename from src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java index 2f5523b..1bd944e 100644 --- a/src/test/java/edu/ntnu/idi/idatt/transaction/SaleTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/SaleTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,10 +10,9 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.Exchange; -import edu.ntnu.idi.idatt.Player; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.player.Player; +import edu.ntnu.idi.idatt.model.portfolio.Share; /** * Testing for Sale class diff --git a/src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java b/src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java similarity index 95% rename from src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java rename to src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java index 74930fb..32739ae 100644 --- a/src/test/java/edu/ntnu/idi/idatt/transaction/TransactionArchiveTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/transaction/TransactionArchiveTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.transaction; +package edu.ntnu.idi.idatt.model.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -10,8 +10,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.portfolio.Share; class TransactionArchiveTest { diff --git a/src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java similarity index 89% rename from src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java rename to src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java index 5d306c0..7870ea4 100644 --- a/src/test/java/edu/ntnu/idi/idatt/calculator/PurchaseCalculatorTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/service/transaction/PurchaseCalculatorTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.calculator; +package edu.ntnu.idi.idatt.service.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.portfolio.Share; class PurchaseCalculatorTest { diff --git a/src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java b/src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java similarity index 93% rename from src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java rename to src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java index 3672172..eacc8e2 100644 --- a/src/test/java/edu/ntnu/idi/idatt/calculator/SaleCalculatorTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/service/transaction/SaleCalculatorTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.calculator; +package edu.ntnu.idi.idatt.service.transaction; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -8,8 +8,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Share; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.model.portfolio.Share; class SaleCalculatorTest { diff --git a/src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java b/src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java similarity index 96% rename from src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java rename to src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java index 94f5617..d3d82d7 100644 --- a/src/test/java/edu/ntnu/idi/idatt/file/ExchangeLoaderTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/storage/ExchangeLoaderTest.java @@ -1,4 +1,4 @@ -package edu.ntnu.idi.idatt.file; +package edu.ntnu.idi.idatt.storage; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -14,7 +14,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.marked.Stock; +import edu.ntnu.idi.idatt.model.market.Stock; /** * Test class for ExchangeLoader From 952f67a1640e7bdea486bfcdd52c7d17c37fc2bd Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 17:26:17 +0200 Subject: [PATCH 7/8] refactor: Cleanup after process. --- pom.xml | 12 ------------ .../idi/idatt/model/portfolio/PortfolioTest.java | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 15e1d8c..36567cf 100644 --- a/pom.xml +++ b/pom.xml @@ -20,24 +20,12 @@ maven-compiler-plugin 3.14.1 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.12.0 - org.openjfx javafx-controls 25.0.1 - - - org.openjfx - javafx-media - 25.0.1 - org.junit.jupiter diff --git a/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java index f361d0e..743963f 100644 --- a/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java +++ b/src/test/java/edu/ntnu/idi/idatt/model/portfolio/PortfolioTest.java @@ -11,7 +11,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import edu.ntnu.idi.idatt.calculator.SaleCalculator; +import edu.ntnu.idi.idatt.model.market.Stock; +import edu.ntnu.idi.idatt.service.transaction.SaleCalculator; public class PortfolioTest { From 15807b61f8b19fb357e38b2e984c803c9c3de71a Mon Sep 17 00:00:00 2001 From: pawelsa Date: Fri, 24 Apr 2026 17:27:27 +0200 Subject: [PATCH 8/8] fix: Old path in pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 36567cf..133a526 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ javafx-maven-plugin 0.0.8 - edu.ntnu.idi.idatt.gui.javafx + edu.ntnu.idi.idatt.Launcher