Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke committed 2015-11-12 11:31:55 -05:00
commit 0d20e3c7ff
35 files changed
+1141 -253

No files matched your search

@@ -3,15 +3,15 @@ package org.keycloak.provider;
import java.util.Map;
/**
* Marker interface for ProviderFactory of Provider which wants to show some info on "Server Info" page in Admin console.
* Marker interface for {@link ProviderFactory} of Provider which wants to show some info on "Server Info" page in Admin console.
*
* @author Vlastimil Elias (velias at redhat dot com)
*/
public interface ServerInfoAwareProviderFactory<T extends Provider> extends ProviderFactory<T> {
public interface ServerInfoAwareProviderFactory {
/**
* Get operational info about given provider. This info contains informations about providers configuration and operational conditions (eg. errors in connection to remote systems etc) which is
* shown on "Server Info" page.
* Return actual info about the provider. This info contains informations about providers configuration and operational conditions (eg. errors in connection to remote systems etc) which is
* shown on "Server Info" page then.
*
* @return Map with keys describing value and relevant values itself
*/