Refactored package structure to follow the MVC-pattern

src/main/java/millions/StockInformationCSVReader.java → src/main/java/millions/controller/StockInformationReader.java

@@ -1,15 +1,17 @@
-package millions;
+package millions.controller;
+
+import millions.model.Stock;
 
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
 
-public class StockInformationCSVReader {
+public class StockInformationReader {
   private final File file;
 
-  public StockInformationCSVReader(File file) {
+  public StockInformationReader(File file) {
     this.file = file;
   }
 

src/main/java/millions/StockInformationCSVWriter.java → src/main/java/millions/controller/StockInformationWriter.java

@@ -1,15 +1,15 @@
-package millions;
+package millions.controller;
+
+import millions.model.Stock;
 
 import java.io.*;
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 
-public class StockInformationCSVWriter {
+public class StockInformationWriter {
   private final List<Stock> stocks;
   private final File destinationFile;
 
-  public StockInformationCSVWriter(List<Stock> stocks,File destinationFile) {
+  public StockInformationWriter(List<Stock> stocks, File destinationFile) {
     this.stocks = stocks;
     this.destinationFile = destinationFile;
   }

src/main/java/millions/Exchange.java → src/main/java/millions/model/Exchange.java

@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

src/main/java/millions/Player.java → src/main/java/millions/model/Player.java

@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

src/main/java/millions/Portfolio.java → src/main/java/millions/model/Portfolio.java

@@ -1,6 +1,6 @@
-package millions;
+package millions.model;
 
-import millions.calculators.SaleCalculator;
+import millions.model.calculators.SaleCalculator;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

src/main/java/millions/Purchase.java → src/main/java/millions/model/Purchase.java

@@ -1,6 +1,6 @@
-package millions;
+package millions.model;
 
-import millions.calculators.PurchaseCalculator;
+import millions.model.calculators.PurchaseCalculator;
 
 public class Purchase extends Transaction {
 

src/main/java/millions/Sale.java → src/main/java/millions/model/Sale.java

@@ -1,6 +1,6 @@
-package millions;
+package millions.model;
 
-import millions.calculators.SaleCalculator;
+import millions.model.calculators.SaleCalculator;
 
 public class Sale extends Transaction {
 

src/main/java/millions/Share.java → src/main/java/millions/model/Share.java

@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import java.math.BigDecimal;
 

src/main/java/millions/Stock.java → src/main/java/millions/model/Stock.java

@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;

src/main/java/millions/Transaction.java → src/main/java/millions/model/Transaction.java

@@ -1,6 +1,6 @@
-package millions;
+package millions.model;
 
-import millions.calculators.TransactionCalculator;
+import millions.model.calculators.TransactionCalculator;
 
 public abstract class Transaction {
 

src/main/java/millions/TransactionArchive.java → src/main/java/millions/model/TransactionArchive.java

@@ -1,4 +1,4 @@
-package millions;
+package millions.model;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/millions/calculators/PurchaseCalculator.java → src/main/java/millions/model/calculators/PurchaseCalculator.java

@@ -1,7 +1,7 @@
-package millions.calculators;
+package millions.model.calculators;
 
 import java.math.BigDecimal;
-import millions.Share;
+import millions.model.Share;
 
 public class PurchaseCalculator implements TransactionCalculator {
   BigDecimal purchasePrice;

src/main/java/millions/calculators/SaleCalculator.java → src/main/java/millions/model/calculators/SaleCalculator.java

@@ -1,8 +1,8 @@
-package millions.calculators;
+package millions.model.calculators;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import millions.Share;
+import millions.model.Share;
 
 public class SaleCalculator implements TransactionCalculator {
   BigDecimal purchasePrice;

src/main/java/millions/calculators/TransactionCalculator.java → src/main/java/millions/model/calculators/TransactionCalculator.java

@@ -1,4 +1,4 @@
-package millions.calculators;
+package millions.model.calculators;
 
 import java.math.BigDecimal;
 

src/test/java/millions/ExchangeTest.java

@@ -4,6 +4,11 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import millions.model.Exchange;
+import millions.model.Player;
+import millions.model.Share;
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class ExchangeTest {

src/test/java/millions/PlayerTest.java

@@ -3,6 +3,8 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
+
+import millions.model.Player;
 import org.junit.jupiter.api.Test;
 
 class PlayerTest {

src/test/java/millions/PortfolioTest.java

@@ -3,6 +3,10 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
+
+import millions.model.Portfolio;
+import millions.model.Share;
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class PortfolioTest {

src/test/java/millions/PurchaseTest.java

@@ -3,6 +3,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
+
+import millions.model.Player;
+import millions.model.Purchase;
+import millions.model.Share;
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class PurchaseTest {

src/test/java/millions/SaleTest.java

@@ -3,6 +3,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
+
+import millions.model.Player;
+import millions.model.Sale;
+import millions.model.Share;
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class SaleTest {

src/test/java/millions/ShareTest.java

@@ -3,6 +3,9 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.math.BigDecimal;
+
+import millions.model.Share;
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class ShareTest {

src/test/java/millions/StockTest.java

@@ -5,6 +5,8 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
+
+import millions.model.Stock;
 import org.junit.jupiter.api.Test;
 
 class StockTest {

src/test/java/millions/TransactionArchiveTest.java

@@ -4,6 +4,8 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+
+import millions.model.*;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;