mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-05-07 23:50:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

KEYCLOAK-2880 Refactor PermissionTest to not require Java8

Browse Source
This commit is contained in:
Stian Thorgersen
2016-05-09 07:21:05 +02:00
parent 43b51d4a30
commit d43b230b93
4 changed files with 1236 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/admin-client/src/main/java/org/keycloak/admin/client/resource/ClientAttributeCertificateResource.java
+3 -2
View File
@@ -27,6 +27,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
import org.jboss.resteasy.annotations.cache.NoCache;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
import org.keycloak.representations.KeyStoreConfig;
import org.keycloak.representations.idm.CertificateRepresentation;
@@ -67,7 +68,7 @@ public interface ClientAttributeCertificateResource {
@Path("upload")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
public CertificateRepresentation uploadJks(MultipartFormDataInput input);
public CertificateRepresentation uploadJks(MultipartFormDataOutput input);
/**
* Upload only certificate, not private key
@@ -79,7 +80,7 @@ public interface ClientAttributeCertificateResource {
@Path("upload-certificate")
@Consumes(MediaType.MULTIPART_FORM_DATA)
@Produces(MediaType.APPLICATION_JSON)
public CertificateRepresentation uploadJksCertificate(MultipartFormDataInput input);
public CertificateRepresentation uploadJksCertificate(MultipartFormDataOutput input);
/**
* Get a keystore file for the client, containing private key and public certificate