Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don’t duplicate query values in getUri #1918

Merged
merged 2 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,10 @@ protected static URI buildUri(
@Nullable Map<String, List<String>> multiQueryParameters
) {
UriBuilder uriBuilder = UriBuilder.of(path == null ? SLASH : path);
if (queryParameters != null) {
queryParameters.forEach((key, value) -> splitCommaSeparatedValue(value).forEach(token -> uriBuilder.queryParam(key, token)));
}
if (multiQueryParameters != null) {
multiQueryParameters.forEach((key, values) -> values.forEach(value -> uriBuilder.queryParam(key, value)));
if (CollectionUtils.isNotEmpty(multiQueryParameters)) {
multiQueryParameters.forEach((key, values) -> uriBuilder.queryParam(key, values.toArray()));
} else if (CollectionUtils.isNotEmpty(queryParameters)) {
queryParameters.forEach(uriBuilder::queryParam);
timyates marked this conversation as resolved.
Show resolved Hide resolved
}
return uriBuilder.build();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* Copyright 2017-2023 original authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micronaut.http.server.tck.lambda.tests;

import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.MediaType;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.micronaut.http.annotation.Produces;
import io.micronaut.http.tck.AssertionUtils;
import io.micronaut.http.tck.HttpResponseAssertion;
import io.micronaut.http.uri.UriBuilder;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.net.URI;
import java.util.Optional;

import static io.micronaut.http.tck.TestScenario.asserts;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

@SuppressWarnings({
"java:S5960", // We're allowed assertions, as these are used in tests only
"checkstyle:MissingJavadocType",
"checkstyle:DesignForExtension"
})
public class HttpRequestUriTest {

public static final String SPEC_NAME = "HttpRequestUriTest";

@Test
void testRequestUriContainsQueryValue() throws IOException {
URI uri = UriBuilder.of("/requesturi")
.queryParam("A", "foo")
.queryParam("B", "bar")
.build();
asserts(SPEC_NAME,
HttpRequest.GET(uri).accept(MediaType.TEXT_PLAIN),
(server, request) -> AssertionUtils.assertDoesNotThrow(server, request,
HttpResponseAssertion.builder()
.status(HttpStatus.OK)
.assertResponse(httpResponse -> {
Optional<String> resultOptional = httpResponse.getBody(String.class);
assertTrue(resultOptional.isPresent());
String result = resultOptional.get();
assertNotNull(result);
assertEquals(1, countOcurrences(result, "A=foo"));
assertEquals(1, countOcurrences(result, "B=bar"));
})
.build()));
}

private static int countOcurrences(String str, String findStr) {
int lastIndex = 0;
int count = 0;
while (lastIndex != -1) {

lastIndex = str.indexOf(findStr, lastIndex);

if (lastIndex != -1) {
count++;
lastIndex += findStr.length();
}
}
return count;
}

@Requires(property = "spec.name", value = SPEC_NAME)
@Controller("/requesturi")
static class TestController {
@Produces(MediaType.TEXT_PLAIN)
@Get
String index(HttpRequest<?> request) {
return request.getUri().toASCIIString();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* Copyright 2017-2023 original authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micronaut.http.server.tck.lambda.tests;

import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.MediaType;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.micronaut.http.annotation.Produces;
import io.micronaut.http.tck.AssertionUtils;
import io.micronaut.http.tck.HttpResponseAssertion;
import io.micronaut.http.uri.UriBuilder;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.net.URI;
import java.util.Optional;

import static io.micronaut.http.tck.TestScenario.asserts;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

@SuppressWarnings({
"java:S5960", // We're allowed assertions, as these are used in tests only
"checkstyle:MissingJavadocType",
"checkstyle:DesignForExtension"
})
public class HttpRequestUriTest {

public static final String SPEC_NAME = "HttpRequestUriTest";

@Test
void testRequestUriContainsQueryValue() throws IOException {
URI uri = UriBuilder.of("/requesturi")
.queryParam("A", "foo")
.queryParam("B", "bar")
.build();
asserts(SPEC_NAME,
HttpRequest.GET(uri).accept(MediaType.TEXT_PLAIN),
(server, request) -> AssertionUtils.assertDoesNotThrow(server, request,
HttpResponseAssertion.builder()
.status(HttpStatus.OK)
.assertResponse(httpResponse -> {
Optional<String> resultOptional = httpResponse.getBody(String.class);
assertTrue(resultOptional.isPresent());
String result = resultOptional.get();
assertNotNull(result);
assertEquals(1, countOcurrences(result, "A=foo"));
assertEquals(1, countOcurrences(result, "B=bar"));
})
.build()));
}

private static int countOcurrences(String str, String findStr) {
int lastIndex = 0;
int count = 0;
while (lastIndex != -1) {

lastIndex = str.indexOf(findStr, lastIndex);

if (lastIndex != -1) {
count++;
lastIndex += findStr.length();
}
}
return count;
}

@Requires(property = "spec.name", value = SPEC_NAME)
@Controller("/requesturi")
static class TestController {
@Produces(MediaType.TEXT_PLAIN)
@Get
String index(HttpRequest<?> request) {
return request.getUri().toASCIIString();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/*
* Copyright 2017-2023 original authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micronaut.http.server.tck.lambda.tests;

import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.micronaut.http.tck.AssertionUtils;
import io.micronaut.http.tck.HttpResponseAssertion;
import io.micronaut.http.uri.UriBuilder;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.net.URI;
import java.util.Optional;

import static io.micronaut.http.tck.TestScenario.asserts;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

@SuppressWarnings({
"java:S5960", // We're allowed assertions, as these are used in tests only
"checkstyle:MissingJavadocType",
"checkstyle:DesignForExtension"
})
public class RequestUriTest {

public static final String SPEC_NAME = "RequestUriTest";

@Test
void testRequestUriContainsQueryValue() throws IOException {
URI uri = UriBuilder.of("/requesturi")
.queryParam("A", "foo")
.queryParam("B", "bar")
.build();
asserts(SPEC_NAME,
HttpRequest.GET(uri),
(server, request) -> AssertionUtils.assertDoesNotThrow(server, request,
HttpResponseAssertion.builder()
.status(HttpStatus.OK)
.assertResponse(httpResponse -> {
Optional<String> resultOptional = httpResponse.getBody(String.class);
assertTrue(resultOptional.isPresent());
String result = resultOptional.get();
assertNotNull(result);
assertEquals(1, countOcurrences(result, "A=foo"));
assertEquals(1, countOcurrences(result, "B=bar"));
})
.build()));
}

private static int countOcurrences(String str, String findStr) {
int lastIndex = 0;
int count = 0;
while (lastIndex != -1) {

lastIndex = str.indexOf(findStr, lastIndex);

if (lastIndex != -1) {
count++;
lastIndex += findStr.length();
}
}
return count;
}

@Requires(property = "spec.name", value = SPEC_NAME)
@Controller("/requesturi")
static class TestController {
@Get
String index(HttpRequest<?> request) {
return request.getUri().toASCIIString();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright 2017-2023 original authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package io.micronaut.http.server.tck.lambda.tests;

import io.micronaut.context.annotation.Requires;
import io.micronaut.http.HttpRequest;
import io.micronaut.http.HttpStatus;
import io.micronaut.http.MediaType;
import io.micronaut.http.annotation.Controller;
import io.micronaut.http.annotation.Get;
import io.micronaut.http.annotation.Produces;
import io.micronaut.http.tck.AssertionUtils;
import io.micronaut.http.tck.HttpResponseAssertion;
import io.micronaut.http.uri.UriBuilder;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.net.URI;
import java.util.Optional;

import static io.micronaut.http.tck.TestScenario.asserts;
import static org.junit.jupiter.api.Assertions.*;

@SuppressWarnings({
"java:S5960", // We're allowed assertions, as these are used in tests only
"checkstyle:MissingJavadocType",
"checkstyle:DesignForExtension"
})
public class HttpRequestUriTest {

public static final String SPEC_NAME = "RequestUriTest";

@Test
void testRequestUriContainsQueryValue() throws IOException {
URI uri = UriBuilder.of("/requesturi")
.queryParam("A", "foo")
.queryParam("B", "bar")
.build();
asserts(SPEC_NAME,
HttpRequest.GET(uri).accept(MediaType.TEXT_PLAIN),
(server, request) -> AssertionUtils.assertDoesNotThrow(server, request,
HttpResponseAssertion.builder()
.status(HttpStatus.OK)
.assertResponse(httpResponse -> {
Optional<String> resultOptional = httpResponse.getBody(String.class);
assertTrue(resultOptional.isPresent());
String result = resultOptional.get();
assertNotNull(result);
assertEquals(1, countOcurrences(result, "A=foo"));
assertEquals(1, countOcurrences(result, "B=bar"));
})
.build()));
}

private static int countOcurrences(String str, String findStr) {
int lastIndex = 0;
int count = 0;
while (lastIndex != -1) {

lastIndex = str.indexOf(findStr, lastIndex);

if (lastIndex != -1) {
count++;
lastIndex += findStr.length();
}
}
return count;
}

@Requires(property = "spec.name", value = SPEC_NAME)
@Controller("/requesturi")
static class TestController {

@Produces(MediaType.TEXT_PLAIN)
@Get
String index(HttpRequest<?> request) {
return request.getUri().toASCIIString();
}
}
}