[LIB-13] Override access to static constants

[chesshog-scanner.git] / src / main / java / org / hedgecode / chess / scanner / portal / AbstractRequestScanner.java

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractRequestScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractRequestScanner.java
index a82422e..0390848 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractRequestScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractRequestScanner.java
@@ -27,7 +27,6 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 
-import org.hedgecode.chess.scanner.ChessHogScannerConstants;
 import org.hedgecode.chess.scanner.ChessHogScannerException;
 import org.hedgecode.chess.scanner.Scanner;
 import org.hedgecode.chess.scanner.regex.RegexMatcher;
@@ -35,6 +34,8 @@ import org.hedgecode.chess.scanner.regex.RegexResult;
 import org.hedgecode.chess.scanner.regex.RegexType;
 import org.hedgecode.chess.scanner.regex.RegexTypeMatcher;
 
+import static org.hedgecode.chess.scanner.ChessHogScannerConstants.*;
+
 /**
  * AbstractRequestScanner
  *
@@ -43,6 +44,10 @@ import org.hedgecode.chess.scanner.regex.RegexTypeMatcher;
 public abstract class AbstractRequestScanner implements Scanner {
 
     protected String request(String url) throws ChessHogScannerException {
+        return request(url, true);
+    }
+
+    protected String request(String url, boolean withCrlf) throws ChessHogScannerException {
         HttpGet request = new HttpGet(url);
         CloseableHttpResponse response = null;
         StringBuilder sb = new StringBuilder();
@@ -50,17 +55,15 @@ public abstract class AbstractRequestScanner implements Scanner {
             response = getClient().execute(request);
             try (BufferedReader br = new BufferedReader(
                     new InputStreamReader(
-                            response.getEntity().getContent(),
-                            ChessHogScannerConstants.CHARSET
+                            response.getEntity().getContent(), CHARSET
                     )
             )) {
                 String line;
                 while ((line = br.readLine()) != null) {
-                    sb.append(
-                            line
-                    ).append(
-                            ChessHogScannerConstants.CRLF
-                    );
+                    sb.append(line);
+                    if (withCrlf) {
+                        sb.append(CRLF);
+                    }
                 }
             }
         } catch (IOException cause) {
@@ -94,9 +97,7 @@ public abstract class AbstractRequestScanner implements Scanner {
         return matchRequest(url, matcher, false);
     }
 
-    protected String match(String url, String match)
-            throws ChessHogScannerException
-    {
+    protected String match(String url, String match) throws ChessHogScannerException {
         List<String> result = match(url, match, true);
         return result.isEmpty() ? null : result.get(0);
     }
@@ -174,7 +175,7 @@ public abstract class AbstractRequestScanner implements Scanner {
             try (BufferedReader br = new BufferedReader(
                     new InputStreamReader(
                             response.getEntity().getContent(),
-                            ChessHogScannerConstants.CHARSET
+                            CHARSET
                     )
             )) {
                 String line;