hamburghammer/playtime-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: hamburghammer:51115e1a2a752d588754a050f148f7a4cb0740b7
Branches Tags
hamburghammer:master
hamburghammer:port
..
compare: hamburghammer:905fc4ba35ebb93f5f877e17d4480e21dc21c0c4
Branches Tags
hamburghammer:port
hamburghammer:master

No commits in common. "51115e1a2a752d588754a050f148f7a4cb0740b7" and "905fc4ba35ebb93f5f877e17d4480e21dc21c0c4" have entirely different histories.
51115e1a2a ... 905fc4ba35

7 changed files with 13 additions and 100 deletions
Show stats Expand all files Collapse all files

8
pom.xml
View file

@ -10,10 +10,10 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>20</maven.compiler.source>
<maven.compiler.source>18</maven.compiler.source>
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
<junit.jupiter.version>5.10.0</junit.jupiter.version>
<mockito.version>5.4.0</mockito.version>
<junit.jupiter.version>5.9.0</junit.jupiter.version>
<mockito.version>4.8.0</mockito.version>
</properties>
<repositories>
@ -27,7 +27,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId>
<version>1.20.1-R0.1-SNAPSHOT</version>
<version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

32
src/main/java/de/hhhammer/playtime/ng/PlaytimeCalculator.java
View file

@ -1,32 +0,0 @@
package de.hhhammer.playtime.ng;
import de.hhhammer.playtime.ng.player.Player;
import java.time.Clock;
import java.time.Duration;
import java.time.LocalDateTime;
public class PlaytimeCalculator {
private final Clock clock;
public PlaytimeCalculator(Clock clock) {
this.clock = clock;
}
public PlaytimeCalculator() {
this(Clock.systemDefaultZone());
}
public Duration calculatePlaytime(Player player) {
Duration playTime = timePassedBetweenSaveOrJoin(player);
return Duration.from(player.playtime()).plus(playTime);
}
private Duration timePassedBetweenSaveOrJoin(Player player) {
if (player.saveTime().isPresent() && Duration.between(player.saveTime().get(), player.joinTime()).isNegative()) {
return Duration.between(player.saveTime().get(), LocalDateTime.now(clock));
}
return Duration.between(player.joinTime(), LocalDateTime.now(clock));
}
}

6
src/main/java/de/hhhammer/playtime/ng/Plugin.java
View file

