[KEYCLOAK-4901] - Reviewing methods on provider spis

This commit is contained in:
Pedro Igor committed 2017-10-26 13:39:57 -02:00
1 parent 9e2ab2750a
commit a70cab502c
18 files changed
+84 -64

No files matched your search

@@ -129,7 +129,7 @@ public class PolicyResourceService {
}
protected AbstractPolicyRepresentation toRepresentation(Policy policy, AuthorizationProvider authorization) {
return ModelToRepresentation.toRepresentation(policy, PolicyRepresentation.class, authorization);
return ModelToRepresentation.toRepresentation(policy, authorization, true, false);
}
@Path("/dependentPolicies")
@@ -235,7 +235,7 @@ public class PolicyService {
}
protected AbstractPolicyRepresentation toRepresentation(Policy model, AuthorizationProvider authorization) {
return ModelToRepresentation.toRepresentation(model, PolicyRepresentation.class, authorization);
return ModelToRepresentation.toRepresentation(model, authorization, true, false);
}
protected List<Object> doSearch(Integer firstResult, Integer maxResult, Map<String, String[]> filters) {
@@ -22,6 +22,7 @@ import org.keycloak.authorization.AuthorizationProvider;
import org.keycloak.authorization.model.Policy;
import org.keycloak.authorization.model.ResourceServer;
import org.keycloak.authorization.policy.provider.PolicyProviderFactory;
import org.keycloak.common.util.reflections.Types;
import org.keycloak.models.utils.ModelToRepresentation;
import org.keycloak.representations.idm.authorization.AbstractPolicyRepresentation;
import org.keycloak.services.resources.admin.permissions.AdminPermissionEvaluator;
@@ -61,7 +62,6 @@ public class PolicyTypeResourceService extends PolicyResourceService {
@Override
protected AbstractPolicyRepresentation toRepresentation(Policy policy, AuthorizationProvider authorization) {
PolicyProviderFactory providerFactory = authorization.getProviderFactory(policy.getType());
return ModelToRepresentation.toRepresentation(policy, providerFactory.getRepresentationType(), authorization);
return ModelToRepresentation.toRepresentation(policy, authorization);
}
}
@@ -88,8 +88,7 @@ public class PolicyTypeService extends PolicyService {
@Override
protected AbstractPolicyRepresentation toRepresentation(Policy policy, AuthorizationProvider authorization) {
PolicyProviderFactory providerFactory = authorization.getProviderFactory(policy.getType());
return ModelToRepresentation.toRepresentation(policy, providerFactory.getRepresentationType(), authorization);
return ModelToRepresentation.toRepresentation(policy, authorization);
}
@Override
@@ -359,7 +359,7 @@ public class ExportUtils {
private static PolicyRepresentation createPolicyRepresentation(AuthorizationProvider authorizationProvider, Policy policy) {
try {
PolicyRepresentation rep = toRepresentation(policy, PolicyRepresentation.class, authorizationProvider, true);
PolicyRepresentation rep = toRepresentation(policy, authorizationProvider, true, true);
rep.setId(null);