From fa71fae25d1137279a633a5c2f0f24d7ea514d2d Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Tue, 3 Dec 2024 17:45:50 -0800 Subject: [PATCH 01/13] Excavator: Upgrade dependencies (#2442) --- versions.lock | 8 ++++---- versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/versions.lock b/versions.lock index 90b6cb3ba..a33bd2dba 100644 --- a/versions.lock +++ b/versions.lock @@ -17,10 +17,10 @@ com.google.guava:guava:33.3.1-jre (17 constraints: 2f2b2816) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) com.palantir.common:streams:2.4.0 (1 constraints: 08050136) -com.palantir.conjure.java:conjure-lib:8.34.0 (1 constraints: ad07af7e) -com.palantir.conjure.java.api:errors:2.56.0 (2 constraints: 63156edb) -com.palantir.conjure.java.api:service-config:2.56.0 (2 constraints: 5b1911dd) -com.palantir.conjure.java.api:ssl-config:2.56.0 (4 constraints: 043f23a0) +com.palantir.conjure.java:conjure-lib:8.35.0 (1 constraints: ae07b37e) +com.palantir.conjure.java.api:errors:2.57.0 (2 constraints: 6415a0db) +com.palantir.conjure.java.api:service-config:2.57.0 (2 constraints: 5c194ddd) +com.palantir.conjure.java.api:ssl-config:2.57.0 (4 constraints: 063f3ba1) com.palantir.conjure.java.runtime:client-config:8.16.0 (1 constraints: 4105653b) com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.16.0 (1 constraints: 851cc6a4) com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.16.0 (2 constraints: 6116630f) diff --git a/versions.props b/versions.props index 8530eca68..9d9622b2d 100644 --- a/versions.props +++ b/versions.props @@ -4,9 +4,9 @@ com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 33.3.1-jre com.google.testing.compile:compile-testing = 0.21.0 com.palantir.common:streams = 2.4.0 -com.palantir.conjure.java.api:* = 2.56.0 +com.palantir.conjure.java.api:* = 2.57.0 com.palantir.conjure.java.runtime:* = 8.16.0 -com.palantir.conjure.java:* = 8.34.0 +com.palantir.conjure.java:* = 8.35.0 com.palantir.conjure:conjure = 4.50.0 com.palantir.goethe:* = 0.14.0 com.palantir.javapoet:javapoet = 0.5.0 From 9401ac944023555dc0ecea4eed029ff10f896c99 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:43:40 -0800 Subject: [PATCH 02/13] Excavator: Upgrade dependencies (#2445) --- versions.lock | 14 +++++++------- versions.props | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/versions.lock b/versions.lock index a33bd2dba..71db56a32 100644 --- a/versions.lock +++ b/versions.lock @@ -39,14 +39,14 @@ com.palantir.safethreadlocalrandom:safe-thread-local-random:0.3.0 (1 constraints com.palantir.tokens:auth-tokens:3.18.0 (3 constraints: 2628868e) com.palantir.tracing:tracing:6.20.0 (2 constraints: 5416db0d) com.palantir.tracing:tracing-api:6.20.0 (2 constraints: 0912eb17) -com.palantir.tritium:tritium-api:0.95.0 (2 constraints: 3d1f14be) -com.palantir.tritium:tritium-caffeine:0.95.0 (1 constraints: 4005523b) -com.palantir.tritium:tritium-core:0.95.0 (1 constraints: 46105ba2) -com.palantir.tritium:tritium-ids:0.95.0 (1 constraints: d10fb396) -com.palantir.tritium:tritium-metrics:0.95.0 (2 constraints: bf1563e4) -com.palantir.tritium:tritium-registry:0.95.0 (5 constraints: a656f31c) +com.palantir.tritium:tritium-api:0.96.0 (2 constraints: 3f1f48be) +com.palantir.tritium:tritium-caffeine:0.96.0 (1 constraints: 4105553b) +com.palantir.tritium:tritium-core:0.96.0 (1 constraints: 47105ea2) +com.palantir.tritium:tritium-ids:0.96.0 (1 constraints: d10fb396) +com.palantir.tritium:tritium-metrics:0.96.0 (2 constraints: c11598e4) +com.palantir.tritium:tritium-registry:0.96.0 (5 constraints: a9560e1e) com.squareup:javapoet:1.13.0 (1 constraints: f50b65f7) -io.dropwizard.metrics:metrics-core:4.2.29 (5 constraints: 5953abfb) +io.dropwizard.metrics:metrics-core:4.2.29 (5 constraints: 5c533afc) javax.annotation:javax.annotation-api:1.3.2 (1 constraints: 0805fb35) joda-time:joda-time:2.12.7 (1 constraints: 2f16b1f1) org.apache.httpcomponents.client5:httpclient5:5.3.1 (1 constraints: 0b050e36) diff --git a/versions.props b/versions.props index 9d9622b2d..54b843b05 100644 --- a/versions.props +++ b/versions.props @@ -16,7 +16,7 @@ com.palantir.safe-logging:* = 3.7.0 com.palantir.safethreadlocalrandom:safe-thread-local-random = 0.3.0 com.palantir.tokens:auth-tokens = 3.18.0 com.palantir.tracing:* = 6.20.0 -com.palantir.tritium:* = 0.95.0 +com.palantir.tritium:* = 0.96.0 com.uber.nullaway:nullaway = 0.12.1 io.dropwizard.metrics:metrics-core = 4.2.29 org.apache.httpcomponents.client5:* = 5.3.1 From 7939521c72f42f4e1fd0a18ff2dce0f414365763 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Sun, 8 Dec 2024 05:14:12 -0800 Subject: [PATCH 03/13] Excavator: Upgrade dependencies (#2446) --- versions.lock | 2 +- versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.lock b/versions.lock index 71db56a32..3f4dd8bad 100644 --- a/versions.lock +++ b/versions.lock @@ -26,7 +26,7 @@ com.palantir.conjure.java.runtime:conjure-java-jackson-optimizations:8.16.0 (1 c com.palantir.conjure.java.runtime:conjure-java-jackson-serialization:8.16.0 (2 constraints: 6116630f) com.palantir.conjure.java.runtime:keystores:8.16.0 (2 constraints: 6119b1dd) com.palantir.goethe:goethe:0.14.0 (1 constraints: 37052f3b) -com.palantir.javapoet:javapoet:0.5.0 (2 constraints: c7103ed1) +com.palantir.javapoet:javapoet:0.6.0 (2 constraints: c81064d1) com.palantir.nylon:nylon-threads:0.4.0 (1 constraints: 0c10fa91) com.palantir.refreshable:refreshable:2.5.0 (2 constraints: f1188fb2) com.palantir.ri:resource-identifier:2.8.0 (2 constraints: fc1495b7) diff --git a/versions.props b/versions.props index 54b843b05..871e9f80a 100644 --- a/versions.props +++ b/versions.props @@ -9,7 +9,7 @@ com.palantir.conjure.java.runtime:* = 8.16.0 com.palantir.conjure.java:* = 8.35.0 com.palantir.conjure:conjure = 4.50.0 com.palantir.goethe:* = 0.14.0 -com.palantir.javapoet:javapoet = 0.5.0 +com.palantir.javapoet:javapoet = 0.6.0 com.palantir.refreshable:* = 2.5.0 com.palantir.ri:resource-identifier = 2.8.0 com.palantir.safe-logging:* = 3.7.0 From bb9d4019a28c1982cc6efc345e6928ee5f5923d6 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Sun, 8 Dec 2024 17:40:27 -0800 Subject: [PATCH 04/13] Excavator: Upgrade Jackson to the latest stable release (#2447) --- versions.lock | 20 ++++++++++---------- versions.props | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/versions.lock b/versions.lock index 3f4dd8bad..ed690a61c 100644 --- a/versions.lock +++ b/versions.lock @@ -1,13 +1,13 @@ # Run ./gradlew writeVersionsLocks to regenerate this file -com.fasterxml.jackson.core:jackson-annotations:2.18.1 (8 constraints: 0d8536b2) -com.fasterxml.jackson.core:jackson-core:2.18.1 (11 constraints: 7fe513f3) -com.fasterxml.jackson.core:jackson-databind:2.18.1 (15 constraints: 7d31a4a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.1 (1 constraints: 811ca8a4) -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.1 (1 constraints: 811ca8a4) +com.fasterxml.jackson.core:jackson-annotations:2.18.2 (8 constraints: 118593b6) +com.fasterxml.jackson.core:jackson-core:2.18.2 (11 constraints: 88e57b00) +com.fasterxml.jackson.core:jackson-databind:2.18.2 (15 constraints: 8531e8b7) +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.2 (1 constraints: 811ca8a4) +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2 (1 constraints: 811ca8a4) com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: 0f284736) com.google.auto:auto-common:1.2.1 (1 constraints: 17120ffb) com.google.code.findbugs:jsr305:3.0.2 (14 constraints: 49e26143) @@ -66,7 +66,7 @@ org.slf4j:slf4j-api:1.7.36 (8 constraints: bb801622) org.wildfly.common:wildfly-common:1.5.4.Final (2 constraints: 741cfbf1) [Test dependencies] -com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.1 (1 constraints: 3e05483b) +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2 (1 constraints: 3f05493b) com.google.auto.value:auto-value:1.10 (1 constraints: e711f8e8) com.google.auto.value:auto-value-annotations:1.8.1 (1 constraints: 620a29b9) com.google.code.findbugs:annotations:3.0.1u2 (1 constraints: 450b07da) diff --git a/versions.props b/versions.props index 871e9f80a..9a7c7ae6d 100644 --- a/versions.props +++ b/versions.props @@ -1,5 +1,5 @@ -com.fasterxml.jackson.*:* = 2.18.1 -com.fasterxml.jackson.core:jackson-databind = 2.18.1 +com.fasterxml.jackson.*:* = 2.18.2 +com.fasterxml.jackson.core:jackson-databind = 2.18.2 com.google.code.findbugs:jsr305 = 3.0.2 com.google.guava:guava = 33.3.1-jre com.google.testing.compile:compile-testing = 0.21.0 From b52ceb60eedbabf2ca30d6d18336f51755cfeae9 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Thu, 12 Dec 2024 08:25:37 -0800 Subject: [PATCH 05/13] Excavator: Upgrade dependencies (#2448) --- versions.lock | 8 ++++---- versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/versions.lock b/versions.lock index ed690a61c..c247fed65 100644 --- a/versions.lock +++ b/versions.lock @@ -1,7 +1,7 @@ # Run ./gradlew writeVersionsLocks to regenerate this file -com.fasterxml.jackson.core:jackson-annotations:2.18.2 (8 constraints: 118593b6) -com.fasterxml.jackson.core:jackson-core:2.18.2 (11 constraints: 88e57b00) -com.fasterxml.jackson.core:jackson-databind:2.18.2 (15 constraints: 8531e8b7) +com.fasterxml.jackson.core:jackson-annotations:2.18.2 (8 constraints: 12851fb7) +com.fasterxml.jackson.core:jackson-core:2.18.2 (11 constraints: 89e5ca00) +com.fasterxml.jackson.core:jackson-databind:2.18.2 (15 constraints: 863143b9) com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.18.2 (1 constraints: 811ca8a4) com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.18.2 (1 constraints: 811ca8a4) com.fasterxml.jackson.datatype:jackson-datatype-guava:2.18.2 (1 constraints: 811ca8a4) @@ -17,7 +17,7 @@ com.google.guava:guava:33.3.1-jre (17 constraints: 2f2b2816) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) com.palantir.common:streams:2.4.0 (1 constraints: 08050136) -com.palantir.conjure.java:conjure-lib:8.35.0 (1 constraints: ae07b37e) +com.palantir.conjure.java:conjure-lib:8.36.0 (1 constraints: af07b77e) com.palantir.conjure.java.api:errors:2.57.0 (2 constraints: 6415a0db) com.palantir.conjure.java.api:service-config:2.57.0 (2 constraints: 5c194ddd) com.palantir.conjure.java.api:ssl-config:2.57.0 (4 constraints: 063f3ba1) diff --git a/versions.props b/versions.props index 9a7c7ae6d..d97122ea4 100644 --- a/versions.props +++ b/versions.props @@ -6,7 +6,7 @@ com.google.testing.compile:compile-testing = 0.21.0 com.palantir.common:streams = 2.4.0 com.palantir.conjure.java.api:* = 2.57.0 com.palantir.conjure.java.runtime:* = 8.16.0 -com.palantir.conjure.java:* = 8.35.0 +com.palantir.conjure.java:* = 8.36.0 com.palantir.conjure:conjure = 4.50.0 com.palantir.goethe:* = 0.14.0 com.palantir.javapoet:javapoet = 0.6.0 From ecf634459023586653b329f69854db7436f031b0 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Thu, 12 Dec 2024 09:24:29 -0800 Subject: [PATCH 06/13] [High Priority] Excavator: Update gradle-jdks infrastructure plugins (#2449) --- build.gradle | 2 +- gradle/gradle-jdks-setup.jar | Bin 112070 -> 113255 bytes gradle/jdks/11/linux-glibc/aarch64/local-path | 2 +- gradle/jdks/11/linux-glibc/x86-64/local-path | 2 +- gradle/jdks/11/linux-glibc/x86/local-path | 2 +- gradle/jdks/11/linux-musl/aarch64/local-path | 2 +- gradle/jdks/11/linux-musl/x86-64/local-path | 2 +- gradle/jdks/17/linux-glibc/aarch64/local-path | 2 +- gradle/jdks/17/linux-glibc/x86-64/local-path | 2 +- gradle/jdks/17/linux-musl/aarch64/local-path | 2 +- gradle/jdks/17/linux-musl/x86-64/local-path | 2 +- gradle/jdks/21/linux-glibc/aarch64/local-path | 2 +- gradle/jdks/21/linux-glibc/x86-64/local-path | 2 +- gradle/jdks/21/linux-musl/aarch64/local-path | 2 +- gradle/jdks/21/linux-musl/x86-64/local-path | 2 +- settings.gradle | 2 +- 16 files changed, 15 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index c8141cb54..07678c3a0 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { dependencies { classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0' - classpath 'com.palantir.gradle.jdks:gradle-jdks:0.58.0' + classpath 'com.palantir.gradle.jdks:gradle-jdks:0.59.0' classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.16.0' classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.19.0' classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0' diff --git a/gradle/gradle-jdks-setup.jar b/gradle/gradle-jdks-setup.jar index 0cd1840ece6866015f4c1ca20264d44786ea0163..ef84f071e6bfb545b6a65355eee9e3055c0d03d5 100644 GIT binary patch delta 3715 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 Date: Fri, 13 Dec 2024 05:39:26 -0800 Subject: [PATCH 07/13] Excavator: Upgrades Baseline to the latest version (#2450) --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 07678c3a0..23320aef2 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ buildscript { classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.13.0' classpath 'org.revapi:gradle-revapi:1.8.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.50.0' - classpath 'com.palantir.baseline:gradle-baseline-java:6.4.0' + classpath 'com.palantir.baseline:gradle-baseline-java:6.5.0' classpath 'com.palantir.gradle.gitversion:gradle-git-version:3.1.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0' classpath 'com.palantir.metricschema:gradle-metric-schema:0.32.0' From 31f619d6b68f975f0e9a654e81323898faf0c5a6 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Fri, 13 Dec 2024 08:39:42 -0800 Subject: [PATCH 08/13] Excavator: Upgrade dependencies (#2451) --- versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.props b/versions.props index d97122ea4..444ba6f4d 100644 --- a/versions.props +++ b/versions.props @@ -17,7 +17,7 @@ com.palantir.safethreadlocalrandom:safe-thread-local-random = 0.3.0 com.palantir.tokens:auth-tokens = 3.18.0 com.palantir.tracing:* = 6.20.0 com.palantir.tritium:* = 0.96.0 -com.uber.nullaway:nullaway = 0.12.1 +com.uber.nullaway:nullaway = 0.12.2 io.dropwizard.metrics:metrics-core = 4.2.29 org.apache.httpcomponents.client5:* = 5.3.1 org.apache.httpcomponents.core5:* = 5.3.1 From 965f9a1b63cfabf64b20a4de8e72733227ea2ac5 Mon Sep 17 00:00:00 2001 From: David Schlosnagle Date: Sun, 15 Dec 2024 21:45:47 -0500 Subject: [PATCH 09/13] Fix request request path to always include leading slash / (#2452) Fix request request path to always include leading slash / --- changelog/@unreleased/pr-2452.v2.yml | 5 ++ .../hc5/ApacheHttpClientBlockingChannel.java | 11 ++- .../ApacheHttpClientBlockingChannelTest.java | 88 ++++++++++++++++++- 3 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 changelog/@unreleased/pr-2452.v2.yml diff --git a/changelog/@unreleased/pr-2452.v2.yml b/changelog/@unreleased/pr-2452.v2.yml new file mode 100644 index 000000000..1c1c2cb49 --- /dev/null +++ b/changelog/@unreleased/pr-2452.v2.yml @@ -0,0 +1,5 @@ +type: fix +fix: + description: Fix request request path to always include leading slash / + links: + - https://github.com/palantir/dialogue/pull/2452 diff --git a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java index 0648149ef..cb326c195 100644 --- a/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java +++ b/dialogue-apache-hc5-client/src/main/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannel.java @@ -162,7 +162,7 @@ static ClassicHttpRequest createRequest(BaseUrl baseUrl, Endpoint endpoint, Requ endpoint.httpMethod().name()) .setScheme(target.getProtocol()) .setAuthority(parseAuthority(target)) - .setPath(target.getFile()); + .setPath(getPath(target)); // Fill headers request.headerParams().forEach(builder::addHeader); @@ -181,6 +181,15 @@ static ClassicHttpRequest createRequest(BaseUrl baseUrl, Endpoint endpoint, Requ return builder.build(); } + @VisibleForTesting + static String getPath(URL target) { + String path = target.getFile(); + if (path.startsWith("/")) { + return path; + } + return path.isEmpty() ? "/" : '/' + path; + } + @VisibleForTesting static URIAuthority parseAuthority(URL url) { try { diff --git a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java index 5439cc6b4..9205cea88 100644 --- a/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java +++ b/dialogue-apache-hc5-client/src/test/java/com/palantir/dialogue/hc5/ApacheHttpClientBlockingChannelTest.java @@ -33,6 +33,7 @@ import java.util.Comparator; import java.util.Map; import org.apache.hc.core5.http.ClassicHttpRequest; +import org.apache.hc.core5.http.io.support.ClassicRequestBuilder; import org.apache.hc.core5.net.URIAuthority; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -116,9 +117,10 @@ public void renderPath(ListMultimap params, UrlBuilder url) { "https://user@[0000:0000:0000:0000:0000:ffff:c0a8:0102]:8443/path/to/foo/bar?baz=quux&hello=world#an-octothorpe" + " , 0000:0000:0000:0000:0000:ffff:c0a8:0102, 8443, user", "https://user:slash%2Fslash@www.example.local, www.example.local, -1, user:slash%2Fslash", + "http://localhost:59845/?REQUEST=GetCapabilities&SERVICE=WMS, localhost, 59845, ", + "http://localhost:59845?REQUEST=GetCapabilities&SERVICE=WMS, localhost, 59845, ", }) - void parseAuthority(String input, String expectedHost, int expectedPort, String expectedUserInfo) throws Exception { - URL url = new URL(input); + void parseAuthority(URL url, String expectedHost, int expectedPort, String expectedUserInfo) throws Exception { assertThat(ApacheHttpClientBlockingChannel.parseAuthority(url)) .isEqualTo(URIAuthority.create(url.toURI().getRawAuthority())) .isEqualTo(URIAuthority.create(url.getAuthority())) @@ -134,6 +136,88 @@ void parseAuthority(String input, String expectedHost, int expectedPort, String }); } + @ParameterizedTest + @ValueSource( + strings = { + "https://192.168.1.1", + "https://192.168.1.1/", + "https://localhost", + "https://localhost/", + "https://localhost/?REQUEST=GetCapabilities&SERVICE=WMS", + "https://localhost:12345", + "https://localhost:12345?REQUEST=GetCapabilities&SERVICE=WMS", + "https://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS", + "https://www.example.local/path/to/foo/bar?baz=quux&hello=world", + }) + void getPathStartsWithSlash(URL url) { + assertThat(ApacheHttpClientBlockingChannel.getPath(url)) + .isNotNull() + .isNotEmpty() + .startsWith("/"); + } + + @ParameterizedTest + @CsvSource({ + "http://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS , http://localhost:12345 , ", + "https://localhost:12345/?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/ , ", + "https://localhost:12345/api?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/api , ", + "https://localhost:12345/api?REQUEST=GetCapabilities&SERVICE=WMS , https://localhost:12345/api/ , ", + }) + void noPathQueryString(URL expectedUrl, String base) throws Exception { + Request wmsRequest = Request.builder() + .putQueryParams("REQUEST", "GetCapabilities") + .putQueryParams("SERVICE", "WMS") + .build(); + BaseUrl baseUrl = BaseUrl.of(new URL(base)); + Endpoint wmsEndpoint = new Endpoint() { + private final PathTemplate pathTemplate = PathTemplate.builder() + .variable("REQUEST") + .variable("SERVICE") + .build(); + + @Override + public HttpMethod httpMethod() { + return HttpMethod.GET; + } + + @Override + public String serviceName() { + return "testService"; + } + + @Override + public String endpointName() { + return "testEndpoint"; + } + + @Override + public String version() { + return "1.2.3"; + } + + @Override + public void renderPath(ListMultimap params, UrlBuilder url) { + pathTemplate.fill(params, url); + } + }; + URL target = baseUrl.render(wmsEndpoint, wmsRequest); + assertThat(ApacheHttpClientBlockingChannel.getPath(target)).isNotEmpty().startsWith("/"); + + ClassicHttpRequest expectedRequest = ClassicRequestBuilder.create( + wmsEndpoint.httpMethod().name()) + .setUri(target.toString()) + .build(); + + ClassicHttpRequest request = ApacheHttpClientBlockingChannel.createRequest(baseUrl, wmsEndpoint, wmsRequest); + assertThat(request.getMethod()).isEqualTo(wmsEndpoint.httpMethod().toString()); + assertThat(request.getUri()) + .isEqualTo(expectedUrl.toURI()) + .isEqualTo(expectedRequest.getUri()) + .asString() + .isEqualTo(expectedUrl.toString()); + assertThat(request.getPath()).isEqualTo(expectedRequest.getPath()); + } + @Test void testHostComparator() { assertThat("www.example.local") From 5e9d2d5a880d1af2223fade8ba6c804ed77038cc Mon Sep 17 00:00:00 2001 From: svc-autorelease Date: Mon, 16 Dec 2024 02:45:52 +0000 Subject: [PATCH 10/13] Release 4.7.0 [skip ci] --- changelog/{@unreleased => 4.7.0}/pr-2452.v2.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog/{@unreleased => 4.7.0}/pr-2452.v2.yml (100%) diff --git a/changelog/@unreleased/pr-2452.v2.yml b/changelog/4.7.0/pr-2452.v2.yml similarity index 100% rename from changelog/@unreleased/pr-2452.v2.yml rename to changelog/4.7.0/pr-2452.v2.yml From dcb92e37d841634f00d57ef7e6f92881883ac140 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Mon, 16 Dec 2024 05:47:37 -0800 Subject: [PATCH 11/13] Excavator: Upgrade dependencies (#2453) --- versions.lock | 14 +++++++------- versions.props | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/versions.lock b/versions.lock index c247fed65..5783a071b 100644 --- a/versions.lock +++ b/versions.lock @@ -114,13 +114,13 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 (1 constraints: e210ffd2) org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 (3 constraints: eb27efa7) org.jmock:jmock:2.13.1 (1 constraints: 3905393b) org.jmock:jmock-testjar:2.13.1 (1 constraints: a707a672) -org.junit.jupiter:junit-jupiter:5.11.3 (1 constraints: 3c05473b) -org.junit.jupiter:junit-jupiter-api:5.11.3 (6 constraints: 6f590320) -org.junit.jupiter:junit-jupiter-engine:5.11.3 (1 constraints: 370e034a) -org.junit.jupiter:junit-jupiter-migrationsupport:5.11.3 (1 constraints: 3c05473b) -org.junit.jupiter:junit-jupiter-params:5.11.3 (2 constraints: 7213cc5b) -org.junit.platform:junit-platform-commons:1.11.3 (2 constraints: 3321ed83) -org.junit.platform:junit-platform-engine:1.11.3 (1 constraints: d610eac4) +org.junit.jupiter:junit-jupiter:5.11.4 (1 constraints: 3d05483b) +org.junit.jupiter:junit-jupiter-api:5.11.4 (6 constraints: 7459d622) +org.junit.jupiter:junit-jupiter-engine:5.11.4 (1 constraints: 380e044a) +org.junit.jupiter:junit-jupiter-migrationsupport:5.11.4 (1 constraints: 3d05483b) +org.junit.jupiter:junit-jupiter-params:5.11.4 (2 constraints: 7413f75b) +org.junit.platform:junit-platform-commons:1.11.4 (2 constraints: 35212184) +org.junit.platform:junit-platform-engine:1.11.4 (1 constraints: d710ebc4) org.knowm.xchart:xchart:3.6.1 (1 constraints: 0c050d36) org.mockito:mockito-core:5.14.2 (2 constraints: 34142487) org.mockito:mockito-junit-jupiter:5.14.2 (1 constraints: 3e054f3b) diff --git a/versions.props b/versions.props index 444ba6f4d..2bd7bc3e7 100644 --- a/versions.props +++ b/versions.props @@ -27,7 +27,7 @@ org.slf4j:* = 1.7.36 com.github.ben-manes.caffeine:caffeine = 3.1.8 # test deps -org.junit.jupiter:* = 5.11.3 +org.junit.jupiter:* = 5.11.4 org.apache.logging.log4j:* = 2.24.0 org.assertj:assertj-core = 3.26.3 org.assertj:assertj-guava = 3.3.0 From b16810f511b013b7964baea8ed41afa1974854f3 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Mon, 16 Dec 2024 16:11:51 -0800 Subject: [PATCH 12/13] Excavator: Upgrade dependencies (#2454) --- versions.lock | 4 ++-- versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.lock b/versions.lock index 5783a071b..16b821a3a 100644 --- a/versions.lock +++ b/versions.lock @@ -11,9 +11,9 @@ com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2 (1 constraints: 81 com.github.ben-manes.caffeine:caffeine:3.1.8 (3 constraints: 0f284736) com.google.auto:auto-common:1.2.1 (1 constraints: 17120ffb) com.google.code.findbugs:jsr305:3.0.2 (14 constraints: 49e26143) -com.google.errorprone:error_prone_annotations:2.7.1 (18 constraints: 80207776) +com.google.errorprone:error_prone_annotations:2.7.1 (18 constraints: 7f208773) com.google.guava:failureaccess:1.0.2 (1 constraints: 150ae2b4) -com.google.guava:guava:33.3.1-jre (17 constraints: 2f2b2816) +com.google.guava:guava:33.4.0-jre (17 constraints: 2f2b2a16) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4) com.palantir.common:streams:2.4.0 (1 constraints: 08050136) diff --git a/versions.props b/versions.props index 2bd7bc3e7..741fb6635 100644 --- a/versions.props +++ b/versions.props @@ -1,7 +1,7 @@ com.fasterxml.jackson.*:* = 2.18.2 com.fasterxml.jackson.core:jackson-databind = 2.18.2 com.google.code.findbugs:jsr305 = 3.0.2 -com.google.guava:guava = 33.3.1-jre +com.google.guava:guava = 33.4.0-jre com.google.testing.compile:compile-testing = 0.21.0 com.palantir.common:streams = 2.4.0 com.palantir.conjure.java.api:* = 2.57.0 From c70024fd29ed67ece43ac4b4119c84a119a0b6b6 Mon Sep 17 00:00:00 2001 From: Excavator Bot <33266368+svc-excavator-bot@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:23:18 -0800 Subject: [PATCH 13/13] Excavator: Upgrade dependencies (#2455) --- versions.lock | 4 ++-- versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/versions.lock b/versions.lock index 16b821a3a..d787088b9 100644 --- a/versions.lock +++ b/versions.lock @@ -84,7 +84,7 @@ de.erichseifert.vectorgraphics2d:VectorGraphics2D:0.13 (1 constraints: 8c0a80bb) de.rototor.pdfbox:graphics2d:0.25 (1 constraints: 8f0a84bb) io.undertow:undertow-core:2.2.37.Final (1 constraints: 58074c61) junit:junit:4.13.2 (4 constraints: 90418c36) -net.bytebuddy:byte-buddy:1.15.4 (2 constraints: c916c650) +net.bytebuddy:byte-buddy:1.15.11 (2 constraints: c316f74f) net.bytebuddy:byte-buddy-agent:1.15.4 (1 constraints: 450b45de) net.jcip:jcip-annotations:1.0 (1 constraints: 560ff165) net.sf.jopt-simple:jopt-simple:5.0.4 (1 constraints: be0ad6cc) @@ -97,7 +97,7 @@ org.apache.logging.log4j:log4j-slf4j-impl:2.24.0 (1 constraints: 3a053f3b) org.apache.pdfbox:fontbox:2.0.17 (1 constraints: 180b71d8) org.apache.pdfbox:pdfbox:2.0.17 (1 constraints: b40c5915) org.apiguardian:apiguardian-api:1.1.2 (6 constraints: 24695e60) -org.assertj:assertj-core:3.26.3 (3 constraints: 57253c4e) +org.assertj:assertj-core:3.27.0 (3 constraints: 5525844d) org.assertj:assertj-guava:3.3.0 (1 constraints: 08050336) org.awaitility:awaitility:4.2.2 (1 constraints: 0a050736) org.bouncycastle:bcpkix-jdk18on:1.79 (1 constraints: e5040631) diff --git a/versions.props b/versions.props index 741fb6635..a1c6a8507 100644 --- a/versions.props +++ b/versions.props @@ -29,7 +29,7 @@ com.github.ben-manes.caffeine:caffeine = 3.1.8 # test deps org.junit.jupiter:* = 5.11.4 org.apache.logging.log4j:* = 2.24.0 -org.assertj:assertj-core = 3.26.3 +org.assertj:assertj-core = 3.27.0 org.assertj:assertj-guava = 3.3.0 org.hamcrest:hamcrest-core = 3.0 org.mockito:* = 5.14.2