Skip to content
Draft
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 @@ -287,6 +287,9 @@ public static List<MediaType> getAcceptableMediaTypes(MultivaluedMap<String, ? e
list.add(MediaTypeHelper.valueOf(accept.trim()));
}
}
// Sort by weight (q) while preserving header-provided order on total ties
// Keep the q parameter present for visibility (TCK expects it), but do not
// rely on it downstream for matching; matching logic uses MediaTypeHelper.
MediaTypeHelper.sortByWeight(list);
return list;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,25 +127,6 @@ public int compare(MediaType mediaType2, MediaType mediaType) {
if (!isWildcardCompositeSubtype(mediaType.getSubtype()) && isWildcardCompositeSubtype(mediaType2.getSubtype()))
return 1;

int numNonQ = 0;
if (mediaType.getParameters() != null) {
numNonQ = mediaType.getParameters().size();
if (wasQ)
numNonQ--;
}

int numNonQ2 = 0;
if (mediaType2.getParameters() != null) {
numNonQ2 = mediaType2.getParameters().size();
if (wasQ2)
numNonQ2--;
}

if (numNonQ < numNonQ2)
return -1;
if (numNonQ > numNonQ2)
return 1;

return 0;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package org.jboss.resteasy.reactive.server.vertx.test.resource.basic;

import static io.restassured.RestAssured.given;
import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.stream.Collectors;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;

import org.jboss.resteasy.reactive.server.vertx.test.framework.ResteasyReactiveUnitTest;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

public class AcceptHeaderOrderTest {

@RegisterExtension
static ResteasyReactiveUnitTest test = new ResteasyReactiveUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class).addClasses(Resource.class));

@Path("/headers")
public static class Resource {
@GET
@Path("/amt")
public String amt(@Context HttpHeaders hs) {
return hs.getAcceptableMediaTypes().stream().map(MediaType::toString).collect(Collectors.joining(","));
}
}

@Test
public void preservesOrderOnTies() {
String response = given()
.header("Accept",
"application/json,text/html; charset=UTF-8,text/plain; charset=UTF-8,*/*;q=0.8")
.get("/headers/amt")
.then()
.statusCode(200)
.extract()
.asString();
assertEquals("application/json,text/html;charset=UTF-8,text/plain;charset=UTF-8,*/*", response);
}
}