Skip to content

Commit

Permalink
Structure re-ordering.
Browse files Browse the repository at this point in the history
  • Loading branch information
cheezballs committed Dec 5, 2023
1 parent f4a13e4 commit c6318e9
Show file tree
Hide file tree
Showing 22 changed files with 57 additions and 42 deletions.
4 changes: 2 additions & 2 deletions src/main/java/dev/indoors/ringrats/RingRats.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.indoors.ringrats;

import dev.indoors.ringrats.exception.ArgumentException;
import dev.indoors.ringrats.match.MatchConfiguration;
import dev.indoors.ringrats.service.ConfigurationService;
import dev.indoors.ringrats.service.SimulationService;
import dev.indoors.ringrats.simulation.core.exception.ArgumentException;
import dev.indoors.ringrats.simulation.match.MatchConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
Expand Down
6 changes: 0 additions & 6 deletions src/main/java/dev/indoors/ringrats/condition/Condition.java

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/dev/indoors/ringrats/core/Simulatable.java

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/dev/indoors/ringrats/goal/Goal.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule;
import dev.indoors.ringrats.stipulation.Stipulation;
import dev.indoors.ringrats.simulation.stipulation.Stipulation;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
import com.fasterxml.jackson.databind.JsonNode;
import dev.indoors.ringrats.stipulation.Stipulation;
import dev.indoors.ringrats.stipulation.StipulationFactory;
import dev.indoors.ringrats.simulation.stipulation.Stipulation;
import dev.indoors.ringrats.simulation.stipulation.StipulationFactory;

import java.io.IOException;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.indoors.ringrats.service;

import dev.indoors.ringrats.exception.ArgumentException;
import dev.indoors.ringrats.match.MatchConfiguration;
import dev.indoors.ringrats.simulation.core.exception.ArgumentException;
import dev.indoors.ringrats.simulation.match.MatchConfiguration;

public interface ConfigurationService {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package dev.indoors.ringrats.service;

import dev.indoors.ringrats.match.MatchConfiguration;
import dev.indoors.ringrats.simulation.match.MatchConfiguration;

public interface SimulationService {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package dev.indoors.ringrats.service.impl;

import com.fasterxml.jackson.databind.ObjectMapper;
import dev.indoors.ringrats.exception.ArgumentException;
import dev.indoors.ringrats.match.MatchConfiguration;
import dev.indoors.ringrats.service.ConfigurationService;
import dev.indoors.ringrats.simulation.core.exception.ArgumentException;
import dev.indoors.ringrats.simulation.match.MatchConfiguration;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.indoors.ringrats.service.impl;

import dev.indoors.ringrats.match.MatchConfiguration;
import dev.indoors.ringrats.service.SimulationService;
import dev.indoors.ringrats.simulation.match.MatchConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dev.indoors.ringrats.simulation.condition;

public interface Condition {


}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dev.indoors.ringrats.simulation.core;

public interface Simulatable {


}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.exception;
package dev.indoors.ringrats.simulation.core.exception;

import java.io.Serial;

Expand Down
6 changes: 6 additions & 0 deletions src/main/java/dev/indoors/ringrats/simulation/goal/Goal.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dev.indoors.ringrats.simulation.goal;

public interface Goal {


}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package dev.indoors.ringrats.match;
package dev.indoors.ringrats.simulation.match;

import com.fasterxml.jackson.annotation.JsonProperty;
import dev.indoors.ringrats.stipulation.Stipulation;
import dev.indoors.ringrats.wrestler.Wrestler;
import dev.indoors.ringrats.simulation.stipulation.Stipulation;
import dev.indoors.ringrats.simulation.wrestler.Wrestler;

import java.util.Set;

public class MatchConfiguration {

@JsonProperty()
Set<Stipulation> stipulations;

@JsonProperty()
Set<Wrestler> wrestlers;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.stipulation;
package dev.indoors.ringrats.simulation.stipulation;

import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.stipulation;
package dev.indoors.ringrats.simulation.stipulation;

public interface Stipulation {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.stipulation;
package dev.indoors.ringrats.simulation.stipulation;

public class StipulationFactory {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.wrestler;
package dev.indoors.ringrats.simulation.wrestler;

public class Health {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.indoors.ringrats.wrestler;
package dev.indoors.ringrats.simulation.wrestler;

import dev.indoors.ringrats.condition.Condition;
import dev.indoors.ringrats.core.Simulatable;
import dev.indoors.ringrats.simulation.condition.Condition;
import dev.indoors.ringrats.simulation.core.Simulatable;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.indoors.ringrats.wrestler;
package dev.indoors.ringrats.simulation.wrestler;

import lombok.Getter;
import lombok.NoArgsConstructor;
Expand Down
15 changes: 15 additions & 0 deletions src/test/resources/1v1-basic.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"wrestlers": [
{
"name": "Chudd"
},
{
"name": "Rufus"
}
],
"stipulations": [
{
"name": "OneFall"
}
]
}

0 comments on commit c6318e9

Please sign in to comment.