X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessBombScanner.java;fp=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessBombScanner.java;h=096a36e348dc11f07f068dc8319bd1c350007147;hp=6139ed41ec893d978a3d833c524b81ba931655b7;hb=df574e5ec8ae08c1c50adbe30b597cd86e6ab3fa;hpb=25ccd0fd5d5a640bc2dac646f2d760b5d64b989b 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 6139ed4..096a36e 100644 --- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java +++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessBombScanner.java @@ -18,8 +18,8 @@ package org.hedgecode.chess.scanner.portal; import java.util.Base64; -import org.hedgecode.chess.scanner.ChessHogScannerException; import org.hedgecode.chess.scanner.Scanner; +import org.hedgecode.chess.scanner.ScannerException; import org.hedgecode.chess.scanner.entity.PGNGame; import org.hedgecode.chess.scanner.entity.PGNTournament; import org.hedgecode.chess.scanner.format.chessbomb.ArenaFormat; @@ -42,7 +42,7 @@ public class ChessBombScanner extends AbstractSettingsScanner implements Scanner } @Override - public PGNTournament scanTournament(String tournamentId) throws ChessHogScannerException { + public PGNTournament scanTournament(String tournamentId) throws ScannerException { String decodeTournament = decodeUrlByRegex( assignUrl(tournamentId, null), getSettings().getTournamentJsonUrlRegex() @@ -64,7 +64,7 @@ public class ChessBombScanner extends AbstractSettingsScanner implements Scanner } @Override - public PGNTournament findTournament(String tournamentName) throws ChessHogScannerException { + public PGNTournament findTournament(String tournamentName) throws ScannerException { String decodeArena = decodeUrlByRegex( assignUrl(tournamentName, false), getSettings().getTournamentQueryUrlRegex() @@ -80,14 +80,14 @@ public class ChessBombScanner extends AbstractSettingsScanner implements Scanner } @Override - public PGNGame scanGame(String gameId) throws ChessHogScannerException { - throw new ChessHogScannerException( + public PGNGame scanGame(String gameId) throws ScannerException { + throw new ScannerException( "ChessBomb does not support searching game without a tournament name!" ); } @Override - public PGNGame scanGame(String gameId, String tournamentId) throws ChessHogScannerException { + public PGNGame scanGame(String gameId, String tournamentId) throws ScannerException { return scanGameByRegex( assignUrl(gameId, tournamentId, true), getSettings().getGameJsonUrlRegex() @@ -95,14 +95,14 @@ public class ChessBombScanner extends AbstractSettingsScanner implements Scanner } @Override - public PGNGame scanUrl(String gameUrl) throws ChessHogScannerException { + public PGNGame scanUrl(String gameUrl) throws ScannerException { return scanGameByRegex( gameUrl, getSettings().getGameJsonUrlRegex() ); } - private PGNGame scanGameByRegex(String gameUrl, String regex) throws ChessHogScannerException { + private PGNGame scanGameByRegex(String gameUrl, String regex) throws ScannerException { String decodeGame = decodeUrlByRegex( gameUrl, regex @@ -117,13 +117,13 @@ public class ChessBombScanner extends AbstractSettingsScanner implements Scanner } - private String decodeUrlByRegex(String url, String regex) throws ChessHogScannerException { + private String decodeUrlByRegex(String url, String regex) throws ScannerException { String encodeString = match( url, regex ); if (encodeString == null) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to decode source data for requesting URL: %s", url) ); }