forked from keycloak/keycloak
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Calling getTopLevelGroups is slow inside GroupLDAPStorageMapper#getLD…
…APGroupMappingsConverted (keycloak#8430) Closes keycloak#14820 --------- Co-authored-by: Michal Hajas <[email protected]>
- Loading branch information
Showing
20 changed files
with
472 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...nfinispan/src/main/java/org/keycloak/models/cache/infinispan/entities/GroupNameQuery.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Copyright 2022 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.models.cache.infinispan.entities; | ||
|
|
||
| import org.keycloak.models.RealmModel; | ||
|
|
||
| public class GroupNameQuery extends AbstractRevisioned implements InRealm { | ||
| private final String realm; | ||
| private final String realmName; | ||
| private final String groupId; | ||
|
|
||
| public GroupNameQuery(Long revisioned, String id, String groupId, RealmModel realm) { | ||
| super(revisioned, id); | ||
| this.realm = realm.getId(); | ||
| this.realmName = realm.getName(); | ||
| this.groupId = groupId; | ||
| } | ||
|
|
||
| public String getGroupId() { | ||
| return groupId; | ||
| } | ||
|
|
||
| public String getRealm() { | ||
| return realm; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "GroupNameQuery{" + | ||
| "id='" + getId() + "'" + | ||
| "realmName='" + realmName + '\'' + | ||
| '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
...nfinispan/src/main/java/org/keycloak/models/cache/infinispan/stream/InGroupPredicate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * Copyright 2022 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.models.cache.infinispan.stream; | ||
|
|
||
| import org.keycloak.models.cache.infinispan.entities.GroupNameQuery; | ||
| import org.keycloak.models.cache.infinispan.entities.Revisioned; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.ObjectInput; | ||
| import java.io.ObjectOutput; | ||
| import java.io.Serializable; | ||
| import java.util.Map; | ||
| import java.util.function.Predicate; | ||
| import org.infinispan.commons.marshall.Externalizer; | ||
| import org.infinispan.commons.marshall.MarshallUtil; | ||
| import org.infinispan.commons.marshall.SerializeWith; | ||
|
|
||
| @SerializeWith(InGroupPredicate.ExternalizerImpl.class) | ||
| public class InGroupPredicate implements Predicate<Map.Entry<String, Revisioned>>, Serializable { | ||
| private String group; | ||
|
|
||
| public static InGroupPredicate create() { | ||
| return new InGroupPredicate(); | ||
| } | ||
|
|
||
| public InGroupPredicate group(String id) { | ||
| group = id; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean test(Map.Entry<String, Revisioned> entry) { | ||
| Object value = entry.getValue(); | ||
| if (value == null) return false; | ||
| if (!(value instanceof GroupNameQuery)) return false; | ||
|
|
||
| return group.equals(((GroupNameQuery)value).getGroupId()); | ||
| } | ||
|
|
||
| public static class ExternalizerImpl implements Externalizer<InGroupPredicate> { | ||
|
|
||
| private static final int VERSION_1 = 1; | ||
|
|
||
| @Override | ||
| public void writeObject(ObjectOutput output, InGroupPredicate obj) throws IOException { | ||
| output.writeByte(VERSION_1); | ||
|
|
||
| MarshallUtil.marshallString(obj.group, output); | ||
| } | ||
|
|
||
| @Override | ||
| public InGroupPredicate readObject(ObjectInput input) throws IOException, ClassNotFoundException { | ||
| switch (input.readByte()) { | ||
| case VERSION_1: | ||
| return readObjectVersion1(input); | ||
| default: | ||
| throw new IOException("Unknown version"); | ||
| } | ||
| } | ||
|
|
||
| public InGroupPredicate readObjectVersion1(ObjectInput input) throws IOException, ClassNotFoundException { | ||
| InGroupPredicate res = new InGroupPredicate(); | ||
| res.group = MarshallUtil.unmarshallString(input); | ||
|
|
||
| return res; | ||
| } | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
.../keycloak/models/sessions/infinispan/entities/wildfly/InGroupPredicateWFExternalizer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /* | ||
| * Copyright 2022 Red Hat, Inc. and/or its affiliates | ||
| * and other contributors as indicated by the @author tags. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.keycloak.models.sessions.infinispan.entities.wildfly; | ||
|
|
||
| import org.keycloak.models.cache.infinispan.stream.InGroupPredicate; | ||
|
|
||
| public class InGroupPredicateWFExternalizer extends InfinispanExternalizerAdapter<InGroupPredicate> { | ||
|
|
||
| public InGroupPredicateWFExternalizer() { | ||
| super(InGroupPredicate.class, new InGroupPredicate.ExternalizerImpl()); | ||
| } | ||
| } |
Oops, something went wrong.