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 Quarkus REST concurrent modification exception when making abstract resource classes inheritors beans #41721

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 @@ -16,6 +16,8 @@
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritanceAbstractParentImplResource;
import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritanceAbstractParentResource;
import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritanceParentResource;
import io.quarkus.resteasy.reactive.server.test.resource.basic.resource.InheritanceParentResourceImpl;
import io.quarkus.resteasy.reactive.server.test.simple.PortProviderUtil;
Expand All @@ -39,6 +41,8 @@ public class InheritanceTest {
public JavaArchive get() {
JavaArchive war = ShrinkWrap.create(JavaArchive.class);
war.addClass(InheritanceParentResource.class);
war.addClass(InheritanceAbstractParentResource.class);
war.addClass(InheritanceAbstractParentImplResource.class);
war.addClasses(PortProviderUtil.class, InheritanceParentResourceImpl.class);
return war;
}
Expand Down Expand Up @@ -67,4 +71,13 @@ public void Test1() throws Exception {
Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
Assertions.assertEquals(response.readEntity(String.class), "First");
}

@Test
public void testAbstractParent() {
Builder builder = client.target(generateURL("/inheritance-abstract-parent-test")).request();
builder.header("Accept", "text/plain");
Response response = builder.get();
Assertions.assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
Assertions.assertEquals(response.readEntity(String.class), "works");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;

public class InheritanceAbstractParentImplResource extends InheritanceAbstractParentResource {

@Override
public String get() {
return "works";
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package io.quarkus.resteasy.reactive.server.test.resource.basic.resource;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;

@Path("/inheritance-abstract-parent-test")
public abstract class InheritanceAbstractParentResource {

@GET
public abstract String get();

}
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,8 @@ public static ResourceScanningResult scanResources(
}

// handle abstract classes
scannedResources.values().stream().filter(ClassInfo::isAbstract).forEach(abstractScannedResource -> {
var abstractClasses = scannedResources.values().stream().filter(ClassInfo::isAbstract).toList();
abstractClasses.forEach(abstractScannedResource -> {
Collection<ClassInfo> allSubclasses = index.getAllKnownSubclasses(abstractScannedResource.name());
if (allSubclasses.size() != 1) {
return; // don't do anything with this case as it's not evident how it's supposed to be handled
Expand Down
Loading