@ -1,6 +1,6 @@
package de.hhhammer.playtime.ng;
import de.hhhammer.playtime.ng.persistence.FileSystemPlayerTimeDB;
import de.hhhammer.playtime.ng.persistence.FileSystemDB;
import de.hhhammer.playtime.ng.serialization.JsonSerializationFactory;
import de.hhhammer.playtime.ng.serialization.SerializationFactory;
import org.bukkit.plugin.java.JavaPlugin;
@ -9,12 +9,12 @@ import java.io.File;
import java.time.format.DateTimeFormatter;
public final class Plugin extends JavaPlugin {
private final FileSystemPlayerTimeDB persistence;
private final FileSystemDB persistence;
public Plugin() {
super();
final SerializationFactory serializationFactory = new JsonSerializationFactory(DateTimeFormatter.ISO_DATE_TIME);
this.persistence = new FileSystemPlayerTimeDB(new File("plugins/PlayTimeNG"), serializationFactory);
this.persistence = new FileSystemDB(new File("plugins/PlayTimeNG"), serializationFactory);
}
@Override

4
src/main/java/de/hhhammer/playtime/ng/persistence/FileSystemPlayerTimeDB.java → src/main/java/de/hhhammer/playtime/ng/persistence/FileSystemDB.java
View file

@ -12,12 +12,12 @@ import java.util.List;
import java.util.Optional;
import java.util.UUID;
public final class FileSystemPlayerTimeDB implements PlayerTimeDB {
public final class FileSystemDB implements PersistPlayer, FindPlayer {
private final File saveDirectory;
private final SerializationFactory serializationFactory;
public FileSystemPlayerTimeDB(final File saveDirectory, final SerializationFactory serializationFactory) {
public FileSystemDB(final File saveDirectory, final SerializationFactory serializationFactory) {
this.saveDirectory = saveDirectory;
this.serializationFactory = serializationFactory;
}

4
src/main/java/de/hhhammer/playtime/ng/persistence/PlayerTimeDB.java
View file

@ -1,4 +0,0 @@
package de.hhhammer.playtime.ng.persistence;
public interface PlayerTimeDB extends FindPlayer, PersistPlayer{
}

51
src/test/java/de/hhhammer/playtime/ng/PlaytimeCalculatorTest.java
View file

@ -1,51 +0,0 @@
package de.hhhammer.playtime.ng;
import de.hhhammer.playtime.ng.player.PlayTimePlayer;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import java.time.*;
import java.util.UUID;
import static org.junit.jupiter.api.Assertions.assertEquals;
class PlaytimeCalculatorTest {
@Nested
class CalculatePlaytimeTest {
private final Clock clock = Clock.fixed(Instant.parse("2018-08-22T10:00:00Z"), ZoneId.systemDefault());
@Test
void shouldReturnTimeBetweenJoinAndNowWhenNotSaved() {
var playtimeCalculator = new PlaytimeCalculator(clock);
var player = new PlayTimePlayer(UUID.randomUUID(), "Name", Duration.ofHours(1), LocalDateTime.now(clock).minusMinutes(5));
Duration playtime = playtimeCalculator.calculatePlaytime(player);
assertEquals(Duration.ofHours(1)
.plus(Duration.ofMinutes(5)),
playtime);
}
@Test
void shouldReturnTimeBetweenJoinAndNowWhenSavedBeforeJoin() {
var playtimeCalculator = new PlaytimeCalculator(clock);
var player = new PlayTimePlayer(UUID.randomUUID(), "Name", Duration.ofHours(1), LocalDateTime.now(clock).minusMinutes(5));
Duration playtime = playtimeCalculator.calculatePlaytime(player);
assertEquals(Duration.ofHours(1)
.plus(Duration.ofMinutes(5)),
playtime);
}
@Test
void shouldReturnTimeBetweenSaveAndNowWhenSavedAfterJoin() {
var playtimeCalculator = new PlaytimeCalculator(clock);
var player = new PlayTimePlayer(UUID.randomUUID(), "Name", Duration.ofHours(1), LocalDateTime.now(clock).minusMinutes(5), LocalDateTime.now(clock).minusMinutes(1));
Duration playtime = playtimeCalculator.calculatePlaytime(player);
assertEquals(Duration.ofHours(1)
.plus(Duration.ofMinutes(1)),
playtime);
}
}
}

8
src/test/java/de/hhhammer/playtime/ng/persistence/FileSystemPlayerTimeDBTest.java → src/test/java/de/hhhammer/playtime/ng/persistence/FileSystemDBTest.java
View file

@ -25,7 +25,7 @@ import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.*;
@ExtendWith(MockitoExtension.class)
class FileSystemPlayerTimeDBTest {
class FileSystemDBTest {
@Mock
private SerializationFactory mockSerializationFactory;
@ -34,13 +34,13 @@ class FileSystemPlayerTimeDBTest {
@Mock
private Serializer mockSerializer;
private File testDirectory;
private FileSystemPlayerTimeDB fileSystemDB;
private FileSystemDB fileSystemDB;
@BeforeEach
void setup() throws IOException {
final Path path = Files.createTempDirectory("playtime").toAbsolutePath();
this.testDirectory = path.toFile();
this.fileSystemDB = new FileSystemPlayerTimeDB(testDirectory, mockSerializationFactory);
this.fileSystemDB = new FileSystemDB(testDirectory, mockSerializationFactory);
}
@AfterEach
@ -100,7 +100,7 @@ class FileSystemPlayerTimeDBTest {
@Test
void shouldThrowIfDirectoryIsAFile() {
final var notADir = new File(testDirectory, "not_a_dir");
final var fileSystemDB = new FileSystemPlayerTimeDB(notADir, mockSerializationFactory);
final var fileSystemDB = new FileSystemDB(notADir, mockSerializationFactory);
final Exception exception = assertThrows(RuntimeException.class, () -> fileSystemDB.findById(UUID.randomUUID()));
assertEquals("Could not find files in: " + notADir.getAbsolutePath(), exception.getMessage());
}