Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Se habilitan los roles que son union de otros roles #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Se habilitan los roles que son union de otros roles #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/mondrian/rolap/RolapSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,10 +475,18 @@ public NamedSet getNamedSet(String name) {
}

public Role lookupRole(final String role) {
LOGGER.info("lookupRole: " + role);

final RoleFactory roleFactory = mapNameToRole.get(role);
if (roleFactory instanceof ConstantRoleFactory) {
LOGGER.info("instanceof ConstantRoleFactory " + role);
return ((ConstantRoleFactory) roleFactory).role;
} else
if (roleFactory instanceof UnionRoleFactory) {
LOGGER.info("instanceof UnionRoleFactory " + role);
return ((UnionRoleFactory) roleFactory).role;
}

return null;
}

Expand Down Expand Up @@ -699,7 +707,9 @@ void registerRoles(
Map<String, RoleFactory> roles,
RoleFactory defaultRole)
{
LOGGER.info("registering Roles ");
for (Map.Entry<String, RoleFactory> entry : roles.entrySet()) {
LOGGER.info("key: " + entry.getKey());
mapNameToRole.put(entry.getKey(), entry.getValue());
}

Expand Down Expand Up @@ -3036,8 +3046,11 @@ public Role create(Map<String, Object> context) {
static class UnionRoleFactory implements RoleFactory {
private final List<RoleFactory> factories;

private final Role role;

public UnionRoleFactory(List<RoleFactory> factories) {
this.factories = factories;
this.role = create(null);
}

public Role create(final Map<String, Object> context) {
Expand Down