From bade39bb39bc55ef4f5dd0fa6f91d0b1bfe55608 Mon Sep 17 00:00:00 2001 From: gotty Date: Sat, 18 Jan 2020 03:09:36 +0300 Subject: [PATCH] [LIB-13] Package restructuring --- .../chess/scanner/format/{ => chessbomb}/ArenaFormat.java | 2 +- .../chess/scanner/format/{ => chessbomb}/BaseFormat.java | 2 +- .../hedgecode/chess/scanner/format/{ => chessbomb}/Format.java | 2 +- .../chess/scanner/format/{ => chessbomb}/FormatBuilder.java | 2 +- .../hedgecode/chess/scanner/format/{ => chessbomb}/Game.java | 2 +- .../chess/scanner/format/{ => chessbomb}/GameData.java | 4 +++- .../chess/scanner/format/{ => chessbomb}/GameFormat.java | 2 +- .../chess/scanner/format/{ => chessbomb}/IndexData.java | 2 +- .../hedgecode/chess/scanner/format/{ => chessbomb}/Player.java | 2 +- .../hedgecode/chess/scanner/format/{ => chessbomb}/Room.java | 2 +- .../chess/scanner/format/{ => chessbomb}/RoomData.java | 2 +- .../chess/scanner/format/{ => chessbomb}/TournamentFormat.java | 2 +- .../scanner/json/{format => chessbomb}/AbstractBaseFormat.java | 4 ++-- .../scanner/json/{format => chessbomb}/JSONArenaFormat.java | 8 ++++---- .../scanner/json/{format => chessbomb}/JSONFormatBuilder.java | 10 +++++----- .../chess/scanner/json/{format => chessbomb}/JSONGame.java | 6 +++--- .../chess/scanner/json/{format => chessbomb}/JSONGameData.java | 8 ++++---- .../scanner/json/{format => chessbomb}/JSONGameFormat.java | 6 +++--- .../scanner/json/{format => chessbomb}/JSONIndexData.java | 6 +++--- .../chess/scanner/json/{format => chessbomb}/JSONMove.java | 2 +- .../chess/scanner/json/{format => chessbomb}/JSONPlayer.java | 4 ++-- .../chess/scanner/json/{format => chessbomb}/JSONRoom.java | 4 ++-- .../chess/scanner/json/{format => chessbomb}/JSONRoomData.java | 8 ++++---- .../json/{format => chessbomb}/JSONTournamentFormat.java | 8 ++++---- .../org/hedgecode/chess/scanner/portal/ChessBombScanner.java | 8 ++++---- .../services/org.hedgecode.chess.scanner.format.FormatBuilder | 1 - .../org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder | 1 + 27 files changed, 56 insertions(+), 54 deletions(-) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/ArenaFormat.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/BaseFormat.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/Format.java (96%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/FormatBuilder.java (94%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/Game.java (95%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/GameData.java (88%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/GameFormat.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/IndexData.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/Player.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/Room.java (94%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/RoomData.java (93%) rename src/main/java/org/hedgecode/chess/scanner/format/{ => chessbomb}/TournamentFormat.java (94%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/AbstractBaseFormat.java (90%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONArenaFormat.java (84%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONFormatBuilder.java (81%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONGame.java (94%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONGameData.java (84%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONGameFormat.java (93%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONIndexData.java (84%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONMove.java (95%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONPlayer.java (93%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONRoom.java (95%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONRoomData.java (82%) rename src/main/java/org/hedgecode/chess/scanner/json/{format => chessbomb}/JSONTournamentFormat.java (87%) delete mode 100644 src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.FormatBuilder create mode 100644 src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder diff --git a/src/main/java/org/hedgecode/chess/scanner/format/ArenaFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/ArenaFormat.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/ArenaFormat.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/ArenaFormat.java index ae27bbc..59ae1d5 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/ArenaFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/ArenaFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * ArenaFormat diff --git a/src/main/java/org/hedgecode/chess/scanner/format/BaseFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/BaseFormat.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/BaseFormat.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/BaseFormat.java index be970c9..f133900 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/BaseFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/BaseFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * BaseFormat diff --git a/src/main/java/org/hedgecode/chess/scanner/format/Format.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Format.java similarity index 96% rename from src/main/java/org/hedgecode/chess/scanner/format/Format.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Format.java index 5cd8d6c..4d7ae56 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/Format.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Format.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; import org.hedgecode.chess.scanner.spi.ServiceRegistry; diff --git a/src/main/java/org/hedgecode/chess/scanner/format/FormatBuilder.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/FormatBuilder.java similarity index 94% rename from src/main/java/org/hedgecode/chess/scanner/format/FormatBuilder.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/FormatBuilder.java index 8830d44..04835bf 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/FormatBuilder.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/FormatBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * FormatBuilder diff --git a/src/main/java/org/hedgecode/chess/scanner/format/Game.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Game.java similarity index 95% rename from src/main/java/org/hedgecode/chess/scanner/format/Game.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Game.java index ee4ae3e..2da578d 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/Game.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Game.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; import java.util.Date; diff --git a/src/main/java/org/hedgecode/chess/scanner/format/GameData.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameData.java similarity index 88% rename from src/main/java/org/hedgecode/chess/scanner/format/GameData.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameData.java index 6abc0ed..8e11430 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/GameData.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameData.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; + +import org.hedgecode.chess.scanner.format.Move; /** * GameData diff --git a/src/main/java/org/hedgecode/chess/scanner/format/GameFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameFormat.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/GameFormat.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameFormat.java index 95bffef..ca44ccc 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/GameFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/GameFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; import org.hedgecode.chess.scanner.entity.PGNEntity; diff --git a/src/main/java/org/hedgecode/chess/scanner/format/IndexData.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/IndexData.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/IndexData.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/IndexData.java index 0841aa7..a311b5e 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/IndexData.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/IndexData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * IndexData diff --git a/src/main/java/org/hedgecode/chess/scanner/format/Player.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Player.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/Player.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Player.java index 17b009d..8425d1a 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/Player.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Player.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * Player diff --git a/src/main/java/org/hedgecode/chess/scanner/format/Room.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Room.java similarity index 94% rename from src/main/java/org/hedgecode/chess/scanner/format/Room.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Room.java index 1303f01..8807b1a 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/Room.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/Room.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; import java.util.Date; diff --git a/src/main/java/org/hedgecode/chess/scanner/format/RoomData.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/RoomData.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/format/RoomData.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/RoomData.java index 8c160b9..eaf27ad 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/RoomData.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/RoomData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; /** * RoomData diff --git a/src/main/java/org/hedgecode/chess/scanner/format/TournamentFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/TournamentFormat.java similarity index 94% rename from src/main/java/org/hedgecode/chess/scanner/format/TournamentFormat.java rename to src/main/java/org/hedgecode/chess/scanner/format/chessbomb/TournamentFormat.java index 5e6d9b6..92c3bf0 100644 --- a/src/main/java/org/hedgecode/chess/scanner/format/TournamentFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/format/chessbomb/TournamentFormat.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.format; +package org.hedgecode.chess.scanner.format.chessbomb; import java.util.List; diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/AbstractBaseFormat.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/AbstractBaseFormat.java similarity index 90% rename from src/main/java/org/hedgecode/chess/scanner/json/format/AbstractBaseFormat.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/AbstractBaseFormat.java index 09c6b0f..3ed5812 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/AbstractBaseFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/AbstractBaseFormat.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.BaseFormat; +import org.hedgecode.chess.scanner.format.chessbomb.BaseFormat; /** * AbstractBaseFormat diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONArenaFormat.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONArenaFormat.java similarity index 84% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONArenaFormat.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONArenaFormat.java index 5964f71..d2bc6bc 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONArenaFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONArenaFormat.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.ArenaFormat; -import org.hedgecode.chess.scanner.format.IndexData; -import org.hedgecode.chess.scanner.format.Room; +import org.hedgecode.chess.scanner.format.chessbomb.ArenaFormat; +import org.hedgecode.chess.scanner.format.chessbomb.IndexData; +import org.hedgecode.chess.scanner.format.chessbomb.Room; /** * JSONArenaFormat diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONFormatBuilder.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONFormatBuilder.java similarity index 81% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONFormatBuilder.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONFormatBuilder.java index bdc63ff..94cbcee 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONFormatBuilder.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONFormatBuilder.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import org.hedgecode.chess.scanner.format.ArenaFormat; -import org.hedgecode.chess.scanner.format.FormatBuilder; -import org.hedgecode.chess.scanner.format.GameFormat; -import org.hedgecode.chess.scanner.format.TournamentFormat; +import org.hedgecode.chess.scanner.format.chessbomb.ArenaFormat; +import org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder; +import org.hedgecode.chess.scanner.format.chessbomb.GameFormat; +import org.hedgecode.chess.scanner.format.chessbomb.TournamentFormat; /** * JSONFormatBuilder diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGame.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGame.java similarity index 94% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONGame.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGame.java index 4575fe3..58b7757 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGame.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGame.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import java.util.Date; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Game; -import org.hedgecode.chess.scanner.format.Player; +import org.hedgecode.chess.scanner.format.chessbomb.Game; +import org.hedgecode.chess.scanner.format.chessbomb.Player; /** * JSONGame diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameData.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameData.java similarity index 84% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameData.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameData.java index 33091a8..6e8d0e2 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameData.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameData.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Game; -import org.hedgecode.chess.scanner.format.GameData; +import org.hedgecode.chess.scanner.format.chessbomb.Game; +import org.hedgecode.chess.scanner.format.chessbomb.GameData; import org.hedgecode.chess.scanner.format.Move; -import org.hedgecode.chess.scanner.format.Room; +import org.hedgecode.chess.scanner.format.chessbomb.Room; /** * JSONGameData diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameFormat.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameFormat.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameFormat.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameFormat.java index 28d250e..88434bb 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONGameFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONGameFormat.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; import org.hedgecode.chess.scanner.format.PGNFormat; import org.hedgecode.chess.scanner.format.PGNTag; -import org.hedgecode.chess.scanner.format.GameData; -import org.hedgecode.chess.scanner.format.GameFormat; +import org.hedgecode.chess.scanner.format.chessbomb.GameData; +import org.hedgecode.chess.scanner.format.chessbomb.GameFormat; import org.hedgecode.chess.scanner.format.TypeMovesFormat; import org.hedgecode.chess.scanner.spi.ServiceRegistry; diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONIndexData.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONIndexData.java similarity index 84% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONIndexData.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONIndexData.java index f5ad7e8..c0d4925 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONIndexData.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONIndexData.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.IndexData; -import org.hedgecode.chess.scanner.format.Room; +import org.hedgecode.chess.scanner.format.chessbomb.IndexData; +import org.hedgecode.chess.scanner.format.chessbomb.Room; /** * JSONIndexData diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONMove.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONMove.java similarity index 95% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONMove.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONMove.java index 0b65d36..afdd2af 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONMove.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONMove.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONPlayer.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONPlayer.java similarity index 93% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONPlayer.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONPlayer.java index 4fbfdff..bebe8e3 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONPlayer.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONPlayer.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Player; +import org.hedgecode.chess.scanner.format.chessbomb.Player; /** * JSONPlayer diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoom.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoom.java similarity index 95% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoom.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoom.java index 767d2af..f3144d1 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoom.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoom.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import java.util.Date; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Room; +import org.hedgecode.chess.scanner.format.chessbomb.Room; /** * JSONRoom diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoomData.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoomData.java similarity index 82% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoomData.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoomData.java index c48af39..245f409 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONRoomData.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONRoomData.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Game; -import org.hedgecode.chess.scanner.format.Room; -import org.hedgecode.chess.scanner.format.RoomData; +import org.hedgecode.chess.scanner.format.chessbomb.Game; +import org.hedgecode.chess.scanner.format.chessbomb.Room; +import org.hedgecode.chess.scanner.format.chessbomb.RoomData; /** * JSONRoomData diff --git a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONTournamentFormat.java b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONTournamentFormat.java similarity index 87% rename from src/main/java/org/hedgecode/chess/scanner/json/format/JSONTournamentFormat.java rename to src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONTournamentFormat.java index f568e09..2ee097f 100644 --- a/src/main/java/org/hedgecode/chess/scanner/json/format/JSONTournamentFormat.java +++ b/src/main/java/org/hedgecode/chess/scanner/json/chessbomb/JSONTournamentFormat.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.hedgecode.chess.scanner.json.format; +package org.hedgecode.chess.scanner.json.chessbomb; import java.util.ArrayList; import java.util.List; import com.google.gson.annotations.SerializedName; -import org.hedgecode.chess.scanner.format.Game; -import org.hedgecode.chess.scanner.format.RoomData; -import org.hedgecode.chess.scanner.format.TournamentFormat; +import org.hedgecode.chess.scanner.format.chessbomb.Game; +import org.hedgecode.chess.scanner.format.chessbomb.RoomData; +import org.hedgecode.chess.scanner.format.chessbomb.TournamentFormat; /** * JSONTournamentFormat diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java index 9084f5a..0a7c2ae 100644 --- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java +++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java @@ -21,10 +21,10 @@ import java.util.Base64; import org.hedgecode.chess.scanner.ChessHogScannerException; import org.hedgecode.chess.scanner.entity.PGNGame; import org.hedgecode.chess.scanner.entity.PGNTournament; -import org.hedgecode.chess.scanner.format.ArenaFormat; -import org.hedgecode.chess.scanner.format.Format; -import org.hedgecode.chess.scanner.format.GameFormat; -import org.hedgecode.chess.scanner.format.TournamentFormat; +import org.hedgecode.chess.scanner.format.chessbomb.ArenaFormat; +import org.hedgecode.chess.scanner.format.chessbomb.Format; +import org.hedgecode.chess.scanner.format.chessbomb.GameFormat; +import org.hedgecode.chess.scanner.format.chessbomb.TournamentFormat; /** * ChessBombScanner diff --git a/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.FormatBuilder b/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.FormatBuilder deleted file mode 100644 index f383f01..0000000 --- a/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.FormatBuilder +++ /dev/null @@ -1 +0,0 @@ -org.hedgecode.chess.scanner.json.format.JSONFormatBuilder \ No newline at end of file diff --git a/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder b/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder new file mode 100644 index 0000000..62b5639 --- /dev/null +++ b/src/main/resources/META-INF/services/org.hedgecode.chess.scanner.format.chessbomb.FormatBuilder @@ -0,0 +1 @@ +org.hedgecode.chess.scanner.json.chessbomb.JSONFormatBuilder \ No newline at end of file -- 2.10.0