libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

Revert "Workaround to avoid replacing element collections"

Browse source 
With the update Hibernate 6.2.0.Final this is no longer needed.

Closes #19162

This reverts commit 93e32f3191a1ddc3498000244b35b3c14fe6880e and e369f7c212b3d9ee4810518f5a2bfe9b846ba15d.
This commit is contained in:
Alexander Schwartz 2023-03-31 09:53:44 +02:00 committed by Václav Muzikář
parent c7749dc5dd
commit 02b0683053
2 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java
View file

@ -145,16 +145,7 @@ public class ResourceEntity {
}
public void setUris(Set<String> uris) {
// Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
// Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
if (this.uris != null) {
this.uris.clear();
if (uris != null) {
this.uris.addAll(uris);
}
} else {
this.uris = uris;
}
this.uris = uris;
}
public String getType() {

18
model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java
View file

@ -226,14 +226,7 @@ public class ClientEntity {
}
public void setWebOrigins(Set<String> webOrigins) {
// Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
// Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
if (this.webOrigins != null) {
this.webOrigins.clear();
this.webOrigins.addAll(webOrigins);
} else {
this.webOrigins = webOrigins;
}
this.webOrigins = webOrigins;
}
public Set<String> getRedirectUris() {
@ -244,14 +237,7 @@ public class ClientEntity {
}
public void setRedirectUris(Set<String> redirectUris) {
// Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
// Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
if (this.redirectUris != null) {
this.redirectUris.clear();
this.redirectUris.addAll(redirectUris);
} else {
this.redirectUris = redirectUris;
}
this.redirectUris = redirectUris;
}
public String getClientAuthenticatorType() {