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

Removing workaround for H6 as this is now fixed

Browse source 
This reverts commit c74b832995759d4c9f330a4ba1767d01f9e3c174.

Closes #16551
This commit is contained in:
Alexander Schwartz 2023-03-30 11:11:16 +02:00 committed by Václav Muzikář
parent e00af7e172
commit b508b18391
3 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model/jpa/src/main/java/org/keycloak/models/jpa/JpaRealmProvider.java
View file

@ -1089,9 +1089,9 @@ public class JpaRealmProvider implements RealmProvider, ClientProvider, ClientSc
entity.setRealm(em.getReference(RealmEntity.class, realm.getId())); entity.setRealm(em.getReference(RealmEntity.class, realm.getId()));
entity.setLocale(locale); entity.setLocale(locale);
entity.setTexts(new HashMap<>()); entity.setTexts(new HashMap<>());
em.persist(entity);
} }
entity.getTexts().put(key, text); entity.getTexts().put(key, text);
em.persist(entity);
} }
@Override @Override

17
model/jpa/src/main/java/org/keycloak/models/jpa/converter/MapStringConverter.java
View file

@ -18,10 +18,8 @@
package org.keycloak.models.jpa.converter; package org.keycloak.models.jpa.converter;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import jakarta.persistence.AttributeConverter; import jakarta.persistence.AttributeConverter;
import org.hibernate.type.descriptor.java.MutableMutabilityPlan;
import org.jboss.logging.Logger; import org.jboss.logging.Logger;
import org.keycloak.util.JsonSerialization; import org.keycloak.util.JsonSerialization;
@ -47,19 +45,4 @@ public class MapStringConverter implements AttributeConverter<Map<String, String
return null; return null;
} }
} }
/**
* Mutability plan for this property. Needed in Hibernate 6 as it doesn't assume mutability by default
* in contrast to Hibernate 5.
* This is tracked in the upstream project in <a href="https://hibernate.atlassian.net/browse/HHH-16081">HHH-16081</a>
*/
public static class MapStringConverterMutabilityPlan extends MutableMutabilityPlan<Map<String, String>> {
@Override
protected Map<String, String> deepCopyNotNull(Map<String, String> value) {
return new HashMap<>(value);
}
}
} }

7
model/jpa/src/main/java/org/keycloak/models/jpa/entities/RealmLocalizationTextsEntity.java
View file

@ -30,7 +30,6 @@ import jakarta.persistence.JoinColumn;
import jakarta.persistence.ManyToOne; import jakarta.persistence.ManyToOne;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import org.hibernate.annotations.Mutability;
import org.hibernate.annotations.Nationalized; import org.hibernate.annotations.Nationalized;
import org.keycloak.models.jpa.converter.MapStringConverter; import org.keycloak.models.jpa.converter.MapStringConverter;
@ -85,12 +84,6 @@ public class RealmLocalizationTextsEntity {
@Nationalized @Nationalized
@Column(name = "TEXTS") @Column(name = "TEXTS")
@Convert(converter = MapStringConverter.class) @Convert(converter = MapStringConverter.class)
/*
* @Mutability annotation needed in Hibernate 6 as it doesn't assume mutability by default
* in contrast to Hibernate 5.
* This is tracked in the upstream project in https://hibernate.atlassian.net/browse/HHH-16081
*/
@Mutability(MapStringConverter.MapStringConverterMutabilityPlan.class)
private Map<String,String> texts; private Map<String,String> texts;
public Map<String,String> getTexts() { public Map<String,String> getTexts() {