diff --git a/lib/bld/bld-wrapper.properties b/lib/bld/bld-wrapper.properties index fb0ae55..0d4f311 100644 --- a/lib/bld/bld-wrapper.properties +++ b/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extension-pmd=com.uwyn.rife2:bld-pmd:1.0.0 +bld.extension-pmd=com.uwyn.rife2:bld-pmd:0.9.9 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 bld.repositories=MAVEN_CENTRAL,RIFE2_RELEASES,MAVEN_LOCAL,RIFE2_SNAPSHOTS bld.downloadLocation= diff --git a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java index 2d56c40..24393e2 100644 --- a/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java +++ b/src/bld/java/net/thauvin/erik/httpstatus/HttpStatusBuild.java @@ -76,7 +76,7 @@ public class HttpStatusBuild extends Project { .include(dependency("jakarta.servlet.jsp", "jakarta.servlet.jsp-api", version(3, 1, 1))) .include(dependency("jakarta.el", "jakarta.el-api", version(6, 0, 0))); scope(test) - .include(dependency("org.assertj", "assertj-core", version(3, 26, 0))) + .include(dependency("org.assertj", "assertj-core", version(3, 25, 3))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))); @@ -143,16 +143,16 @@ public class HttpStatusBuild extends Project { @Override public void publish() throws Exception { super.publish(); - pomRoot(); + rootPom(); } @Override public void publishLocal() throws Exception { super.publishLocal(); - pomRoot(); + rootPom(); } - private void pomRoot() throws FileUtilsErrorException { + private void rootPom() throws FileUtilsErrorException { PomBuilder.generateInto(publishOperation().info(), dependencies(), Path.of(workDirectory.getPath(), "pom.xml").toFile()); } diff --git a/src/main/java/net/thauvin/erik/httpstatus/StatusCode.java b/src/main/java/net/thauvin/erik/httpstatus/StatusCode.java index 46e3468..1982200 100644 --- a/src/main/java/net/thauvin/erik/httpstatus/StatusCode.java +++ b/src/main/java/net/thauvin/erik/httpstatus/StatusCode.java @@ -139,7 +139,7 @@ public class StatusCode implements Serializable { * @return true if the status code is valid, false otherwise. */ public boolean isValid() { - return code == 783 || (code >= 100 && code < 600); + return code >= 100 && code < 600; } /** diff --git a/src/main/resources/net/thauvin/erik/httpstatus/reasons.properties b/src/main/resources/net/thauvin/erik/httpstatus/reasons.properties index a05fa40..c690ea9 100644 --- a/src/main/resources/net/thauvin/erik/httpstatus/reasons.properties +++ b/src/main/resources/net/thauvin/erik/httpstatus/reasons.properties @@ -2,11 +2,6 @@ 101=Switching Protocols 102=Processing 103=Early Hints -110=Response is Stale -111=Revalidation Failed -112=Disconnected Operation -113=Heuristic Expiration -199=Miscellaneous Warning 200=OK 201=Created 202=Accepted @@ -16,17 +11,15 @@ 206=Partial Content 207=Multi-Status 208=Already Reported -214=Transformation Applied 218=This is fine 226=IM Used -299=Miscellaneous Persistent Warning 300=Multiple Choices 301=Moved Permanently 302=Found/Moved Temporarily 303=See Other 304=Not Modified 305=Use Proxy -306=Unused +306=Switch Proxy 307=Temporary Redirect 308=Permanent Redirect 400=Bad Request @@ -42,19 +35,18 @@ 410=Gone 411=Length Required 412=Precondition Failed -413=Payload Too Large -414=URI Too Long +413=Request Entity/Payload Too Large +414=Request-URI Too Long 415=Unsupported Media Type -416=Range Not Satisfiable +416=Requested Range Not Satisfiable 417=Expectation Failed 418=I'm A Teapot 419=Insufficient Space on Resource 420=Method Failure 421=Misdirected Request -422=Unprocessable Content +422=Unprocessable Entity 423=Locked 424=Failed Dependency -425=Too Early 426=Upgrade Required 428=Precondition Required 429=Too Many Requests @@ -69,7 +61,7 @@ 463=X-Forwarded-For Header with More than 30 IP Addresses 494=Request Header Too Large 495=SSL Certificate Error -496=SSL Certificate Required +496=No SSL Certificate 497=HTTP Request Sent to HTTPS Port 498=Token Expired/Invalid 499=Client Closed Request @@ -87,7 +79,7 @@ 511=Network Authentication Required 520=Unknown Error 521=Web Server Is Down -522=Connection Timed Out +522=Origin Connection Time-out 523=Origin Is Unreachable 524=A Timeout Occurred 525=SSL Handshake Failed @@ -95,8 +87,5 @@ 527=Railgun Error 529=Site is overloaded 530=Site is frozen -540=Temporarily Disabled -561=Unauthorized 598=Network Read Timeout Error -599=Network Connect Timeout Error -783=Unexpected Token +599=Network Connect Timeout Error \ No newline at end of file diff --git a/src/test/java/net/thauvin/erik/httpstatus/StatusCodeTest.java b/src/test/java/net/thauvin/erik/httpstatus/StatusCodeTest.java index b494715..7ecd692 100644 --- a/src/test/java/net/thauvin/erik/httpstatus/StatusCodeTest.java +++ b/src/test/java/net/thauvin/erik/httpstatus/StatusCodeTest.java @@ -59,9 +59,9 @@ class StatusCodeTest { assertThat(statusCode.isClientError()).as(code + " is client error").isEqualTo(code >= 400 && code < 500); assertThat(statusCode.isServerError()).as(code + " is server error").isEqualTo(code >= 500 && code < 600); assertThat(statusCode.isError()).as(code + " is error").isEqualTo(code >= 400 && code < 600); - assertThat(statusCode.isValid()).as(code + " is valid").isTrue(); + assertThat(statusCode.isValid()).as(code + "is valid").isTrue(); - assertThat(statusCode.getReason()).as(code + " reason phrase is not valid") + assertThat(statusCode.getReason()).as(code + "reason phrase is not valid") .isEqualTo(Reasons.getReasonPhrase(code)); } @@ -75,8 +75,8 @@ class StatusCodeTest { assertThat(statusCode.isClientError()).as(code + " is client error").isFalse(); assertThat(statusCode.isServerError()).as(code + " is server error").isFalse(); assertThat(statusCode.isError()).as(code + " is error").isFalse(); - assertThat(statusCode.isValid()).as(code + " is invalid").isFalse(); - assertThat(statusCode.getReason()).as(code + " reason phrase is not null.").isNull(); + assertThat(statusCode.isValid()).as("600 is invalid").isFalse(); + assertThat(statusCode.getReason()).as(code + "reason phrase is not null.").isNull(); } statusCode = new StatusCode(900);