Restored getGroupByPath and removed legacy-util-classes

adorsys · Jan 8, 2024 · 7e56223 · 7e56223
1 parent 51e544f
commit 7e56223
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 248 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ## [Unreleased]
 - Updated CI to use Keycloak 23.0.4
 - Changed briefRepresentation from false to true (mistakenly considered full: [#25096](https://github.com/keycloak/keycloak/issues/25096))
+- Using getGroupByPath again after being fixed ([#25111](https://github.com/keycloak/keycloak/issues/25111))
+- When ignoring versions 23.0.0 to 23.0.3 there is no longer a need for legacy-util-classes
 
 ## [5.10.0] - 2023-12-12
 - Updated CI to use Keycloak 23.0.1

diff --git a/pom.xml b/pom.xml
@@ -702,42 +702,6 @@
             <id>pre-keycloak22</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>com.coderplus.maven.plugins</groupId>
-                        <artifactId>copy-rename-maven-plugin</artifactId>
-                        <version>1.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>replace-grouputil-with-legacy</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <sourceFile>${project.basedir}/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java.legacy</sourceFile>
-                                    <destinationFile>${project.basedir}/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java</destinationFile>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.coderplus.maven.plugins</groupId>
-                        <artifactId>copy-rename-maven-plugin</artifactId>
-                        <version>1.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>replace-subgrouputil-with-legacy</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <sourceFile>${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java.legacy</sourceFile>
-                                    <destinationFile>${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java</destinationFile>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>com.google.code.maven-replacer-plugin</groupId>
                         <artifactId>replacer</artifactId>
@@ -786,42 +750,6 @@ import org.keycloak.representations.userprofile.config.UPConfig;</token>
             <id>pre-keycloak23</id>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>com.coderplus.maven.plugins</groupId>
-                        <artifactId>copy-rename-maven-plugin</artifactId>
-                        <version>1.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>replace-grouputil-with-legacy</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <sourceFile>${project.basedir}/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java.legacy</sourceFile>
-                                    <destinationFile>${project.basedir}/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java</destinationFile>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.coderplus.maven.plugins</groupId>
-                        <artifactId>copy-rename-maven-plugin</artifactId>
-                        <version>1.0.1</version>
-                        <executions>
-                            <execution>
-                                <id>replace-subgrouputil-with-legacy</id>
-                                <phase>generate-sources</phase>
-                                <goals>
-                                    <goal>copy</goal>
-                                </goals>
-                                <configuration>
-                                    <sourceFile>${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java.legacy</sourceFile>
-                                    <destinationFile>${project.basedir}/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java</destinationFile>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>com.google.code.maven-replacer-plugin</groupId>
                         <artifactId>replacer</artifactId>

diff --git a/src/main/java/de/adorsys/keycloak/config/repository/GroupRepository.java b/src/main/java/de/adorsys/keycloak/config/repository/GroupRepository.java
@@ -21,7 +21,6 @@
 package de.adorsys.keycloak.config.repository;
 
 import de.adorsys.keycloak.config.exception.ImportProcessingException;
-import de.adorsys.keycloak.config.util.GroupUtil;
 import org.keycloak.admin.client.CreatedResponseUtil;
 import org.keycloak.admin.client.resource.GroupResource;
 import org.keycloak.admin.client.resource.GroupsResource;
@@ -211,7 +210,7 @@ public GroupRepresentation getGroupById(String realmName, String groupId) {
     }
 
     public GroupRepresentation getGroupByPath(String realmName, String groupPath) {
-        return GroupUtil.getGroupByPath(this, realmRepository, realmName, groupPath);
+        return realmRepository.getResource(realmName).getGroupByPath(groupPath);
     }
 
     public void enablePermission(String realmName, String id) {

diff --git a/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java b/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java
diff --git a/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java.legacy b/src/main/java/de/adorsys/keycloak/config/util/GroupUtil.java.legacy
diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportClientsIT.java
@@ -2631,7 +2631,7 @@ private GroupRepresentation getGroupByPath(RealmRepresentation realm, String...
             if (group == null) {
                 break;
             }
-            groups = SubGroupUtil.getSubGroups(group, keycloakProvider.getInstance().realm(realm.getRealm()));
+            groups = SubGroupUtil.getSubGroups(KEYCLOAK_VERSION, group, keycloakProvider.getInstance().realm(realm.getRealm()));
         }
 
         return group;

diff --git a/src/test/java/de/adorsys/keycloak/config/service/ImportGroupsIT.java b/src/test/java/de/adorsys/keycloak/config/service/ImportGroupsIT.java
@@ -1748,7 +1748,7 @@ private Optional<GroupRepresentation> tryToLoadGroup(String groupPath) {
     }
 
     private List<GroupRepresentation> getSubGroups(GroupRepresentation groupRepresentation) {
-        return SubGroupUtil.getSubGroups(groupRepresentation, keycloakProvider.getInstance().realm(REALM_NAME));
+        return SubGroupUtil.getSubGroups(KEYCLOAK_VERSION, groupRepresentation, keycloakProvider.getInstance().realm(REALM_NAME));
     }
 
     private void assertThatGroupAttributesAreEmpty(Map<String, List<String>> attributes) {

diff --git a/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java b/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java
@@ -20,6 +20,8 @@
 
 package de.adorsys.keycloak.config.test.util;
 
+import de.adorsys.keycloak.config.util.VersionUtil;
+import java.util.Collections;
 import org.apache.commons.collections.CollectionUtils;
 import org.keycloak.admin.client.resource.RealmResource;
 import org.keycloak.representations.idm.GroupRepresentation;
@@ -32,15 +34,20 @@ private SubGroupUtil() {
     }
 
     public static List<GroupRepresentation> getSubGroups(
+            String keycloakVersion,
             GroupRepresentation groupRepresentation,
             RealmResource realmResource
     ) {
-        if (CollectionUtils.isNotEmpty(groupRepresentation.getSubGroups())) {
-            return groupRepresentation.getSubGroups();
-        }
+        if (VersionUtil.lt(keycloakVersion, "23")) {
+            return groupRepresentation.getSubGroups() == null ? Collections.emptyList() : groupRepresentation.getSubGroups();
+        } else {
+            if (CollectionUtils.isNotEmpty(groupRepresentation.getSubGroups())) {
+                return groupRepresentation.getSubGroups();
+            }
 
-        return realmResource.groups()
-                .group(groupRepresentation.getId())
-                .getSubGroups(null, null, false);
+            return realmResource.groups()
+                    .group(groupRepresentation.getId())
+                    .getSubGroups(null, null, false);
+        }
     }
 }
diff --git a/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java.legacy b/src/test/java/de/adorsys/keycloak/config/test/util/SubGroupUtil.java.legacy