From 0b6556ac80722e20a9f51472c8499663e3969c34 Mon Sep 17 00:00:00 2001 From: anthonyraymond Date: Wed, 19 Apr 2017 20:37:39 +0200 Subject: [PATCH] Introduce spring & create new package structure --- .mvn/wrapper/maven-wrapper.properties | 1 + pom.xml | 82 ++++++++++++------- .../joal/{ => core}/JackOfAllTrades.java | 8 +- .../araymond/joal/{ => core}/SeedManager.java | 12 +-- .../client/emulated/EmulatedClient.java | 4 +- .../emulated/EmulatedClientFactory.java | 2 +- .../client/emulated/TorrentClientConfig.java | 2 +- ...TorrentClientConfigIntegrityException.java | 2 +- .../{ => core}/config/AppConfiguration.java | 13 ++- .../{ => core}/config/ConfigProvider.java | 2 +- .../ConfigurationIntegrityException.java | 2 +- .../torrent/watcher/TorrentFileProvider.java | 3 +- .../{ => core}/ttorent/client/Client.java | 8 +- .../ttorent/client/ConnectionHandler.java | 2 +- .../ttorent/client/MockedTorrent.java | 2 +- .../ttorent/client/announce/Announce.java | 6 +- .../client/announce/HTTPTrackerClient.java | 8 +- .../client/announce/TrackerClient.java | 4 +- .../http/HTTPAnnounceRequestMessage.java | 4 +- .../client/emulated/ValueTypeTest.java | 4 +- .../watcher/TorrentFileProviderTest.java | 4 +- .../http/HTTPAnnounceRequestMessageTest.java | 5 +- .../joal/core/utils/MockedInjections.java | 22 +++++ 23 files changed, 128 insertions(+), 74 deletions(-) create mode 100644 .mvn/wrapper/maven-wrapper.properties rename src/main/java/org/araymond/joal/{ => core}/JackOfAllTrades.java (93%) rename src/main/java/org/araymond/joal/{ => core}/SeedManager.java (91%) rename src/main/java/org/araymond/joal/{ => core}/client/emulated/EmulatedClient.java (90%) rename src/main/java/org/araymond/joal/{ => core}/client/emulated/EmulatedClientFactory.java (96%) rename src/main/java/org/araymond/joal/{ => core}/client/emulated/TorrentClientConfig.java (99%) rename src/main/java/org/araymond/joal/{ => core}/client/emulated/TorrentClientConfigIntegrityException.java (94%) rename src/main/java/org/araymond/joal/{ => core}/config/AppConfiguration.java (74%) rename src/main/java/org/araymond/joal/{ => core}/config/ConfigProvider.java (96%) rename src/main/java/org/araymond/joal/{ => core}/config/ConfigurationIntegrityException.java (95%) rename src/main/java/org/araymond/joal/{ => core}/torrent/watcher/TorrentFileProvider.java (98%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/Client.java (97%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/ConnectionHandler.java (98%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/MockedTorrent.java (98%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/announce/Announce.java (98%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/announce/HTTPTrackerClient.java (96%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/client/announce/TrackerClient.java (97%) rename src/main/java/org/araymond/joal/{ => core}/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java (98%) rename src/test/java/org/araymond/joal/{ => core}/client/emulated/ValueTypeTest.java (96%) rename src/test/java/org/araymond/joal/{ => core}/torrent/watcher/TorrentFileProviderTest.java (96%) rename src/test/java/org/araymond/joal/{ => core}/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java (97%) create mode 100644 src/test/java/org/araymond/joal/core/utils/MockedInjections.java diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..c315043 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip diff --git a/pom.xml b/pom.xml index 1c102ab..b7e56fd 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,15 @@ - + 4.0.0 org.araymond.joal jack-of-all-trades - 1.0.4-SNAPSHOT + 2.0.0-SNAPSHOT + jar + + jack-of-all-trades + A Java command line RatioMaster scm:git:https://github.com/anthonyraymond/joal.git @@ -15,6 +18,13 @@ HEAD + + org.springframework.boot + spring-boot-starter-parent + 1.5.2.RELEASE + + + UTF-8 @@ -29,7 +39,7 @@ 2.8.0 1.3.1 1.5 - 2.7 + 2.7 4.12 @@ -38,22 +48,46 @@ + + org.springframework.boot + spring-boot-starter-websocket + + + ch.qos.logback + logback-classic + + + + + javax.inject + javax.inject + 1 + org.slf4j slf4j-api - 1.7.22 + 1.7.25 org.apache.logging.log4j log4j-slf4j-impl - ${log4j-core.version} + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} org.apache.logging.log4j log4j-core - ${log4j-core.version} + ${log4j.version} + + + org.apache.logging.log4j + log4j-jcl + ${log4j.version} - com.turn ttorrent-core @@ -87,13 +121,19 @@ ${commons-cli.version} + + + + org.springframework.boot + spring-boot-starter-test + test + junit junit ${junit.version} test - org.assertj assertj-core @@ -150,26 +190,8 @@ - org.apache.maven.plugins - maven-shade-plugin - 2.3 - - - - package - - shade - - - - - - org.araymond.joal.JackOfAllTrades - - - - - + org.springframework.boot + spring-boot-maven-plugin diff --git a/src/main/java/org/araymond/joal/JackOfAllTrades.java b/src/main/java/org/araymond/joal/core/JackOfAllTrades.java similarity index 93% rename from src/main/java/org/araymond/joal/JackOfAllTrades.java rename to src/main/java/org/araymond/joal/core/JackOfAllTrades.java index 45adc83..bb76c7e 100644 --- a/src/main/java/org/araymond/joal/JackOfAllTrades.java +++ b/src/main/java/org/araymond/joal/core/JackOfAllTrades.java @@ -1,13 +1,13 @@ -package org.araymond.joal; +package org.araymond.joal.core; import org.apache.commons.cli.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.core.LifeCycle; import org.apache.logging.log4j.core.LoggerContext; -import org.araymond.joal.client.emulated.EmulatedClientFactory; -import org.araymond.joal.config.ConfigProvider; -import org.araymond.joal.torrent.watcher.TorrentFileProvider; +import org.araymond.joal.core.client.emulated.EmulatedClientFactory; +import org.araymond.joal.core.config.ConfigProvider; +import org.araymond.joal.core.torrent.watcher.TorrentFileProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/SeedManager.java b/src/main/java/org/araymond/joal/core/SeedManager.java similarity index 91% rename from src/main/java/org/araymond/joal/SeedManager.java rename to src/main/java/org/araymond/joal/core/SeedManager.java index 58c7a2e..4a039fe 100644 --- a/src/main/java/org/araymond/joal/SeedManager.java +++ b/src/main/java/org/araymond/joal/core/SeedManager.java @@ -1,11 +1,11 @@ -package org.araymond.joal; +package org.araymond.joal.core; import com.google.common.eventbus.Subscribe; -import org.araymond.joal.client.emulated.EmulatedClientFactory; -import org.araymond.joal.config.ConfigProvider; -import org.araymond.joal.torrent.watcher.TorrentFileProvider; -import org.araymond.joal.ttorent.client.Client; -import org.araymond.joal.ttorent.client.MockedTorrent; +import org.araymond.joal.core.client.emulated.EmulatedClientFactory; +import org.araymond.joal.core.config.ConfigProvider; +import org.araymond.joal.core.torrent.watcher.TorrentFileProvider; +import org.araymond.joal.core.ttorent.client.Client; +import org.araymond.joal.core.ttorent.client.MockedTorrent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/client/emulated/EmulatedClient.java b/src/main/java/org/araymond/joal/core/client/emulated/EmulatedClient.java similarity index 90% rename from src/main/java/org/araymond/joal/client/emulated/EmulatedClient.java rename to src/main/java/org/araymond/joal/core/client/emulated/EmulatedClient.java index bcad0a2..487ca32 100644 --- a/src/main/java/org/araymond/joal/client/emulated/EmulatedClient.java +++ b/src/main/java/org/araymond/joal/core/client/emulated/EmulatedClient.java @@ -1,11 +1,11 @@ -package org.araymond.joal.client.emulated; +package org.araymond.joal.core.client.emulated; import com.google.common.collect.ImmutableList; import java.util.*; import java.util.stream.Collectors; -import static org.araymond.joal.client.emulated.TorrentClientConfig.HttpHeader; +import static org.araymond.joal.core.client.emulated.TorrentClientConfig.HttpHeader; /** * Created by raymo on 26/01/2017. diff --git a/src/main/java/org/araymond/joal/client/emulated/EmulatedClientFactory.java b/src/main/java/org/araymond/joal/core/client/emulated/EmulatedClientFactory.java similarity index 96% rename from src/main/java/org/araymond/joal/client/emulated/EmulatedClientFactory.java rename to src/main/java/org/araymond/joal/core/client/emulated/EmulatedClientFactory.java index b5cf9eb..1cb8c2a 100644 --- a/src/main/java/org/araymond/joal/client/emulated/EmulatedClientFactory.java +++ b/src/main/java/org/araymond/joal/core/client/emulated/EmulatedClientFactory.java @@ -1,4 +1,4 @@ -package org.araymond.joal.client.emulated; +package org.araymond.joal.core.client.emulated; import com.google.gson.GsonBuilder; diff --git a/src/main/java/org/araymond/joal/client/emulated/TorrentClientConfig.java b/src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfig.java similarity index 99% rename from src/main/java/org/araymond/joal/client/emulated/TorrentClientConfig.java rename to src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfig.java index f5fb751..42b8f51 100644 --- a/src/main/java/org/araymond/joal/client/emulated/TorrentClientConfig.java +++ b/src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfig.java @@ -1,4 +1,4 @@ -package org.araymond.joal.client.emulated; +package org.araymond.joal.core.client.emulated; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/src/main/java/org/araymond/joal/client/emulated/TorrentClientConfigIntegrityException.java b/src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfigIntegrityException.java similarity index 94% rename from src/main/java/org/araymond/joal/client/emulated/TorrentClientConfigIntegrityException.java rename to src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfigIntegrityException.java index e7213a2..b5eb475 100644 --- a/src/main/java/org/araymond/joal/client/emulated/TorrentClientConfigIntegrityException.java +++ b/src/main/java/org/araymond/joal/core/client/emulated/TorrentClientConfigIntegrityException.java @@ -1,4 +1,4 @@ -package org.araymond.joal.client.emulated; +package org.araymond.joal.core.client.emulated; /** * Created by raymo on 24/01/2017. diff --git a/src/main/java/org/araymond/joal/config/AppConfiguration.java b/src/main/java/org/araymond/joal/core/config/AppConfiguration.java similarity index 74% rename from src/main/java/org/araymond/joal/config/AppConfiguration.java rename to src/main/java/org/araymond/joal/core/config/AppConfiguration.java index 60ffce6..4883f65 100644 --- a/src/main/java/org/araymond/joal/config/AppConfiguration.java +++ b/src/main/java/org/araymond/joal/core/config/AppConfiguration.java @@ -1,5 +1,6 @@ -package org.araymond.joal.config; +package org.araymond.joal.core.config; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.commons.lang3.StringUtils; /** @@ -11,12 +12,21 @@ public class AppConfiguration { private int maxUploadRate = 195; private int seedFor = 840; private int waitBetweenSeed = 600; + @JsonProperty("client") private String client = "azureus-5.7.4.0.client"; AppConfiguration(){ } + public AppConfiguration(final int minUploadRate, final int maxUploadRate, final int seedFor, final int waitBetweenSeed, final String client) { + this.minUploadRate = minUploadRate; + this.maxUploadRate = maxUploadRate; + this.seedFor = seedFor; + this.waitBetweenSeed = waitBetweenSeed; + this.client = client; + } + public int getMaxUploadRate() { return maxUploadRate; } @@ -33,6 +43,7 @@ public class AppConfiguration { return waitBetweenSeed; } + @JsonProperty("client") public String getClientFileName() { return client; } diff --git a/src/main/java/org/araymond/joal/config/ConfigProvider.java b/src/main/java/org/araymond/joal/core/config/ConfigProvider.java similarity index 96% rename from src/main/java/org/araymond/joal/config/ConfigProvider.java rename to src/main/java/org/araymond/joal/core/config/ConfigProvider.java index 3f0e5e0..191a12a 100644 --- a/src/main/java/org/araymond/joal/config/ConfigProvider.java +++ b/src/main/java/org/araymond/joal/core/config/ConfigProvider.java @@ -1,4 +1,4 @@ -package org.araymond.joal.config; +package org.araymond.joal.core.config; import com.google.gson.GsonBuilder; diff --git a/src/main/java/org/araymond/joal/config/ConfigurationIntegrityException.java b/src/main/java/org/araymond/joal/core/config/ConfigurationIntegrityException.java similarity index 95% rename from src/main/java/org/araymond/joal/config/ConfigurationIntegrityException.java rename to src/main/java/org/araymond/joal/core/config/ConfigurationIntegrityException.java index 3fdb632..2892ddb 100644 --- a/src/main/java/org/araymond/joal/config/ConfigurationIntegrityException.java +++ b/src/main/java/org/araymond/joal/core/config/ConfigurationIntegrityException.java @@ -1,4 +1,4 @@ -package org.araymond.joal.config; +package org.araymond.joal.core.config; /** * Created by raymo on 24/01/2017. diff --git a/src/main/java/org/araymond/joal/torrent/watcher/TorrentFileProvider.java b/src/main/java/org/araymond/joal/core/torrent/watcher/TorrentFileProvider.java similarity index 98% rename from src/main/java/org/araymond/joal/torrent/watcher/TorrentFileProvider.java rename to src/main/java/org/araymond/joal/core/torrent/watcher/TorrentFileProvider.java index 325d2ce..2d9f911 100644 --- a/src/main/java/org/araymond/joal/torrent/watcher/TorrentFileProvider.java +++ b/src/main/java/org/araymond/joal/core/torrent/watcher/TorrentFileProvider.java @@ -1,4 +1,4 @@ -package org.araymond.joal.torrent.watcher; +package org.araymond.joal.core.torrent.watcher; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.FileFilterUtils; @@ -13,7 +13,6 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/araymond/joal/ttorent/client/Client.java b/src/main/java/org/araymond/joal/core/ttorent/client/Client.java similarity index 97% rename from src/main/java/org/araymond/joal/ttorent/client/Client.java rename to src/main/java/org/araymond/joal/core/ttorent/client/Client.java index 8a24df9..9042051 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/Client.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/Client.java @@ -1,13 +1,13 @@ -package org.araymond.joal.ttorent.client; +package org.araymond.joal.core.ttorent.client; import com.google.common.eventbus.EventBus; import com.turn.ttorrent.client.Client.ClientState; import com.turn.ttorrent.client.announce.AnnounceResponseListener; import com.turn.ttorrent.common.Peer; import com.turn.ttorrent.common.Torrent; -import org.araymond.joal.client.emulated.EmulatedClient; -import org.araymond.joal.config.ConfigProvider; -import org.araymond.joal.ttorent.client.announce.Announce; +import org.araymond.joal.core.client.emulated.EmulatedClient; +import org.araymond.joal.core.config.ConfigProvider; +import org.araymond.joal.core.ttorent.client.announce.Announce; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/ttorent/client/ConnectionHandler.java b/src/main/java/org/araymond/joal/core/ttorent/client/ConnectionHandler.java similarity index 98% rename from src/main/java/org/araymond/joal/ttorent/client/ConnectionHandler.java rename to src/main/java/org/araymond/joal/core/ttorent/client/ConnectionHandler.java index 949a968..7f33973 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/ConnectionHandler.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/ConnectionHandler.java @@ -1,4 +1,4 @@ -package org.araymond.joal.ttorent.client; +package org.araymond.joal.core.ttorent.client; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/ttorent/client/MockedTorrent.java b/src/main/java/org/araymond/joal/core/ttorent/client/MockedTorrent.java similarity index 98% rename from src/main/java/org/araymond/joal/ttorent/client/MockedTorrent.java rename to src/main/java/org/araymond/joal/core/ttorent/client/MockedTorrent.java index 2049a78..677210d 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/MockedTorrent.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/MockedTorrent.java @@ -1,4 +1,4 @@ -package org.araymond.joal.ttorent.client; +package org.araymond.joal.core.ttorent.client; import com.turn.ttorrent.bcodec.InvalidBEncodingException; import com.turn.ttorrent.common.Torrent; diff --git a/src/main/java/org/araymond/joal/ttorent/client/announce/Announce.java b/src/main/java/org/araymond/joal/core/ttorent/client/announce/Announce.java similarity index 98% rename from src/main/java/org/araymond/joal/ttorent/client/announce/Announce.java rename to src/main/java/org/araymond/joal/core/ttorent/client/announce/Announce.java index 874b681..27b865c 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/announce/Announce.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/announce/Announce.java @@ -1,11 +1,11 @@ -package org.araymond.joal.ttorent.client.announce; +package org.araymond.joal.core.ttorent.client.announce; import com.turn.ttorrent.client.announce.AnnounceException; import com.turn.ttorrent.client.announce.AnnounceResponseListener; import com.turn.ttorrent.common.Peer; import org.apache.commons.lang3.NotImplementedException; -import org.araymond.joal.client.emulated.EmulatedClient; -import org.araymond.joal.ttorent.client.MockedTorrent; +import org.araymond.joal.core.client.emulated.EmulatedClient; +import org.araymond.joal.core.ttorent.client.MockedTorrent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/ttorent/client/announce/HTTPTrackerClient.java b/src/main/java/org/araymond/joal/core/ttorent/client/announce/HTTPTrackerClient.java similarity index 96% rename from src/main/java/org/araymond/joal/ttorent/client/announce/HTTPTrackerClient.java rename to src/main/java/org/araymond/joal/core/ttorent/client/announce/HTTPTrackerClient.java index e077745..e3369d7 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/announce/HTTPTrackerClient.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/announce/HTTPTrackerClient.java @@ -1,13 +1,13 @@ -package org.araymond.joal.ttorent.client.announce; +package org.araymond.joal.core.ttorent.client.announce; import com.turn.ttorrent.client.announce.AnnounceException; import com.turn.ttorrent.client.announce.AnnounceResponseListener; import com.turn.ttorrent.common.Peer; import com.turn.ttorrent.common.protocol.http.HTTPTrackerMessage; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.araymond.joal.client.emulated.EmulatedClient; -import org.araymond.joal.ttorent.client.MockedTorrent; -import org.araymond.joal.ttorent.common.protocol.http.HTTPAnnounceRequestMessage; +import org.araymond.joal.core.client.emulated.EmulatedClient; +import org.araymond.joal.core.ttorent.client.MockedTorrent; +import org.araymond.joal.core.ttorent.common.protocol.http.HTTPAnnounceRequestMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/araymond/joal/ttorent/client/announce/TrackerClient.java b/src/main/java/org/araymond/joal/core/ttorent/client/announce/TrackerClient.java similarity index 97% rename from src/main/java/org/araymond/joal/ttorent/client/announce/TrackerClient.java rename to src/main/java/org/araymond/joal/core/ttorent/client/announce/TrackerClient.java index 3966072..e716798 100644 --- a/src/main/java/org/araymond/joal/ttorent/client/announce/TrackerClient.java +++ b/src/main/java/org/araymond/joal/core/ttorent/client/announce/TrackerClient.java @@ -1,10 +1,10 @@ -package org.araymond.joal.ttorent.client.announce; +package org.araymond.joal.core.ttorent.client.announce; import com.turn.ttorrent.client.announce.AnnounceException; import com.turn.ttorrent.client.announce.AnnounceResponseListener; import com.turn.ttorrent.common.Peer; import com.turn.ttorrent.common.protocol.TrackerMessage; -import org.araymond.joal.ttorent.client.MockedTorrent; +import org.araymond.joal.core.ttorent.client.MockedTorrent; import java.net.URI; import java.util.HashSet; diff --git a/src/main/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java b/src/main/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java similarity index 98% rename from src/main/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java rename to src/main/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java index 9585552..6657f87 100644 --- a/src/main/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java +++ b/src/main/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessage.java @@ -1,4 +1,4 @@ -package org.araymond.joal.ttorent.common.protocol.http; +package org.araymond.joal.core.ttorent.common.protocol.http; import com.turn.ttorrent.bcodec.BDecoder; @@ -9,7 +9,7 @@ import com.turn.ttorrent.common.Peer; import com.turn.ttorrent.common.Torrent; import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage; import com.turn.ttorrent.common.protocol.http.HTTPTrackerMessage; -import org.araymond.joal.client.emulated.EmulatedClient; +import org.araymond.joal.core.client.emulated.EmulatedClient; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/src/test/java/org/araymond/joal/client/emulated/ValueTypeTest.java b/src/test/java/org/araymond/joal/core/client/emulated/ValueTypeTest.java similarity index 96% rename from src/test/java/org/araymond/joal/client/emulated/ValueTypeTest.java rename to src/test/java/org/araymond/joal/core/client/emulated/ValueTypeTest.java index 4e7b4e6..b027513 100644 --- a/src/test/java/org/araymond/joal/client/emulated/ValueTypeTest.java +++ b/src/test/java/org/araymond/joal/core/client/emulated/ValueTypeTest.java @@ -1,4 +1,4 @@ -package org.araymond.joal.client.emulated; +package org.araymond.joal.core.client.emulated; import com.google.gson.Gson; import org.junit.Ignore; @@ -6,7 +6,7 @@ import org.junit.Test; import java.util.regex.Pattern; -import static org.araymond.joal.client.emulated.TorrentClientConfig.ValueType.*; +import static org.araymond.joal.core.client.emulated.TorrentClientConfig.ValueType.*; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; diff --git a/src/test/java/org/araymond/joal/torrent/watcher/TorrentFileProviderTest.java b/src/test/java/org/araymond/joal/core/torrent/watcher/TorrentFileProviderTest.java similarity index 96% rename from src/test/java/org/araymond/joal/torrent/watcher/TorrentFileProviderTest.java rename to src/test/java/org/araymond/joal/core/torrent/watcher/TorrentFileProviderTest.java index 852e1bf..6b85cb5 100644 --- a/src/test/java/org/araymond/joal/torrent/watcher/TorrentFileProviderTest.java +++ b/src/test/java/org/araymond/joal/core/torrent/watcher/TorrentFileProviderTest.java @@ -1,4 +1,4 @@ -package org.araymond.joal.torrent.watcher; +package org.araymond.joal.core.torrent.watcher; import org.junit.After; import org.junit.Before; @@ -9,7 +9,7 @@ import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; import static java.nio.file.Files.exists; -import static org.araymond.joal.torrent.watcher.TorrentFileProvider.ARCHIVE_FOLDER; +import static org.araymond.joal.core.torrent.watcher.TorrentFileProvider.ARCHIVE_FOLDER; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/src/test/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java b/src/test/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java similarity index 97% rename from src/test/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java rename to src/test/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java index b0abf04..a1b653a 100644 --- a/src/test/java/org/araymond/joal/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java +++ b/src/test/java/org/araymond/joal/core/ttorent/common/protocol/http/HTTPAnnounceRequestMessageTest.java @@ -1,8 +1,7 @@ -package org.araymond.joal.ttorent.common.protocol.http; +package org.araymond.joal.core.ttorent.common.protocol.http; -import com.turn.ttorrent.common.protocol.TrackerMessage; import com.turn.ttorrent.common.protocol.TrackerMessage.AnnounceRequestMessage.RequestEvent; -import org.araymond.joal.client.emulated.EmulatedClient; +import org.araymond.joal.core.client.emulated.EmulatedClient; import org.junit.Test; import org.mockito.Mockito; diff --git a/src/test/java/org/araymond/joal/core/utils/MockedInjections.java b/src/test/java/org/araymond/joal/core/utils/MockedInjections.java new file mode 100644 index 0000000..069dad1 --- /dev/null +++ b/src/test/java/org/araymond/joal/core/utils/MockedInjections.java @@ -0,0 +1,22 @@ +package org.araymond.joal.core.utils; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * Created by raymo on 19/04/2017. + */ +public class MockedInjections { + + @Configuration + public static class DefaultObjectMapperDI { + + @Bean + public ObjectMapper mapper() { + return new ObjectMapper(); + } + + } + +}