libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #3571 from stianst/KEYCLOAK-3889

Browse source 
KEYCLOAK-3889 Add produces to server info endpoint
This commit is contained in:
Stian Thorgersen 2016-12-01 06:36:12 +01:00 committed by GitHub
commit 7c0f6f6e6e
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/src/main/java/org/keycloak/services/resources/admin/info/ServerInfoAdminResource.java
View file

@ -56,8 +56,10 @@ import org.keycloak.theme.Theme;
import org.keycloak.theme.ThemeProvider; import org.keycloak.theme.ThemeProvider;
import javax.ws.rs.GET; import javax.ws.rs.GET;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException; import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import java.io.IOException; import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@ -83,6 +85,7 @@ public class ServerInfoAdminResource {
* @return * @return
*/ */
@GET @GET
@Produces(MediaType.APPLICATION_JSON)
public ServerInfoRepresentation getInfo() { public ServerInfoRepresentation getInfo() {
ServerInfoRepresentation info = new ServerInfoRepresentation(); ServerInfoRepresentation info = new ServerInfoRepresentation();
info.setSystemInfo(SystemInfoRepresentation.create(session.getKeycloakSessionFactory().getServerStartupTimestamp())); info.setSystemInfo(SystemInfoRepresentation.create(session.getKeycloakSessionFactory().getServerStartupTimestamp()));