[LIB-13] Rename some common classes

[chesshog-scanner.git] / src / main / java / org / hedgecode / chess / scanner / regex / RegexBuilder.java

diff --git a/src/main/java/org/hedgecode/chess/scanner/regex/RegexBuilder.java b/src/main/java/org/hedgecode/chess/scanner/regex/RegexBuilder.java
index 14b4fba..94fd7ab 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/regex/RegexBuilder.java
+++ b/src/main/java/org/hedgecode/chess/scanner/regex/RegexBuilder.java
@@ -19,7 +19,7 @@ package org.hedgecode.chess.scanner.regex;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
-import org.hedgecode.chess.scanner.ChessHogScannerConstants;
+import static org.hedgecode.chess.scanner.ScannerConstants.*;
 
 /**
  * RegexBuilder
@@ -56,6 +56,12 @@ public class RegexBuilder {
         GAME {
             @Override
             public String format(String target, RegexParams params) {
+                if (params.getTournamentId() != null) {
+                    target = target.replace(
+                            RegexParams.TOURNAMENT_ID,
+                            params.getTournamentId()
+                    );
+                }
                 return target.replace(
                         RegexParams.GAME_ID,
                         params.getGameId()
@@ -81,11 +87,11 @@ public class RegexBuilder {
             String encodeQuery;
             try {
                 encodeQuery = URLEncoder.encode(
-                        query, ChessHogScannerConstants.CHARSET.name()
+                        query, CHARSET.name()
                 );
             } catch (UnsupportedEncodingException cause) {
                 throw new RuntimeException(
-                        String.format("Unsupported encoding: %s", ChessHogScannerConstants.CHARSET.name()),
+                        String.format("Unsupported encoding: %s", CHARSET.name()),
                         cause
                 );
             }