Remove * import and switch WebSocket order constant to use the priori…

…ty of the HttpSecurityRecorder's permissionCheckHandler
quarkusio · Nov 9, 2023 · 760ba55 · 760ba55
1 parent 619495d
commit 760ba55
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java b/extensions/flyway/runtime/src/main/java/io/quarkus/flyway/runtime/FlywayBuildTimeConfig.java
@@ -42,4 +42,4 @@ public FlywayDataSourceBuildTimeConfig getConfigForDataSourceName(String dataSou
      */
     @ConfigItem(name = ConfigItem.PARENT)
     public Map<String, FlywayDataSourceBuildTimeConfig> namedDataSources = Collections.emptyMap();
-}
+}
diff --git a/...ployment/src/main/java/io/quarkus/redis/deployment/client/RedisClientBuildTimeConfig.java b/...ployment/src/main/java/io/quarkus/redis/deployment/client/RedisClientBuildTimeConfig.java
@@ -5,8 +5,6 @@
 
 import io.quarkus.runtime.annotations.ConfigDocDefault;
 import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.configuration.TrimmedStringConverter;
-import io.smallrye.config.WithConverter;
 import io.smallrye.config.WithDefault;
 
 @ConfigGroup
@@ -24,7 +22,7 @@ public interface RedisClientBuildTimeConfig {
      * </ul>
      */
     @ConfigDocDefault("import.redis in DEV, TEST ; no-file otherwise")
-    Optional<@WithConverter(TrimmedStringConverter.class) List<String>> loadScript();
+    Optional<List<String>> loadScript();
 
     /**
      * When using {@code redisLoadScript}, indicates if the Redis database must be flushed (erased) before importing.

diff --git a/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/...oyment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java
@@ -63,7 +63,12 @@
 import io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLLocaleResolver;
 import io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLRecorder;
 import io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLRuntimeConfig;
-import io.quarkus.vertx.http.deployment.*;
+import io.quarkus.vertx.http.deployment.BodyHandlerBuildItem;
+import io.quarkus.vertx.http.deployment.FilterBuildItem;
+import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.NonApplicationRootPathBuildItem;
+import io.quarkus.vertx.http.deployment.RouteBuildItem;
+import io.quarkus.vertx.http.deployment.WebsocketSubProtocolsBuildItem;
 import io.quarkus.vertx.http.deployment.webjar.WebJarBuildItem;
 import io.quarkus.vertx.http.deployment.webjar.WebJarResourcesFilter;
 import io.quarkus.vertx.http.deployment.webjar.WebJarResultsBuildItem;
@@ -143,7 +148,7 @@ public class SmallRyeGraphQLProcessor {
     private static final List<String> SUPPORTED_WEBSOCKET_SUBPROTOCOLS = List.of(SUBPROTOCOL_GRAPHQL_WS,
             SUBPROTOCOL_GRAPHQL_TRANSPORT_WS);
 
-    private static final int GRAPHQL_WEBSOCKET_HANDLER_ORDER = ManagementInterfaceFilterBuildItem.AUTHORIZATION + 1;
+    private static final int GRAPHQL_WEBSOCKET_HANDLER_ORDER = (-1 * FilterBuildItem.AUTHORIZATION) + 1;
 
     private static final String GRAPHQL_MEDIA_TYPE = "application/graphql+json";
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         @ConfigItem(name = ConfigItem.PARENT)
         public Map<String, FlywayDataSourceBuildTimeConfig> namedDataSources = Collections.emptyMap();
-    }
+    }