Skip to content

Commit d129eee

Browse files
chore: restructuring for maven
1 parent 35319ba commit d129eee

28 files changed

+102
-104
lines changed

src/main/java/net/swofty/stockmarkettester/AlgorithmStatistics.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package net.swofty.stockmarkettester;
22

3-
import net.swofty.orders.OrderType;
3+
import net.swofty.stockmarkettester.orders.OrderType;
44

55
import java.time.*;
66
import java.time.format.DateTimeFormatter;

src/main/java/net/swofty/stockmarkettester/Portfolio.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package net.swofty.stockmarkettester;
22

33
import lombok.Getter;
4-
import net.swofty.exceptions.InsufficientFundsException;
5-
import net.swofty.orders.MarketDataPoint;
6-
import net.swofty.orders.Option;
7-
import net.swofty.orders.OptionType;
8-
import net.swofty.orders.StopOrder;
4+
import net.swofty.stockmarkettester.exceptions.InsufficientFundsException;
5+
import net.swofty.stockmarkettester.orders.*;
96

107
import java.time.LocalDateTime;
118
import java.util.ArrayList;
@@ -19,7 +16,7 @@ public class Portfolio {
1916
private final Map<String, Position> positions;
2017
private final Map<String, List<Option>> options;
2118
private final Map<String, List<StopOrder>> stopOrders;
22-
private final Map<String, net.swofty.orders.Short> shortPositions;
19+
private final Map<String, ShortOrder> shortPositions;
2320
private double cash;
2421
private double marginAvailable;
2522
private static final double MARGIN_REQUIREMENT = 0.5; // 50% margin requirement
@@ -77,7 +74,7 @@ public synchronized void shortStock(String ticker, int quantity, double price) {
7774
}
7875

7976
shortPositions.compute(ticker, (k, v) -> {
80-
net.swofty.orders.Short currentShort = v == null ? new net.swofty.orders.Short(quantity, price) : v.addShares(quantity, price);
77+
ShortOrder currentShort = v == null ? new ShortOrder(quantity, price) : v.addShares(quantity, price);
8178
marginAvailable -= marginRequired;
8279
cash += quantity * price; // Proceeds from short sale
8380
return currentShort;
@@ -87,7 +84,7 @@ public synchronized void shortStock(String ticker, int quantity, double price) {
8784
public synchronized void coverShort(String ticker, int quantity, double price) {
8885
totalPositions++;
8986

90-
net.swofty.orders.Short shortPosition = shortPositions.get(ticker);
87+
ShortOrder shortPosition = shortPositions.get(ticker);
9188
if (shortPosition == null || shortPosition.quantity() < quantity) {
9289
throw new IllegalStateException("No short position to cover");
9390
}
@@ -109,7 +106,7 @@ public Map<String, Position> getAllPositions() {
109106
return positions;
110107
}
111108

112-
public Map<String, net.swofty.orders.Short> getAllShortPositions() {
109+
public Map<String, ShortOrder> getAllShortPositions() {
113110
return shortPositions;
114111
}
115112

@@ -201,7 +198,7 @@ public Position getPosition(String ticker) {
201198
return positions.get(ticker);
202199
}
203200

204-
public net.swofty.orders.Short getShortPosition(String ticker) {
201+
public ShortOrder getShortPosition(String ticker) {
205202
return shortPositions.get(ticker);
206203
}
207204

src/main/java/net/swofty/stockmarkettester/builtin/SimpleBuyAndHoldAlgorithm.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package net.swofty.builtin;
1+
package net.swofty.stockmarkettester.builtin;
22

3-
import net.swofty.Portfolio;
4-
import net.swofty.fetchers.AlphaVantageFetcher;
5-
import net.swofty.orders.MarketDataPoint;
6-
import net.swofty.orders.Order;
7-
import net.swofty.orders.OrderType;
8-
import net.swofty.user.Algorithm;
3+
import net.swofty.stockmarkettester.Portfolio;
4+
import net.swofty.stockmarkettester.fetchers.AlphaVantageFetcher;
5+
import net.swofty.stockmarkettester.orders.MarketDataPoint;
6+
import net.swofty.stockmarkettester.orders.Order;
7+
import net.swofty.stockmarkettester.orders.OrderType;
8+
import net.swofty.stockmarkettester.user.Algorithm;
99

1010
import java.time.LocalDateTime;
1111
import java.time.ZoneId;

src/main/java/net/swofty/stockmarkettester/builtin/StockVisualizer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package net.swofty.builtin;
1+
package net.swofty.stockmarkettester.builtin;
22

3-
import net.swofty.stockloopers.IndividualStockLooper;
3+
import net.swofty.stockmarkettester.stockloopers.IndividualStockLooper;
44
import org.jfree.chart.ChartFactory;
55
import org.jfree.chart.ChartPanel;
66
import org.jfree.chart.JFreeChart;

src/main/java/net/swofty/stockmarkettester/builtin/TestAlgorithm.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
package net.swofty.builtin;
1+
package net.swofty.stockmarkettester.builtin;
22

3-
import net.swofty.MarketConfig;
4-
import net.swofty.Portfolio;
5-
import net.swofty.stockloopers.BacktestBuilder;
6-
import net.swofty.data.HistoricalMarketService;
7-
import net.swofty.data.providers.AlphaVantageProvider;
8-
import net.swofty.fetchers.AlphaVantageFetcher;
3+
import net.swofty.stockmarkettester.MarketConfig;
4+
import net.swofty.stockmarkettester.Portfolio;
5+
import net.swofty.stockmarkettester.stockloopers.BacktestBuilder;
6+
import net.swofty.stockmarkettester.data.HistoricalMarketService;
7+
import net.swofty.stockmarkettester.data.providers.AlphaVantageProvider;
8+
import net.swofty.stockmarkettester.fetchers.AlphaVantageFetcher;
99

1010
import java.nio.file.Path;
1111
import java.time.Duration;

src/main/java/net/swofty/stockmarkettester/data/HistoricalMarketService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package net.swofty.data;
1+
package net.swofty.stockmarkettester.data;
22

33
import lombok.Getter;
4-
import net.swofty.MarketConfig;
5-
import net.swofty.orders.HistoricalData;
6-
import net.swofty.orders.MarketDataPoint;
4+
import net.swofty.stockmarkettester.MarketConfig;
5+
import net.swofty.stockmarkettester.orders.HistoricalData;
6+
import net.swofty.stockmarkettester.orders.MarketDataPoint;
77

88
import java.io.IOException;
99
import java.io.ObjectInputStream;

src/main/java/net/swofty/stockmarkettester/data/MarketDataProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package net.swofty.data;
1+
package net.swofty.stockmarkettester.data;
22

33
import lombok.Getter;
44
import lombok.NonNull;
5-
import net.swofty.MarketConfig;
6-
import net.swofty.orders.HistoricalData;
5+
import net.swofty.stockmarkettester.MarketConfig;
6+
import net.swofty.stockmarkettester.orders.HistoricalData;
77
import org.jetbrains.annotations.Nullable;
88

99
import java.time.LocalDateTime;

src/main/java/net/swofty/stockmarkettester/data/MarketDataResponse.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package net.swofty.data;
1+
package net.swofty.stockmarkettester.data;
22

3-
import net.swofty.orders.MarketDataPoint;
3+
import net.swofty.stockmarkettester.orders.MarketDataPoint;
44

55
import java.time.LocalDateTime;
66
import java.util.Collections;

src/main/java/net/swofty/stockmarkettester/data/MarketDataService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package net.swofty.data;
1+
package net.swofty.stockmarkettester.data;
22

3-
import net.swofty.MarketConfig;
4-
import net.swofty.orders.HistoricalData;
5-
import net.swofty.orders.MarketDataPoint;
3+
import net.swofty.stockmarkettester.MarketConfig;
4+
import net.swofty.stockmarkettester.orders.HistoricalData;
5+
import net.swofty.stockmarkettester.orders.MarketDataPoint;
66

77
import java.time.Duration;
88
import java.time.LocalDateTime;

src/main/java/net/swofty/stockmarkettester/data/RateLimiter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.swofty.data;
1+
package net.swofty.stockmarkettester.data;
22

33
import java.util.concurrent.TimeUnit;
44
import java.util.concurrent.atomic.AtomicLong;

0 commit comments

Comments
 (0)