Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke committed 2016-08-07 11:50:44 -04:00
commit f14f303dfe
112 files changed
+1406 -479

No files matched your search

@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
import org.keycloak.events.admin.AdminEvent;
import org.keycloak.events.admin.AdminEventQuery;
import org.keycloak.events.admin.OperationType;
import org.keycloak.events.admin.ResourceType;
/**
* @author <a href="mailto:giriraj.sharma27@gmail.com">Giriraj Sharma</a>
@@ -71,6 +72,27 @@ public class MemAdminEventQuery implements AdminEventQuery {
}
return this;
}
@Override
public AdminEventQuery resourceType(ResourceType... resourceTypes) {
Iterator<AdminEvent> itr = this.adminEvents.iterator();
while (itr.hasNext()) {
AdminEvent next = itr.next();
boolean include = false;
for (ResourceType e : resourceTypes) {
if (next.getResourceType().equals(e)) {
include = true;
break;
}
}
if (!include) {
itr.remove();
}
}
return this;
}
@Override
public AdminEventQuery authRealm(String authRealmId) {