changed statementclientexception to add status code prop. Also updated testcontainers and revealed some old bad dependencies for junit

Author: cliffcaseyyet

pom.xml

@@ -117,7 +117,7 @@
     <dependency>
         <groupId>org.testcontainers</groupId>
         <artifactId>testcontainers</artifactId>
-        <version>1.20.6</version>
+        <version>2.0.5</version>
         <scope>test</scope>
     </dependency>
   </dependencies>

src/main/java/com/yetanalytics/xapi/client/StatementClient.java

@@ -79,7 +79,8 @@ private List<UUID> doPost(List<Statement> statements, URI endpoint)
             EntityUtils.consumeQuietly(response.getEntity());
             throw new StatementClientException(String.format(
                 "Error, Non-200 Status. Received: %s",
-                response.getStatusLine().getStatusCode()));
+                response.getStatusLine().getStatusCode()), 
+                response.getStatusLine().getStatusCode());
         }
     }
 
@@ -107,7 +108,7 @@ public List<UUID> postStatements(List<Statement> stmts) {
             }
             return result;
         } catch (ParseException | IOException e) {
-            throw new StatementClientException("Error posting Statements", e);
+            throw new StatementClientException("Error posting Statements", 0, e);
         }
     }
 
@@ -123,7 +124,8 @@ private StatementResult doGetStatementResult(URI endpoint)
             EntityUtils.consumeQuietly(response.getEntity());
             throw new StatementClientException(String.format(
                 "Error, Non-200 Status. Received: %s",
-                response.getStatusLine().getStatusCode()));
+                response.getStatusLine().getStatusCode()),
+                response.getStatusLine().getStatusCode());
         }
     }
 
@@ -139,7 +141,8 @@ private Statement doGetStatement(URI endpoint)
             EntityUtils.consumeQuietly(response.getEntity());
             throw new StatementClientException(String.format(
                 "Error, Non-200 Status. Received: %s",
-                response.getStatusLine().getStatusCode()));
+                response.getStatusLine().getStatusCode()),
+                response.getStatusLine().getStatusCode());
         }
     }
 
@@ -195,7 +198,7 @@ public List<Statement> getStatements(StatementFilters filters, Integer max) {
             }
 
         } catch (IOException e) {
-            throw new StatementClientException("Error getting Statements", e);
+            throw new StatementClientException("Error getting Statements", 0, e);
         }
         return statements;
     }

src/main/java/com/yetanalytics/xapi/exception/StatementClientException.java

@@ -1,6 +1,8 @@
 package com.yetanalytics.xapi.exception;
 
 public class StatementClientException extends RuntimeException {
+
+    private Integer statusCode;
 
     public StatementClientException() {
         super();
@@ -10,14 +12,33 @@ public StatementClientException(String message) {
         super(message);
     }
 
+    public StatementClientException(String message, Integer status) {
+        super(message);
+        this.statusCode = status;
+    }
+
     public StatementClientException(String message, Throwable cause) {
         super(message, cause);
     }
 
+    public StatementClientException(String message, Integer status, Throwable cause) {
+        super(message, cause);
+        this.statusCode = status;
+    }
+
     public StatementClientException(Throwable cause) {
         super(cause);
     }
 
+    public StatementClientException(Integer status, Throwable cause) {
+        super(cause);
+        this.statusCode = status;
+    }
+
+    public Integer getStatusCode() {
+        return statusCode;
+    }
+
     @Override
     public String getMessage() {
         return "StatementClientException: " + super.getMessage();

src/test/java/com/yetanalytics/model/ActivityDefinitionTest.java

@@ -6,7 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

src/test/java/com/yetanalytics/model/StatementTest.java

@@ -6,7 +6,7 @@
 import java.util.List;
 import java.util.UUID;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.semver4j.Semver;

src/test/java/com/yetanalytics/xapi/client/StatementClientTest.java

@@ -1,8 +1,8 @@
 package com.yetanalytics.xapi.client;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
 import java.io.IOException;

src/test/java/com/yetanalytics/xapi/client/filters/StatementFiltersTest.java

@@ -1,7 +1,7 @@
 package com.yetanalytics.xapi.client.filters;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.net.URI;
 import java.util.UUID;

src/test/java/com/yetanalytics/xapi/model/LangTagTest.java

@@ -2,9 +2,9 @@
 
 import java.util.IllformedLocaleException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import org.junit.jupiter.api.Test;
 
 public class LangTagTest {

src/test/java/com/yetanalytics/xapi/util/StatementValidatorTest.java

@@ -1,10 +1,10 @@
 package com.yetanalytics.xapi.util;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.yetanalytics.xapi.model.Activity;
 import com.yetanalytics.xapi.model.LangTag;

src/test/java/com/yetanalytics/xapi/util/ValidationUtils.java

@@ -1,7 +1,7 @@
 package com.yetanalytics.xapi.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;