jcabi · yegor256 · Jan 9, 2025 · Jan 9, 2025 · Jan 9, 2025 · Jan 9, 2025
diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml
@@ -12,8 +12,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
-        java: [11, 17, 19, 21]
+        os: [ubuntu-24.04, windows-2022, macos-15]
+        java: [11, 21]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

diff --git a/.github/workflows/owasp.yml b/.github/workflows/owasp.yml
@@ -1,21 +1,19 @@
+---
 name: OWASP
 on:
   schedule:
     - cron: '0 0 * * *'
   pull_request:
     branches: [ master ]
-
-
 jobs:
   owasp:
     name: Dependency-Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - name: JDK 1.8
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
-          java-version: 1.8
-	  distibution: 'temurin'
+          distribution: 'temurin'
+          java-version: 21
       - name: Maven
         run:  mvn --errors --batch-mode -Powasp dependency-check:check
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022, jcabi.com
+Copyright (c) 2011-2025, jcabi.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-Copyright (c) 2011-2022, jcabi.com
+Copyright (c) 2011-2025, jcabi.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -50,8 +50,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   </ciManagement>
   <scm>
     <connection>scm:git:github.com:jcabi/jcabi-http.git</connection>
-    <developerConnection>scm:git:github.com:jcabi/jcabi-http.git
-        </developerConnection>
+    <developerConnection>scm:git:github.com:jcabi/jcabi-http.git</developerConnection>
     <url>https://github.com/jcabi/jcabi-http</url>
   </scm>
   <distributionManagement>
@@ -61,9 +60,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     </site>
   </distributionManagement>
   <properties>
-    <byte-buddy.version>
-            1.15.10
-        </byte-buddy.version>
+    <byte-buddy.version>1.15.10</byte-buddy.version>
   </properties>
   <dependencies>
     <dependency>
@@ -90,6 +87,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <version>1.18.36</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -113,12 +111,12 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
     </dependency>
     <dependency>
       <!--
-                        @todo #171:30m Transitive dependencies for hamcrest 1.3 and junit 4
-                         comes from this dependency.
-                         1) Upgrade jcabi-matchers to the same version of parent as jcabi-http.
-                         2) Replace hamcrest 1.3 with hamcrest 2.2 (?) from parent
-                         3) Replace junit 5 with junit 5
-                        -->
+      @todo #171:30m Transitive dependencies for hamcrest 1.3 and junit 4
+       comes from this dependency.
+       1) Upgrade jcabi-matchers to the same version of parent as jcabi-http.
+       2) Replace hamcrest 1.3 with hamcrest 2.2 (?) from parent
+       3) Replace junit 5 with junit 5
+      -->
       <groupId>com.jcabi</groupId>
       <artifactId>jcabi-matchers</artifactId>
       <version>1.7.0</version>
@@ -262,16 +260,17 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
       <version>1.2.25</version>
       <scope>provided</scope>
     </dependency>
-    <!-- logging dependencies-->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
       <version>1.5.12</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
       <version>1.5.10</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -358,9 +357,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <argLine>
-                        -javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar
-                    </argLine>
+          <argLine>-javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -378,9 +375,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
                 <artifactItem>
                   <groupId>net.bytebuddy</groupId>
                   <artifactId>byte-buddy-agent</artifactId>
-                  <outputDirectory>
-                                        ${project.build.directory}
-                                    </outputDirectory>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
                 </artifactItem>
               </artifactItems>
             </configuration>

diff --git a/src/main/java/com/jcabi/http/ImmutableHeader.java b/src/main/java/com/jcabi/http/ImmutableHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/Request.java b/src/main/java/com/jcabi/http/Request.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/RequestBody.java b/src/main/java/com/jcabi/http/RequestBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/RequestURI.java b/src/main/java/com/jcabi/http/RequestURI.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/Response.java b/src/main/java/com/jcabi/http/Response.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/Wire.java b/src/main/java/com/jcabi/http/Wire.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/GrizzlyQuery.java b/src/main/java/com/jcabi/http/mock/GrizzlyQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkAnswer.java b/src/main/java/com/jcabi/http/mock/MkAnswer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkAnswerBodyBytesMatcher.java b/src/main/java/com/jcabi/http/mock/MkAnswerBodyBytesMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkAnswerBodyMatcher.java b/src/main/java/com/jcabi/http/mock/MkAnswerBodyMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkAnswerHeaderMatcher.java b/src/main/java/com/jcabi/http/mock/MkAnswerHeaderMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkAnswerMatchers.java b/src/main/java/com/jcabi/http/mock/MkAnswerMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkContainer.java b/src/main/java/com/jcabi/http/mock/MkContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkGrizzlyAdapter.java b/src/main/java/com/jcabi/http/mock/MkGrizzlyAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,14 +77,11 @@ final class MkGrizzlyAdapter extends HttpHandler {
 
     // @checkstyle ExecutableStatementCount (55 lines)
     @Override
-    @SuppressWarnings
-        (
-            {
-                "PMD.AvoidCatchingThrowable",
-                "PMD.AvoidInstantiatingObjectsInLoops",
-                "rawtypes"
-            }
-        )
+    @SuppressWarnings({
+        "PMD.AvoidCatchingThrowable",
+        "PMD.AvoidInstantiatingObjectsInLoops",
+        "rawtypes"
+    })
     public void service(
         final Request request,
         final Response response
@@ -362,7 +359,6 @@ public MkAnswer answer() {
      *
      * @since 1.17.3
      */
-    @RequiredArgsConstructor
     private static final class MkQueryIterator implements Iterator<MkQuery> {
 
         /**
@@ -380,6 +376,17 @@ private static final class MkQueryIterator implements Iterator<MkQuery> {
          */
         private final Matcher<MkAnswer> matcher;
 
+        /**
+         * Ctor.
+         * @param iter Iterator
+         * @param matcher Matcher
+         */
+        private MkQueryIterator(final Iterator<QueryWithAnswer> iter,
+            final Matcher<MkAnswer> matcher) {
+            this.iter = iter;
+            this.matcher = matcher;
+        }
+
         @Override
         public boolean hasNext() {
             while (this.iter.hasNext()) {

diff --git a/src/main/java/com/jcabi/http/mock/MkGrizzlyContainer.java b/src/main/java/com/jcabi/http/mock/MkGrizzlyContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkQuery.java b/src/main/java/com/jcabi/http/mock/MkQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkQueryBodyMatcher.java b/src/main/java/com/jcabi/http/mock/MkQueryBodyMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkQueryHeaderMatcher.java b/src/main/java/com/jcabi/http/mock/MkQueryHeaderMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkQueryMatchers.java b/src/main/java/com/jcabi/http/mock/MkQueryMatchers.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/MkQueryUriMatcher.java b/src/main/java/com/jcabi/http/mock/MkQueryUriMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/mock/package-info.java b/src/main/java/com/jcabi/http/mock/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/package-info.java b/src/main/java/com/jcabi/http/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/request/ApacheRequest.java b/src/main/java/com/jcabi/http/request/ApacheRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/request/BaseRequest.java b/src/main/java/com/jcabi/http/request/BaseRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/request/Boundary.java b/src/main/java/com/jcabi/http/request/Boundary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

diff --git a/src/main/java/com/jcabi/http/request/DefaultResponse.java b/src/main/java/com/jcabi/http/request/DefaultResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2022, jcabi.com
+ * Copyright (c) 2011-2025, jcabi.com
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without