diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java index 8acaf858d4..756247e3d5 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java @@ -43,7 +43,7 @@ public interface ClientAttributeCertificateResource { @GET @NoCache @Produces(MediaType.APPLICATION_JSON) - public CertificateRepresentation getKeyInfo(); + CertificateRepresentation getKeyInfo(); /** * Generate a new certificate with new key pair @@ -54,7 +54,7 @@ public interface ClientAttributeCertificateResource { @NoCache @Path("generate") @Produces(MediaType.APPLICATION_JSON) - public CertificateRepresentation generate(); + CertificateRepresentation generate(); /** * Upload certificate and eventually private key @@ -66,7 +66,7 @@ public interface ClientAttributeCertificateResource { @Path("upload") @Consumes(MediaType.MULTIPART_FORM_DATA) @Produces(MediaType.APPLICATION_JSON) - public CertificateRepresentation uploadJks(MultipartFormDataOutput output); + CertificateRepresentation uploadJks(MultipartFormDataOutput output); /** * Upload only certificate, not private key @@ -78,7 +78,7 @@ public interface ClientAttributeCertificateResource { @Path("upload-certificate") @Consumes(MediaType.MULTIPART_FORM_DATA) @Produces(MediaType.APPLICATION_JSON) - public CertificateRepresentation uploadJksCertificate(MultipartFormDataOutput output); + CertificateRepresentation uploadJksCertificate(MultipartFormDataOutput output); /** * Get a keystore file for the client, containing private key and public certificate @@ -91,7 +91,7 @@ public interface ClientAttributeCertificateResource { @Path("/download") @Produces(MediaType.APPLICATION_OCTET_STREAM) @Consumes(MediaType.APPLICATION_JSON) - public byte[] getKeystore(final KeyStoreConfig config); + byte[] getKeystore(final KeyStoreConfig config); /** * Generate a new keypair and certificate, and get the private key file @@ -107,5 +107,5 @@ public interface ClientAttributeCertificateResource { @Path("/generate-and-download") @Produces(MediaType.APPLICATION_OCTET_STREAM) @Consumes(MediaType.APPLICATION_JSON) - public byte[] generateAndGetKeystore(final KeyStoreConfig config); + byte[] generateAndGetKeystore(final KeyStoreConfig config); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java index 3ad9ac94cc..dfb31c8180 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientResource.java @@ -70,28 +70,28 @@ public interface ClientResource { ManagementPermissionReference getPermissions(); @Path("protocol-mappers") - public ProtocolMappersResource getProtocolMappers(); + ProtocolMappersResource getProtocolMappers(); @GET @Produces(MediaType.APPLICATION_JSON) - public ClientRepresentation toRepresentation(); + ClientRepresentation toRepresentation(); @PUT @Consumes(MediaType.APPLICATION_JSON) - public void update(ClientRepresentation clientRepresentation); + void update(ClientRepresentation clientRepresentation); @DELETE - public void remove(); + void remove(); @POST @Path("client-secret") @Produces(MediaType.APPLICATION_JSON) - public CredentialRepresentation generateNewSecret(); + CredentialRepresentation generateNewSecret(); @GET @Path("client-secret") @Produces(MediaType.APPLICATION_JSON) - public CredentialRepresentation getSecret(); + CredentialRepresentation getSecret(); /** * Generate a new registration access token for the client @@ -102,7 +102,7 @@ public interface ClientResource { @POST @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) - public ClientRepresentation regenerateRegistrationAccessToken(); + ClientRepresentation regenerateRegistrationAccessToken(); /** * Get representation of certificate resource @@ -111,22 +111,22 @@ public interface ClientResource { * @return */ @Path("certificates/{attr}") - public ClientAttributeCertificateResource getCertficateResource(@PathParam("attr") String attributePrefix); + ClientAttributeCertificateResource getCertficateResource(@PathParam("attr") String attributePrefix); @GET @NoCache @Path("installation/providers/{providerId}") - public String getInstallationProvider(@PathParam("providerId") String providerId); + String getInstallationProvider(@PathParam("providerId") String providerId); @Path("session-count") @GET @Produces(MediaType.APPLICATION_JSON) - public Map getApplicationSessionCount(); + Map getApplicationSessionCount(); @Path("user-sessions") @GET @Produces(MediaType.APPLICATION_JSON) - public List getUserSessions(@QueryParam("first") Integer firstResult, @QueryParam("max") Integer maxResults); + List getUserSessions(@QueryParam("first") Integer firstResult, @QueryParam("max") Integer maxResults); @Path("offline-session-count") @GET @@ -144,10 +144,10 @@ public interface ClientResource { void pushRevocation(); @Path("/scope-mappings") - public RoleMappingResource getScopeMappings(); + RoleMappingResource getScopeMappings(); @Path("/roles") - public RolesResource roles(); + RolesResource roles(); /** * Get default client scopes. Only name and ids are returned. diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java index 22be321996..11fbf5e73f 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientScopeResource.java @@ -33,21 +33,21 @@ import javax.ws.rs.core.MediaType; public interface ClientScopeResource { @Path("protocol-mappers") - public ProtocolMappersResource getProtocolMappers(); + ProtocolMappersResource getProtocolMappers(); @Path("/scope-mappings") - public RoleMappingResource getScopeMappings(); + RoleMappingResource getScopeMappings(); @GET @Produces(MediaType.APPLICATION_JSON) - public ClientScopeRepresentation toRepresentation(); + ClientScopeRepresentation toRepresentation(); @PUT @Consumes(MediaType.APPLICATION_JSON) - public void update(ClientScopeRepresentation rep); + void update(ClientScopeRepresentation rep); @DELETE - public void remove(); + void remove(); } \ No newline at end of file diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java index 3c8552efe1..ce30a75e62 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientsResource.java @@ -36,23 +36,23 @@ import java.util.List; public interface ClientsResource { @Path("{id}") - public ClientResource get(@PathParam("id") String id); + ClientResource get(@PathParam("id") String id); @POST @Consumes(MediaType.APPLICATION_JSON) - public Response create(ClientRepresentation clientRepresentation); + Response create(ClientRepresentation clientRepresentation); @GET @Produces(MediaType.APPLICATION_JSON) - public List findAll(); + List findAll(); @GET @Produces(MediaType.APPLICATION_JSON) - public List findAll(@QueryParam("viewableOnly") boolean viewableOnly); + List findAll(@QueryParam("viewableOnly") boolean viewableOnly); @GET @Produces(MediaType.APPLICATION_JSON) - public List findByClientId(@QueryParam("clientId") String clientId); + List findByClientId(@QueryParam("clientId") String clientId); diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java index efc9f2b6c9..e4a5bc3265 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentResource.java @@ -30,12 +30,12 @@ import javax.ws.rs.core.MediaType; */ public interface ComponentResource { @GET - public ComponentRepresentation toRepresentation(); + ComponentRepresentation toRepresentation(); @PUT @Consumes(MediaType.APPLICATION_JSON) - public void update(ComponentRepresentation rep); + void update(ComponentRepresentation rep); @DELETE - public void remove(); + void remove(); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java index 90b9d40319..6f0b973541 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ComponentsResource.java @@ -36,21 +36,21 @@ import java.util.List; public interface ComponentsResource { @GET @Produces(MediaType.APPLICATION_JSON) - public List query(); + List query(); @GET @Produces(MediaType.APPLICATION_JSON) - public List query(@QueryParam("parent") String parent); + List query(@QueryParam("parent") String parent); @GET @Produces(MediaType.APPLICATION_JSON) - public List query(@QueryParam("parent") String parent, @QueryParam("type") String type); + List query(@QueryParam("parent") String parent, @QueryParam("type") String type); @GET @Produces(MediaType.APPLICATION_JSON) - public List query(@QueryParam("parent") String parent, - @QueryParam("type") String type, - @QueryParam("name") String name); + List query(@QueryParam("parent") String parent, + @QueryParam("type") String type, + @QueryParam("name") String name); @POST @Consumes(MediaType.APPLICATION_JSON) diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java index ea0dbb9527..0a833efad6 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/GroupResource.java @@ -73,7 +73,7 @@ public interface GroupResource { @GET @NoCache @Produces(MediaType.APPLICATION_JSON) - public GroupRepresentation toRepresentation(); + GroupRepresentation toRepresentation(); /** * Update group @@ -82,10 +82,10 @@ public interface GroupResource { */ @PUT @Consumes(MediaType.APPLICATION_JSON) - public void update(GroupRepresentation rep); + void update(GroupRepresentation rep); @DELETE - public void remove(); + void remove(); /** @@ -99,11 +99,11 @@ public interface GroupResource { @NoCache @Produces(MediaType.APPLICATION_JSON) @Consumes(MediaType.APPLICATION_JSON) - public Response subGroup(GroupRepresentation rep); + Response subGroup(GroupRepresentation rep); @Path("role-mappings") - public RoleMappingResource roles(); + RoleMappingResource roles(); /** * Get users @@ -116,7 +116,7 @@ public interface GroupResource { @NoCache @Path("/members") @Produces(MediaType.APPLICATION_JSON) - public List members(); + List members(); /** * Get users @@ -131,8 +131,8 @@ public interface GroupResource { @NoCache @Path("/members") @Produces(MediaType.APPLICATION_JSON) - public List members(@QueryParam("first") Integer firstResult, - @QueryParam("max") Integer maxResults); + List members(@QueryParam("first") Integer firstResult, + @QueryParam("max") Integer maxResults); /** * Get users @@ -150,7 +150,7 @@ public interface GroupResource { @NoCache @Path("/members") @Produces(MediaType.APPLICATION_JSON) - public List members(@QueryParam("first") Integer firstResult, - @QueryParam("max") Integer maxResults, - @QueryParam("briefRepresentation") Boolean briefRepresentation); + List members(@QueryParam("first") Integer firstResult, + @QueryParam("max") Integer maxResults, + @QueryParam("briefRepresentation") Boolean briefRepresentation); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java index db53bc4b4e..d7dd1419e0 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ProtocolMappersResource.java @@ -38,34 +38,34 @@ public interface ProtocolMappersResource { @GET @Path("protocol/{protocol}") @Produces("application/json") - public List getMappersPerProtocol(@PathParam("protocol") String protocol); + List getMappersPerProtocol(@PathParam("protocol") String protocol); @Path("models") @POST @Consumes("application/json") - public Response createMapper(ProtocolMapperRepresentation rep); + Response createMapper(ProtocolMapperRepresentation rep); @Path("add-models") @POST @Consumes("application/json") - public void createMapper(List reps); + void createMapper(List reps); @GET @Path("models") @Produces("application/json") - public List getMappers(); + List getMappers(); @GET @Path("models/{id}") @Produces("application/json") - public ProtocolMapperRepresentation getMapperById(@PathParam("id") String id); + ProtocolMapperRepresentation getMapperById(@PathParam("id") String id); @PUT @Path("models/{id}") @Consumes("application/json") - public void update(@PathParam("id") String id, ProtocolMapperRepresentation rep); + void update(@PathParam("id") String id, ProtocolMapperRepresentation rep); @DELETE @Path("models/{id}") - public void delete(@PathParam("id") String id); + void delete(@PathParam("id") String id); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java index 0833011823..387ad417ff 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmResource.java @@ -120,7 +120,7 @@ public interface RealmResource { @GET @NoCache @Produces(MediaType.APPLICATION_JSON) - public List getEvents(@QueryParam("type") List types, @QueryParam("client") String client, + List getEvents(@QueryParam("type") List types, @QueryParam("client") String client, @QueryParam("user") String user, @QueryParam("dateFrom") String dateFrom, @QueryParam("dateTo") String dateTo, @QueryParam("ipAddress") String ipAddress, @QueryParam("first") Integer firstResult, @QueryParam("max") Integer maxResults); @@ -146,31 +146,31 @@ public interface RealmResource { @GET @Path("events/config") @Produces(MediaType.APPLICATION_JSON) - public RealmEventsConfigRepresentation getRealmEventsConfig(); + RealmEventsConfigRepresentation getRealmEventsConfig(); @PUT @Path("events/config") @Consumes(MediaType.APPLICATION_JSON) - public void updateRealmEventsConfig(RealmEventsConfigRepresentation rep); + void updateRealmEventsConfig(RealmEventsConfigRepresentation rep); @GET @Path("group-by-path/{path: .*}") @NoCache @Produces(MediaType.APPLICATION_JSON) - public GroupRepresentation getGroupByPath(@PathParam("path") String path); + GroupRepresentation getGroupByPath(@PathParam("path") String path); @GET @Produces(MediaType.APPLICATION_JSON) @Path("default-groups") - public List getDefaultGroups(); + List getDefaultGroups(); @PUT @Path("default-groups/{groupId}") - public void addDefaultGroup(@PathParam("groupId") String groupId); + void addDefaultGroup(@PathParam("groupId") String groupId); @DELETE @Path("default-groups/{groupId}") - public void removeDefaultGroup(@PathParam("groupId") String groupId); + void removeDefaultGroup(@PathParam("groupId") String groupId); @Path("identity-provider") IdentityProvidersResource identityProviders(); diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java index be207bcb3a..d20be9f8cc 100644 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RealmsResource.java @@ -36,14 +36,14 @@ import java.util.List; public interface RealmsResource { @Path("/{realm}") - public RealmResource realm(@PathParam("realm") String realm); + RealmResource realm(@PathParam("realm") String realm); @POST @Consumes(MediaType.APPLICATION_JSON) - public void create(RealmRepresentation realmRepresentation); + void create(RealmRepresentation realmRepresentation); @GET @Produces(MediaType.APPLICATION_JSON) - public List findAll(); + List findAll(); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java index bed37e6f62..bb68f21938 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleMappingResource.java @@ -34,12 +34,12 @@ import javax.ws.rs.core.MediaType; public interface RoleMappingResource { @GET - public MappingsRepresentation getAll(); + MappingsRepresentation getAll(); @Path("realm") - public RoleScopeResource realmLevel(); + RoleScopeResource realmLevel(); @Path("clients/{clientUUID}") - public RoleScopeResource clientLevel(@PathParam("clientUUID") String clientUUID); + RoleScopeResource clientLevel(@PathParam("clientUUID") String clientUUID); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java index c55b0abffa..f068d66fd5 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/RoleScopeResource.java @@ -36,20 +36,20 @@ import java.util.List; public interface RoleScopeResource { @GET - public List listAll(); + List listAll(); @GET @Path("available") - public List listAvailable(); + List listAvailable(); @GET @Path("composite") - public List listEffective(); + List listEffective(); @POST - public void add(List rolesToAdd); + void add(List rolesToAdd); @DELETE - public void remove(List rolesToRemove); + void remove(List rolesToRemove); } diff --git a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java index 8a91eb3225..bffd340bbc 100755 --- a/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java +++ b/integration/admin-client/src/main/java/org/keycloak/admin/client/resource/UserResource.java @@ -45,13 +45,13 @@ import java.util.Map; public interface UserResource { @GET - public UserRepresentation toRepresentation(); + UserRepresentation toRepresentation(); @PUT - public void update(UserRepresentation userRepresentation); + void update(UserRepresentation userRepresentation); @DELETE - public void remove(); + void remove(); @Path("groups") @GET @@ -81,7 +81,7 @@ public interface UserResource { @POST @Path("logout") - public void logout(); + void logout(); @@ -136,11 +136,11 @@ public interface UserResource { @PUT @Consumes(MediaType.APPLICATION_JSON) @Deprecated - public void disableCredentialType(List credentialTypes); + void disableCredentialType(List credentialTypes); @PUT @Path("reset-password") - public void resetPassword(CredentialRepresentation credentialRepresentation); + void resetPassword(CredentialRepresentation credentialRepresentation); /** * Use executeActionsEmail and pass in the UPDATE_PASSWORD required action @@ -149,7 +149,7 @@ public interface UserResource { @PUT @Path("reset-password-email") @Deprecated - public void resetPasswordEmail(); + void resetPasswordEmail(); /** * Use executeActionsEmail and pass in the UPDATE_PASSWORD required action @@ -158,7 +158,7 @@ public interface UserResource { @PUT @Path("reset-password-email") @Deprecated - public void resetPasswordEmail(@QueryParam("client_id") String clientId); + void resetPasswordEmail(@QueryParam("client_id") String clientId); /** * Sends an email to the user with a link within it. If they click on the link they will be asked to perform some actions @@ -169,7 +169,7 @@ public interface UserResource { */ @PUT @Path("execute-actions-email") - public void executeActionsEmail(List actions); + void executeActionsEmail(List actions); /** * Sends an email to the user with a link within it. If they click on the link they will be asked to perform some actions @@ -185,19 +185,19 @@ public interface UserResource { */ @PUT @Path("execute-actions-email") - public void executeActionsEmail(@QueryParam("client_id") String clientId, @QueryParam("redirect_uri") String redirectUri, List actions); + void executeActionsEmail(@QueryParam("client_id") String clientId, @QueryParam("redirect_uri") String redirectUri, List actions); @PUT @Path("send-verify-email") - public void sendVerifyEmail(); + void sendVerifyEmail(); @PUT @Path("send-verify-email") - public void sendVerifyEmail(@QueryParam("client_id") String clientId); + void sendVerifyEmail(@QueryParam("client_id") String clientId); @GET @Path("sessions") - public List getUserSessions(); + List getUserSessions(); @GET @Path("offline-sessions/{clientId}") @@ -205,27 +205,27 @@ public interface UserResource { @GET @Path("federated-identity") - public List getFederatedIdentity(); + List getFederatedIdentity(); @POST @Path("federated-identity/{provider}") - public Response addFederatedIdentity(@PathParam("provider") String provider, FederatedIdentityRepresentation rep); + Response addFederatedIdentity(@PathParam("provider") String provider, FederatedIdentityRepresentation rep); @Path("federated-identity/{provider}") @DELETE - public void removeFederatedIdentity(final @PathParam("provider") String provider); + void removeFederatedIdentity(final @PathParam("provider") String provider); @Path("role-mappings") - public RoleMappingResource roles(); + RoleMappingResource roles(); @GET @Path("consents") - public List> getConsents(); + List> getConsents(); @DELETE @Path("consents/{client}") - public void revokeConsent(@PathParam("client") String clientId); + void revokeConsent(@PathParam("client") String clientId); @POST @Path("impersonation")