diff --git a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java index b028b43d3d09f..676a699d93a2e 100644 --- a/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java +++ b/extensions/spring-web/deployment/src/main/java/io/quarkus/spring/web/deployment/SpringWebProcessor.java @@ -57,7 +57,7 @@ import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodAnnotationsBuildItem; import io.quarkus.resteasy.server.common.spi.AdditionalJaxRsResourceMethodParamAnnotations; import io.quarkus.spring.web.runtime.ResponseStatusExceptionMapper; -import io.quarkus.undertow.deployment.BlacklistedServletContainerInitializerBuildItem; +import io.quarkus.undertow.deployment.IgnoredServletContainerInitializerBuildItem; import io.quarkus.undertow.deployment.ServletInitParamBuildItem; public class SpringWebProcessor { @@ -107,8 +107,8 @@ FeatureBuildItem registerFeature() { } @BuildStep - public BlacklistedServletContainerInitializerBuildItem blacklistSpringServlet() { - return new BlacklistedServletContainerInitializerBuildItem("org.springframework.web.SpringServletContainerInitializer"); + public IgnoredServletContainerInitializerBuildItem ignoreSpringServlet() { + return new IgnoredServletContainerInitializerBuildItem("org.springframework.web.SpringServletContainerInitializer"); } @BuildStep diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java index ea6ad11c433e0..633596dc8b88a 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java @@ -246,27 +246,33 @@ public void registerUndertowHandlersConf(BuildProducer translateDeprecated( + List old) { + return old.stream().map(BlacklistedServletContainerInitializerBuildItem::getSciClass) + .map(IgnoredServletContainerInitializerBuildItem::new).collect(Collectors.toList()); + } + /* * look for Servlet container initializers * */ @BuildStep public List servletContainerInitializer( - ApplicationArchivesBuildItem archives, CombinedIndexBuildItem combinedIndexBuildItem, - List blacklistedBuildItems, + List ignoredScis, BuildProducer beans) throws IOException { - Set blacklistedClassNames = new HashSet<>(); - for (BlacklistedServletContainerInitializerBuildItem bi : blacklistedBuildItems) { - blacklistedClassNames.add(bi.getSciClass()); + Set ignoredClassNames = new HashSet<>(); + for (IgnoredServletContainerInitializerBuildItem bi : ignoredScis) { + ignoredClassNames.add(bi.getSciClass()); } List ret = new ArrayList<>(); Set initializers = ServiceUtil.classNamesNamedIn(Thread.currentThread().getContextClassLoader(), SERVLET_CONTAINER_INITIALIZER); for (String initializer : initializers) { - if (blacklistedClassNames.contains(initializer)) { + if (ignoredClassNames.contains(initializer)) { continue; } beans.produce(AdditionalBeanBuildItem.unremovableOf(initializer)); diff --git a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java index d29530823d085..19fc3fc54762b 100644 --- a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java +++ b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java @@ -2,6 +2,10 @@ import io.quarkus.builder.item.MultiBuildItem; +/** + * Use {@link IgnoredServletContainerInitializerBuildItem} instead + */ +@Deprecated public final class BlacklistedServletContainerInitializerBuildItem extends MultiBuildItem { final String sciClass; diff --git a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/IgnoredServletContainerInitializerBuildItem.java b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/IgnoredServletContainerInitializerBuildItem.java new file mode 100644 index 0000000000000..819d64e351212 --- /dev/null +++ b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/IgnoredServletContainerInitializerBuildItem.java @@ -0,0 +1,16 @@ +package io.quarkus.undertow.deployment; + +import io.quarkus.builder.item.MultiBuildItem; + +public final class IgnoredServletContainerInitializerBuildItem extends MultiBuildItem { + + final String sciClass; + + public IgnoredServletContainerInitializerBuildItem(String sciClass) { + this.sciClass = sciClass; + } + + public String getSciClass() { + return sciClass; + } +} diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java index b1021f2790b43..c0fa7fbf2093e 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/util/MediaTypeHelper.java @@ -241,10 +241,6 @@ public static boolean isTextLike(MediaType mediaType) { && mediaType.getSubtype().toLowerCase().startsWith("xml")); } - public static boolean isBlacklisted(MediaType mediaType) { - return "application".equals(mediaType.getType()) && "signed-exchange".equals(mediaType.getSubtype()); - } - public static boolean isUnsupportedWildcardSubtype(MediaType mediaType) { if (mediaType.isWildcardSubtype()) { return !mediaType.isWildcardType() && !"application".equals(mediaType.getType());