diff --git a/examples/providers/domain-extension/pom.xml b/examples/providers/domain-extension/pom.xml index dd513889948..f8da91f3417 100755 --- a/examples/providers/domain-extension/pom.xml +++ b/examples/providers/domain-extension/pom.xml @@ -60,6 +60,11 @@ jakarta.ws.rs jakarta.ws.rs-api + + io.quarkus.resteasy.reactive + resteasy-reactive-common + provided + diff --git a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java index ad47e418380..1ef47bf7500 100644 --- a/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java +++ b/examples/providers/domain-extension/src/main/java/org/keycloak/examples/domainextension/rest/CompanyResource.java @@ -1,6 +1,6 @@ package org.keycloak.examples.domainextension.rest; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.examples.domainextension.CompanyRepresentation; import org.keycloak.examples.domainextension.spi.ExampleService; import org.keycloak.models.KeycloakSession; @@ -48,4 +48,4 @@ public class CompanyResource { return session.getProvider(ExampleService.class).findCompany(id); } -} \ No newline at end of file +} diff --git a/federation/ldap/pom.xml b/federation/ldap/pom.xml index aa7568fcc45..702d5bfa242 100755 --- a/federation/ldap/pom.xml +++ b/federation/ldap/pom.xml @@ -66,6 +66,11 @@ resteasy-core provided + + io.quarkus.resteasy.reactive + resteasy-reactive-common + provided + org.jboss.logging jboss-logging diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java index b2f86aa082b..caadac66e1c 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/LdapServerCapabilitiesResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.services.resources.admin; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java index a14cb7be347..3dcbe238185 100644 --- a/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java +++ b/federation/ldap/src/main/java/org/keycloak/services/resources/admin/TestLdapConnectionResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.models.KeycloakSession; import org.keycloak.models.LDAPConstants; diff --git a/model/legacy-services/pom.xml b/model/legacy-services/pom.xml index b6332e1f13d..2190e262953 100644 --- a/model/legacy-services/pom.xml +++ b/model/legacy-services/pom.xml @@ -47,6 +47,10 @@ org.jboss.resteasy resteasy-core + + io.quarkus.resteasy.reactive + resteasy-reactive-common + - \ No newline at end of file + diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java index 9a1207002c9..32ca64b524f 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/ClientStorageProviderResource.java @@ -16,7 +16,7 @@ */ package org.keycloak.services.resources.admin; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentModel; diff --git a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java index aa47bb26f0f..494e4e07e7e 100644 --- a/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java +++ b/model/legacy-services/src/main/java/org/keycloak/services/resources/admin/UserStorageProviderResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources.admin; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentModel; diff --git a/rest/admin-ui-ext/pom.xml b/rest/admin-ui-ext/pom.xml index b4f0a7e714b..caac25c8331 100644 --- a/rest/admin-ui-ext/pom.xml +++ b/rest/admin-ui-ext/pom.xml @@ -46,6 +46,10 @@ org.eclipse.microprofile.openapi microprofile-openapi-api + + io.quarkus.resteasy.reactive + resteasy-reactive-common + diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java index 7f2c680c1ec..991421bd93f 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UIRealmsResource.java @@ -14,7 +14,7 @@ import org.eclipse.microprofile.openapi.annotations.enums.SchemaType; import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.services.ForbiddenException; diff --git a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UserResource.java b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UserResource.java index 61b6ffe4d5a..fb163bff277 100644 --- a/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UserResource.java +++ b/rest/admin-ui-ext/src/main/java/org/keycloak/admin/ui/rest/UserResource.java @@ -15,7 +15,7 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserModel; diff --git a/services/pom.xml b/services/pom.xml index 3e56fca2a82..9fd2dd26126 100755 --- a/services/pom.xml +++ b/services/pom.xml @@ -98,6 +98,11 @@ resteasy-core provided + + io.quarkus.resteasy.reactive + resteasy-reactive-common + provided + org.apache.httpcomponents httpclient diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java index d05c2de1e3a..11a8d2b376f 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyResourceService.java @@ -30,7 +30,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.ResourceServer; diff --git a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java index 6534c14cdcc..b01f0a8ac01 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/PolicyService.java @@ -41,7 +41,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java index 1d3228f7cc8..6ab0108faae 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ResourceSetService.java @@ -51,7 +51,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; diff --git a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java index 192fb58e040..6dd14e5ac2a 100644 --- a/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java +++ b/services/src/main/java/org/keycloak/authorization/admin/ScopeService.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Content; import org.eclipse.microprofile.openapi.annotations.media.Schema; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.responses.APIResponses; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.model.Policy; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java index b47856b0998..0baf38f9009 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/policy/UserManagedPermissionService.java @@ -32,7 +32,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.AuthorizationProvider; import org.keycloak.authorization.admin.PermissionService; diff --git a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java index f46bf3bf23d..a0eaee91bdb 100644 --- a/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java +++ b/services/src/main/java/org/keycloak/authorization/protection/resource/ResourceService.java @@ -31,7 +31,7 @@ import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.Response.Status; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.admin.ResourceSetService; import org.keycloak.authorization.identity.Identity; import org.keycloak.authorization.model.Resource; diff --git a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java index bf1b4994310..5abacdc8ce3 100755 --- a/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java +++ b/services/src/main/java/org/keycloak/broker/saml/SAMLEndpoint.java @@ -18,7 +18,7 @@ package org.keycloak.broker.saml; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.broker.provider.BrokeredIdentityContext; import org.keycloak.broker.provider.IdentityBrokerException; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java index 016928f43fc..9ba75dab055 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/OIDCLoginProtocolService.java @@ -21,7 +21,7 @@ import java.security.cert.X509Certificate; import java.util.Collections; import java.util.List; import java.util.Optional; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuthErrorException; import org.keycloak.common.ClientConnection; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java index affea61c5ca..02d7f7e9387 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/LogoutEndpoint.java @@ -22,7 +22,7 @@ import static org.keycloak.models.UserSessionModel.State.LOGGING_OUT; import static org.keycloak.services.resources.LoginActionsService.SESSION_CODE; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.Config; import org.keycloak.OAuth2Constants; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java index 8af3e13e8ed..c5e59bc0d1e 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/TokenIntrospectionEndpoint.java @@ -16,7 +16,7 @@ */ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.common.ClientConnection; import org.keycloak.events.Errors; @@ -161,4 +161,4 @@ public class TokenIntrospectionEndpoint { this.event.detail("detail", detail).error(error); return new ErrorResponseException(error, detail, status); } -} \ No newline at end of file +} diff --git a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java index 16706c7640d..37453606947 100755 --- a/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/endpoints/UserInfoEndpoint.java @@ -16,7 +16,7 @@ */ package org.keycloak.protocol.oidc.endpoints; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuth2Constants; import org.keycloak.TokenCategory; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java index a2bb0b41de7..069052dc147 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationCallbackEndpoint.java @@ -17,7 +17,7 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuthErrorException; import org.keycloak.TokenVerifier; diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java index 0312ef61f6b..a2b80c520b1 100644 --- a/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java +++ b/services/src/main/java/org/keycloak/protocol/oidc/grants/ciba/endpoints/BackchannelAuthenticationEndpoint.java @@ -18,7 +18,7 @@ package org.keycloak.protocol.oidc.grants.ciba.endpoints; import com.fasterxml.jackson.databind.node.ObjectNode; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuth2Constants; import org.keycloak.OAuthErrorException; diff --git a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java index 8a8f031b1fb..3d87c5e89e8 100755 --- a/services/src/main/java/org/keycloak/protocol/saml/SamlService.java +++ b/services/src/main/java/org/keycloak/protocol/saml/SamlService.java @@ -22,7 +22,7 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.util.EntityUtils; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.broker.saml.SAMLDataMarshaller; import org.keycloak.common.ClientConnection; import org.keycloak.common.VerificationException; diff --git a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java index 9bd8d334de5..5cd8f296f60 100755 --- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java +++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuthErrorException; import org.keycloak.authentication.AuthenticationProcessor; diff --git a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java index ebe1e97f986..dc0e5c8e745 100755 --- a/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java +++ b/services/src/main/java/org/keycloak/services/resources/PublicRealmResource.java @@ -17,7 +17,7 @@ package org.keycloak.services.resources; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.common.util.PemUtils; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java index 7a18e790f3a..3545cf38c17 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountConsole.java @@ -17,7 +17,7 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authentication.requiredactions.DeleteAccount; import org.keycloak.common.Profile; import org.keycloak.common.Version; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java index a923b6ef0ef..878687730b8 100644 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountCredentialResource.java @@ -1,7 +1,7 @@ package org.keycloak.services.resources.account; import com.fasterxml.jackson.annotation.JsonIgnore; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authentication.Authenticator; import org.keycloak.authentication.AuthenticatorFactory; import org.keycloak.common.util.reflections.Types; diff --git a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java index f3a38985e79..eb7e3a0d5c3 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java +++ b/services/src/main/java/org/keycloak/services/resources/account/AccountRestService.java @@ -45,7 +45,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; diff --git a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java index 540f8cd0bb0..ccf7be813b9 100755 --- a/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/account/SessionResource.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.device.DeviceActivityManager; import org.keycloak.models.AccountRoles; import org.keycloak.models.ClientModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java index 66d397524fa..fc8ed5650df 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AdminConsole.java @@ -18,7 +18,7 @@ package org.keycloak.services.resources.admin; import com.fasterxml.jackson.annotation.JsonProperty; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import jakarta.ws.rs.NotFoundException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java index 691f005d40c..a7dac1d69bb 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AttackDetectionResource.java @@ -20,7 +20,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.common.util.Time; import org.keycloak.events.admin.OperationType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java index 7ddaead88a6..4fadf645711 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/AuthenticationManagementResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.NotFoundException; import org.keycloak.authentication.AuthenticationFlow; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java index b660ee4cfaa..118a375f807 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientAttributeCertificateResource.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotAcceptableException; import jakarta.ws.rs.NotFoundException; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java index b6de1d0a9bc..45256b0e8e0 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientPoliciesResource.java @@ -29,7 +29,7 @@ import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java index 2189d804cda..58f2ccb4dfc 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientProfilesResource.java @@ -30,7 +30,7 @@ import jakarta.ws.rs.core.Response; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.http.HttpResponse; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java index 365238bd049..86693805d38 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRegistrationPolicyResource.java @@ -20,7 +20,7 @@ package org.keycloak.services.resources.admin; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java index e1781b23ad9..037d6a45bcd 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientResource.java @@ -23,7 +23,7 @@ import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import jakarta.ws.rs.core.Response.Status; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.jboss.resteasy.spi.BadRequestException; import org.keycloak.OAuthErrorException; import org.keycloak.authorization.admin.AuthorizationService; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java index 446282862ff..899224a726a 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientRoleMappingsResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.services.resources.KeycloakOpenAPI; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java index 42aa623102a..75ef33493cf 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateResource.java @@ -39,7 +39,7 @@ import jakarta.ws.rs.core.UriInfo; import com.fasterxml.jackson.annotation.JsonProperty; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java index f0e572a2b66..4a9e0c6dccf 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeEvaluateScopeMappingsResource.java @@ -30,7 +30,7 @@ import jakarta.ws.rs.core.MediaType; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.ClientModel; import org.keycloak.models.ClientScopeModel; import org.keycloak.models.RoleContainerModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java index 927e43f8126..ee105ebcd45 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopeResource.java @@ -20,7 +20,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.Profile; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java index fb0ec5b3648..eff2e1d6bf3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientScopesResource.java @@ -20,7 +20,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; import org.keycloak.models.ClientScopeModel; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java index f4fb0293150..19dd19216f1 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ClientsResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authorization.admin.AuthorizationService; import org.keycloak.common.Profile; import org.keycloak.events.Errors; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java index 0a5b2e81b61..3d0c4118300 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ComponentResource.java @@ -20,7 +20,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; import org.keycloak.component.ComponentFactory; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java index f0e7a985d15..576f3ee2f82 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupResource.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java index 4388d6e5a03..241c9679ed8 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/GroupsResource.java @@ -35,7 +35,7 @@ import java.util.stream.Stream; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.util.ObjectUtil; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java index 6799e90bd38..36a00c10204 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProviderResource.java @@ -23,7 +23,7 @@ import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java index 4b5640afb7d..8d962a86a8b 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/IdentityProvidersResource.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProvider; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java index 61460ffa84d..802f33033b1 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/KeyResource.java @@ -20,7 +20,7 @@ package org.keycloak.services.resources.admin; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.util.PemUtils; import org.keycloak.crypto.KeyWrapper; import org.keycloak.models.KeycloakSession; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java index a1346e87271..1f01a303aee 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ProtocolMappersResource.java @@ -24,7 +24,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java index 1b1623e1776..13de1d34b4c 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java @@ -57,7 +57,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.Config; import org.keycloak.KeyPairVerifier; import org.keycloak.authentication.CredentialRegistrator; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java index c1fcd59ad49..7f697b9ab7e 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RealmsAdminResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java index 9b90e9de565..63e4c6a3955 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleByIdResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java index 914dacd3562..c161f2b92e3 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleContainerResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java index 41dd82784ea..338169046ee 100644 --- a/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/RoleMapperResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.common.ClientConnection; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java index ad302ebd0a4..7c01b71b221 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedClientResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java index 6dae6249929..b319a5fd73d 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/ScopeMappedResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import jakarta.ws.rs.NotFoundException; import org.keycloak.events.admin.OperationType; import org.keycloak.events.admin.ResourceType; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java index 70e1479aee2..edf7053db6d 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UserResource.java @@ -22,7 +22,7 @@ import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.responses.APIResponse; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.authentication.RequiredActionProvider; import org.keycloak.authentication.actiontoken.execactions.ExecuteActionsActionToken; import org.keycloak.authentication.requiredactions.util.RequiredActionsValidator; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java index e66bdabda68..8ae54e7f0b2 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/UsersResource.java @@ -21,7 +21,7 @@ import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.parameters.Parameter; import org.eclipse.microprofile.openapi.annotations.tags.Tag; import org.jboss.logging.Logger; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.ClientConnection; import org.keycloak.common.Profile; import org.keycloak.common.util.ObjectUtil; diff --git a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java index 1b526636e0b..7bdc4ec7222 100755 --- a/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java +++ b/services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java @@ -20,7 +20,7 @@ package org.keycloak.services.resources.admin.info; import org.eclipse.microprofile.openapi.annotations.Operation; import org.eclipse.microprofile.openapi.annotations.extensions.Extension; import org.eclipse.microprofile.openapi.annotations.tags.Tag; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.broker.provider.IdentityProvider; import org.keycloak.broker.provider.IdentityProviderFactory; import org.keycloak.broker.social.SocialIdentityProvider; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java index 0ea21613c67..6b74e28f158 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/domainextension/rest/CompanyResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.domainextension.rest; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.models.KeycloakSession; import org.keycloak.testsuite.domainextension.CompanyRepresentation; import org.keycloak.testsuite.domainextension.spi.ExampleService; @@ -73,4 +73,4 @@ public class CompanyResource { return session.getProvider(ExampleService.class).findCompany(id); } -} \ No newline at end of file +} diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java index 1b89b08026d..5fc050ca364 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestApplicationResourceProvider.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.rest; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.OAuth2Constants; import org.keycloak.common.util.HtmlUtils; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java index aae5beff53e..74d2c53d46b 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/TestingResourceProvider.java @@ -17,7 +17,10 @@ package org.keycloak.testsuite.rest; -import org.jboss.resteasy.annotations.cache.NoCache; +import static java.util.Objects.requireNonNull; + +import jakarta.ws.rs.core.CacheControl; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.http.HttpRequest; import org.keycloak.Config; import org.keycloak.common.Profile; @@ -63,6 +66,7 @@ import org.keycloak.services.ErrorResponse; import org.keycloak.services.managers.AuthenticationManager; import org.keycloak.services.resource.RealmResourceProvider; import org.keycloak.services.scheduled.ClearExpiredUserSessions; +import org.keycloak.services.util.CacheControlUtil; import org.keycloak.services.util.CookieHelper; import org.keycloak.sessions.RootAuthenticationSessionModel; import org.keycloak.storage.UserStorageProvider; @@ -1144,5 +1148,17 @@ public class TestingResourceProvider implements RealmResourceProvider { return rootAuthSession.getAuthenticationSessions().size(); } + @GET + @Path("/no-cache-annotated-endpoint") + @Produces(MediaType.APPLICATION_JSON) + @NoCache + public Response getNoCacheAnnotatedEndpointResponse(@QueryParam("programmatic_max_age_value") Integer programmaticMaxAgeValue) { + requireNonNull(programmaticMaxAgeValue); + + CacheControl cacheControl = new CacheControl(); + cacheControl.setMaxAge(programmaticMaxAgeValue); + + return Response.noContent().cacheControl(cacheControl).build(); + } } diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java index 15d80458c4b..92336316aab 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/rest/resource/TestingOIDCEndpointsApplicationResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.rest.resource; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import javax.crypto.SecretKey; import javax.crypto.spec.SecretKeySpec; diff --git a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java index 003a2123c15..cf42f89ce43 100644 --- a/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java +++ b/testsuite/integration-arquillian/servers/auth-server/services/testsuite-providers/src/main/java/org/keycloak/testsuite/theme/CustomAccountResourceProviderFactory.java @@ -4,7 +4,7 @@ import jakarta.ws.rs.GET; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.Config.Scope; import org.keycloak.models.KeycloakSession; import org.keycloak.models.KeycloakSessionFactory; diff --git a/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml b/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml index 73d893fc425..e6bb20846a9 100755 --- a/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml +++ b/testsuite/integration-arquillian/test-apps/cors/database-service/pom.xml @@ -37,6 +37,11 @@ resteasy-core provided + + io.quarkus.resteasy.reactive + resteasy-reactive-common + provided + org.jboss.spec.javax.servlet jboss-servlet-api_3.0_spec diff --git a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java index ddc22a04fa1..52d12bfc1e9 100755 --- a/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java +++ b/testsuite/integration-arquillian/test-apps/cors/database-service/src/main/java/org/keycloak/example/oauth/ProductService.java @@ -17,7 +17,7 @@ package org.keycloak.example.oauth; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.GET; diff --git a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml b/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml index 4feb6291901..ff0e3f1d8c4 100644 --- a/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlets-jakarta/pom.xml @@ -58,6 +58,10 @@ org.jboss.resteasy resteasy-core + + io.quarkus.resteasy.reactive + resteasy-reactive-common + org.apache.httpcomponents httpclient @@ -131,4 +135,4 @@ - \ No newline at end of file + diff --git a/testsuite/integration-arquillian/test-apps/servlets/pom.xml b/testsuite/integration-arquillian/test-apps/servlets/pom.xml index 0c028efd87f..88e482771d6 100644 --- a/testsuite/integration-arquillian/test-apps/servlets/pom.xml +++ b/testsuite/integration-arquillian/test-apps/servlets/pom.xml @@ -53,6 +53,10 @@ org.jboss.resteasy resteasy-core + + io.quarkus.resteasy.reactive + resteasy-reactive-common + org.apache.httpcomponents httpclient diff --git a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java index b533cd1a825..c3f2f3b715c 100755 --- a/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java +++ b/testsuite/integration-arquillian/test-apps/servlets/src/main/java/org/keycloak/testsuite/adapter/servlet/SendUsernameServlet.java @@ -18,7 +18,7 @@ package org.keycloak.testsuite.adapter.servlet; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.adapters.saml.SamlAuthenticationError; import org.keycloak.adapters.saml.SamlPrincipal; import org.keycloak.adapters.saml.SamlSession; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java index 8a621de2157..8a6d1f1a5a4 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestOIDCEndpointsApplicationResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.client.resources; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.jose.jwk.JSONWebKeySet; import org.keycloak.protocol.oidc.grants.ciba.endpoints.ClientNotificationEndpointRequest; import org.keycloak.services.clientpolicy.executor.IntentClientBindCheckExecutor; diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java index 8feccaf7420..bbbe8cfdfab 100644 --- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java +++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/client/resources/TestingResource.java @@ -17,7 +17,7 @@ package org.keycloak.testsuite.client.resources; -import org.jboss.resteasy.annotations.cache.NoCache; +import org.jboss.resteasy.reactive.NoCache; import org.keycloak.common.Profile; import org.keycloak.common.enums.HostnameVerificationPolicy; import org.keycloak.representations.idm.AdminEventRepresentation; @@ -447,4 +447,7 @@ public interface TestingResource { @NoCache Integer getAuthenticationSessionTabsCount(@QueryParam("realm") String realm, @QueryParam("authSessionId") String authSessionId); + @GET + @Path("/no-cache-annotated-endpoint") + Response getNoCacheAnnotatedEndpointResponse(@QueryParam("programmatic_max_age_value") Long programmaticMaxAgeValue); } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java new file mode 100644 index 00000000000..d1c89dad40a --- /dev/null +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/util/NoCacheAnnotationTest.java @@ -0,0 +1,43 @@ +/* + * Copyright 2023 Red Hat, Inc. and/or its affiliates + * and other contributors as indicated by the @author tags. + * + * 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 + * + * http://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 org.keycloak.testsuite.util; + +import jakarta.ws.rs.core.Response; +import java.util.List; +import org.junit.Assert; +import org.junit.Test; +import org.keycloak.representations.idm.RealmRepresentation; +import org.keycloak.testsuite.AbstractKeycloakTest; +import org.keycloak.testsuite.arquillian.annotation.AuthServerContainerExclude; + +/** + * @author Réda Housni Alaoui + */ +@AuthServerContainerExclude(value = AuthServerContainerExclude.AuthServer.UNDERTOW, details = "org.jboss.resteasy.reactive.NoCache is only supported by Quarkus") +public class NoCacheAnnotationTest extends AbstractKeycloakTest { + @Override + public void addTestRealms(List testRealms) { + // Do nothing + } + + @Test + public void noCacheAnnotationOverridesProgrammaticCacheControlBehaviour() { + Response response = getTestingClient().testing().getNoCacheAnnotatedEndpointResponse(2000L); + Assert.assertEquals(204, response.getStatus()); + Assert.assertEquals("no-cache", response.getHeaderString("cache-control")); + } +}