Merge remote-tracking branch 'origin/development'

Author: sornerol

README.md

@@ -18,7 +18,7 @@ Add the following dependency to the dependencies section of your project's `pom.
     <dependency>
         <groupId>io.github.sornerol</groupId>
         <artifactId>chesscom-pubapi-wrapper</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
     </dependency>
 </dependencies
 ```
@@ -27,7 +27,7 @@ Add the following dependency to the dependencies section of your project's `buil
 ```
 dependencies {
     // other project dependencies...
-    implementation 'io.github.sornerol:chesscom-pubapi-wrapper:1.5.0'
+    implementation 'io.github.sornerol:chesscom-pubapi-wrapper:1.6.0'
 }
 ```
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.sornerol</groupId>
     <artifactId>chesscom-pubapi-wrapper</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -65,15 +65,20 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.5.14</version>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.15.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.11</version>
+        </dependency>
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-core</artifactId>
@@ -84,6 +89,12 @@
             <artifactId>spock-junit4</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>2.0.11</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <profiles>
@@ -167,7 +178,7 @@
                     <plugin>
                         <groupId>org.codehaus.gmavenplus</groupId>
                         <artifactId>gmavenplus-plugin</artifactId>
-                        <version>1.9.0</version>
+                        <version>3.0.2</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -248,7 +259,7 @@
                     <plugin>
                         <groupId>org.codehaus.gmavenplus</groupId>
                         <artifactId>gmavenplus-plugin</artifactId>
-                        <version>1.9.0</version>
+                        <version>3.0.2</version>
                         <executions>
                             <execution>
                                 <goals>

src/main/java/io/github/sornerol/chess/pubapi/client/PubApiClientBase.java

@@ -7,12 +7,13 @@
 import io.github.sornerol.chess.pubapi.exception.ChessComPubApiException;
 import lombok.Getter;
 import lombok.Setter;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicHeader;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.message.BasicHeader;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,6 +22,7 @@
 /**
  * The base class of all the PubAPI client classes.
  */
+@Slf4j
 abstract class PubApiClientBase {
 
     /**
@@ -127,6 +129,10 @@ protected String getRequest(String endpoint) throws IOException, ChessComPubApiE
         HttpGet request = new HttpGet(endpoint);
         if (userAgent != null) {
             request.addHeader(new BasicHeader("User-Agent", userAgent));
+        } else {
+            log.warn("No User-Agent provided. Your request may not work. See " +
+                    "https://www.chess.com/announcements/view/breaking-change-user-agent-contact-info-required for" +
+                    "additional details");
         }
 
         String responseBody;
@@ -135,7 +141,7 @@ protected String getRequest(String endpoint) throws IOException, ChessComPubApiE
         boolean keepTrying = false;
         do {
             try (CloseableHttpResponse response = httpClient.execute(request)) {
-                int statusCode = response.getStatusLine().getStatusCode();
+                int statusCode = response.getCode();
                 if (statusCode == ResponseCode.RATE_LIMIT_EXCEEDED.getValue() && shouldTryRequestAgain(attempts)) {
                     keepTrying = true;
                     attempts++;