diff --git a/.github/workflows/mvn.yml b/.github/workflows/mvn.yml index f4d2f4593..dd492d394 100644 --- 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 index fd68bfd7c..3ca304f6e 100644 --- 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 index 77d225df1..001bd00bf 100644 --- 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 index 71618cebb..311ab4c72 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + @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 + --> com.jcabi jcabi-matchers 1.7.0 @@ -262,16 +260,17 @@ OF THE POSSIBILITY OF SUCH DAMAGE. 1.2.25 provided - ch.qos.logback logback-classic 1.5.12 + test ch.qos.logback logback-core 1.5.10 + test org.slf4j @@ -358,9 +357,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. org.apache.maven.plugins maven-surefire-plugin - - -javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar - + -javaagent:${project.basedir}/target/byte-buddy-agent-${byte-buddy.version}.jar @@ -378,9 +375,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. net.bytebuddy byte-buddy-agent - - ${project.build.directory} - + ${project.build.directory} diff --git a/src/main/java/com/jcabi/http/ImmutableHeader.java b/src/main/java/com/jcabi/http/ImmutableHeader.java index db2c4cfe3..849690962 100644 --- 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 index d9dafaa19..8fce9dc86 100644 --- 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 index 0ffddd941..27f15dd3b 100644 --- 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 index 88b2b06fd..07aa8f981 100644 --- 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 index 2abe3419e..202d1ccf6 100644 --- 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 index 5fd7acf8b..f0e7c64f1 100644 --- 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 index 6d7544ead..8e385919a 100644 --- 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 index ba7acbb0e..02deaa4d3 100644 --- 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 index 7997b58bf..ef6a04ad9 100644 --- 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 index c27bfe16c..06e9c7faf 100644 --- 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 index 13d555597..35293ea7f 100644 --- 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 index f03ff856c..4e57f4943 100644 --- 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 index f307d0d26..bcf9af0dd 100644 --- 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 index 0dba91746..e4b607cda 100644 --- 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 { /** @@ -380,6 +376,17 @@ private static final class MkQueryIterator implements Iterator { */ private final Matcher matcher; + /** + * Ctor. + * @param iter Iterator + * @param matcher Matcher + */ + private MkQueryIterator(final Iterator iter, + final Matcher 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 index 3368815df..4f401d4d2 100644 --- 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 index 9c5a7af3c..14a5d3a73 100644 --- 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 index ed4064cb9..ef5b06262 100644 --- 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 index f5f20819e..ce979bc56 100644 --- 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 index accadf792..f669c07b6 100644 --- 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 index 7bdc34f7e..95c33dcf1 100644 --- 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 index 8d1a96abb..fff04b284 100644 --- 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 index 4d8a8c234..3cee347ad 100644 --- 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 index 9f27a97e2..02d3f860d 100644 --- 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 index 49b47dd92..178448913 100644 --- 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 index 3d9b08216..55a20e2ca 100644 --- 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 index 87c810dea..3a61a1535 100644 --- 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 diff --git a/src/main/java/com/jcabi/http/request/FakeRequest.java b/src/main/java/com/jcabi/http/request/FakeRequest.java index 17ba926d1..3297f407d 100644 --- a/src/main/java/com/jcabi/http/request/FakeRequest.java +++ b/src/main/java/com/jcabi/http/request/FakeRequest.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 @@ -126,25 +126,15 @@ public FakeRequest(final int status, final String reason, this.phrase = reason; this.hdrs = new Array<>(headers); this.content = body.clone(); + // @checkstyle ParameterNumber (6 lines) this.base = new BaseRequest( - new Wire() { - @Override - // @checkstyle ParameterNumber (6 lines) - public Response send(final Request req, final String home, - final String method, - final Collection> headers, - final InputStream text, - final int connect, - final int read) { - return new DefaultResponse( - req, - FakeRequest.this.code, - FakeRequest.this.phrase, - FakeRequest.this.hdrs, - FakeRequest.this.content - ); - } - }, + (req, home, method, headers1, text, connect, read) -> new DefaultResponse( + req, + FakeRequest.this.code, + FakeRequest.this.phrase, + FakeRequest.this.hdrs, + FakeRequest.this.content + ), "http://localhost:12345/see-FakeRequest-class" ); } diff --git a/src/main/java/com/jcabi/http/request/JdkRequest.java b/src/main/java/com/jcabi/http/request/JdkRequest.java index 68ae293e8..071233785 100644 --- a/src/main/java/com/jcabi/http/request/JdkRequest.java +++ b/src/main/java/com/jcabi/http/request/JdkRequest.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/MultipartBodyBuilder.java b/src/main/java/com/jcabi/http/request/MultipartBodyBuilder.java index ee940262d..159b5c844 100644 --- a/src/main/java/com/jcabi/http/request/MultipartBodyBuilder.java +++ b/src/main/java/com/jcabi/http/request/MultipartBodyBuilder.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/package-info.java b/src/main/java/com/jcabi/http/request/package-info.java index 7051075f3..5b329d7d8 100644 --- a/src/main/java/com/jcabi/http/request/package-info.java +++ b/src/main/java/com/jcabi/http/request/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/response/AbstractResponse.java b/src/main/java/com/jcabi/http/response/AbstractResponse.java index c6410bb89..51b14ae9d 100644 --- a/src/main/java/com/jcabi/http/response/AbstractResponse.java +++ b/src/main/java/com/jcabi/http/response/AbstractResponse.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/JacksonResponse.java b/src/main/java/com/jcabi/http/response/JacksonResponse.java index 2440e0e5e..36661af1b 100644 --- a/src/main/java/com/jcabi/http/response/JacksonResponse.java +++ b/src/main/java/com/jcabi/http/response/JacksonResponse.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/JsonResponse.java b/src/main/java/com/jcabi/http/response/JsonResponse.java index 7dfa5ec72..883c30a99 100644 --- a/src/main/java/com/jcabi/http/response/JsonResponse.java +++ b/src/main/java/com/jcabi/http/response/JsonResponse.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/JsoupResponse.java b/src/main/java/com/jcabi/http/response/JsoupResponse.java index b916821d7..64e7d25f0 100644 --- a/src/main/java/com/jcabi/http/response/JsoupResponse.java +++ b/src/main/java/com/jcabi/http/response/JsoupResponse.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/RestResponse.java b/src/main/java/com/jcabi/http/response/RestResponse.java index 18eb1d9ab..32a215e56 100644 --- a/src/main/java/com/jcabi/http/response/RestResponse.java +++ b/src/main/java/com/jcabi/http/response/RestResponse.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/WebLinkingResponse.java b/src/main/java/com/jcabi/http/response/WebLinkingResponse.java index f1a52ce13..6efe0abf8 100644 --- a/src/main/java/com/jcabi/http/response/WebLinkingResponse.java +++ b/src/main/java/com/jcabi/http/response/WebLinkingResponse.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/XmlResponse.java b/src/main/java/com/jcabi/http/response/XmlResponse.java index 53773b28b..e7d3e6632 100644 --- a/src/main/java/com/jcabi/http/response/XmlResponse.java +++ b/src/main/java/com/jcabi/http/response/XmlResponse.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/package-info.java b/src/main/java/com/jcabi/http/response/package-info.java index 4c704370c..9021402fd 100644 --- a/src/main/java/com/jcabi/http/response/package-info.java +++ b/src/main/java/com/jcabi/http/response/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/wire/AbstractHeaderBasedCachingWire.java b/src/main/java/com/jcabi/http/wire/AbstractHeaderBasedCachingWire.java index 721ababf7..a633c5ac0 100644 --- a/src/main/java/com/jcabi/http/wire/AbstractHeaderBasedCachingWire.java +++ b/src/main/java/com/jcabi/http/wire/AbstractHeaderBasedCachingWire.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/AutoRedirectingWire.java b/src/main/java/com/jcabi/http/wire/AutoRedirectingWire.java index 6b5bfc477..57d6f20c6 100644 --- a/src/main/java/com/jcabi/http/wire/AutoRedirectingWire.java +++ b/src/main/java/com/jcabi/http/wire/AutoRedirectingWire.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/BasicAuthWire.java b/src/main/java/com/jcabi/http/wire/BasicAuthWire.java index 412bb419d..86c580286 100644 --- a/src/main/java/com/jcabi/http/wire/BasicAuthWire.java +++ b/src/main/java/com/jcabi/http/wire/BasicAuthWire.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/CachingWire.java b/src/main/java/com/jcabi/http/wire/CachingWire.java index 35076324d..8deb49046 100644 --- a/src/main/java/com/jcabi/http/wire/CachingWire.java +++ b/src/main/java/com/jcabi/http/wire/CachingWire.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/CookieOptimizingWire.java b/src/main/java/com/jcabi/http/wire/CookieOptimizingWire.java index 34fd104bb..68a23207d 100644 --- a/src/main/java/com/jcabi/http/wire/CookieOptimizingWire.java +++ b/src/main/java/com/jcabi/http/wire/CookieOptimizingWire.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/ETagCachingWire.java b/src/main/java/com/jcabi/http/wire/ETagCachingWire.java index 70e6a3cf1..d95f25b6d 100644 --- a/src/main/java/com/jcabi/http/wire/ETagCachingWire.java +++ b/src/main/java/com/jcabi/http/wire/ETagCachingWire.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/FcCache.java b/src/main/java/com/jcabi/http/wire/FcCache.java index f5a60af50..3ccd66f5b 100644 --- a/src/main/java/com/jcabi/http/wire/FcCache.java +++ b/src/main/java/com/jcabi/http/wire/FcCache.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/FcWire.java b/src/main/java/com/jcabi/http/wire/FcWire.java index dc1ab95e1..e3b2aa3b6 100644 --- a/src/main/java/com/jcabi/http/wire/FcWire.java +++ b/src/main/java/com/jcabi/http/wire/FcWire.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/LastModifiedCachingWire.java b/src/main/java/com/jcabi/http/wire/LastModifiedCachingWire.java index 80bc1be8f..c99357174 100644 --- a/src/main/java/com/jcabi/http/wire/LastModifiedCachingWire.java +++ b/src/main/java/com/jcabi/http/wire/LastModifiedCachingWire.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/OneMinuteWire.java b/src/main/java/com/jcabi/http/wire/OneMinuteWire.java index 974bddfca..6f53e587a 100644 --- a/src/main/java/com/jcabi/http/wire/OneMinuteWire.java +++ b/src/main/java/com/jcabi/http/wire/OneMinuteWire.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/RetryWire.java b/src/main/java/com/jcabi/http/wire/RetryWire.java index f18f18ac4..687d08103 100644 --- a/src/main/java/com/jcabi/http/wire/RetryWire.java +++ b/src/main/java/com/jcabi/http/wire/RetryWire.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/TrustedWire.java b/src/main/java/com/jcabi/http/wire/TrustedWire.java index e793d20e1..415513204 100644 --- a/src/main/java/com/jcabi/http/wire/TrustedWire.java +++ b/src/main/java/com/jcabi/http/wire/TrustedWire.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/UserAgentWire.java b/src/main/java/com/jcabi/http/wire/UserAgentWire.java index 8903f303e..422cd1750 100644 --- a/src/main/java/com/jcabi/http/wire/UserAgentWire.java +++ b/src/main/java/com/jcabi/http/wire/UserAgentWire.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 @@ -70,7 +70,6 @@ @Immutable @ToString(of = "origin") @EqualsAndHashCode(of = "origin") -@RequiredArgsConstructor public final class UserAgentWire implements Wire { /** @@ -99,6 +98,15 @@ public UserAgentWire(final Wire wire) { ); } + /** + * Public ctor. + * @param wire Original wire + */ + public UserAgentWire(final Wire wire, final String agnt) { + this.origin = wire; + this.agent = agnt; + } + // @checkstyle ParameterNumber (7 lines) @Override public Response send(final Request req, final String home, diff --git a/src/main/java/com/jcabi/http/wire/VerboseWire.java b/src/main/java/com/jcabi/http/wire/VerboseWire.java index a6c2e6d64..ab861ae44 100644 --- a/src/main/java/com/jcabi/http/wire/VerboseWire.java +++ b/src/main/java/com/jcabi/http/wire/VerboseWire.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/package-info.java b/src/main/java/com/jcabi/http/wire/package-info.java index 65871bef2..d31cd325f 100644 --- a/src/main/java/com/jcabi/http/wire/package-info.java +++ b/src/main/java/com/jcabi/http/wire/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/site/site.xml b/src/site/site.xml index 108f3e5f0..4af61e4f1 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,6 +1,6 @@ + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} MDC=%X{user} - %msg%n + + + + + +