libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases Packages Activity Actions

Revert "Type "type" column in Hibernate"

Browse source 
This reverts commit 0bf5aa1a76aeece12b71b14bedc672850671a794.
This commit is contained in:
Alex Morel 2024-06-21 14:11:10 +02:00
parent 55730a8021
commit 080cc8c273
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/sh/libre/scim/jpa/ScimResource.java
View file

@ -9,7 +9,6 @@ import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import sh.libre.scim.core.EntityOnRemoteScimId; import sh.libre.scim.core.EntityOnRemoteScimId;
import sh.libre.scim.core.KeycloakId; import sh.libre.scim.core.KeycloakId;
import sh.libre.scim.core.ScimResourceType;
@Entity @Entity
@IdClass(ScimResourceId.class) @IdClass(ScimResourceId.class)
@ -34,7 +33,7 @@ public class ScimResource {
@Id @Id
@Column(name = "TYPE", nullable = false) @Column(name = "TYPE", nullable = false)
private ScimResourceType type; private String type;
@Id @Id
@Column(name = "EXTERNAL_ID", nullable = false) @Column(name = "EXTERNAL_ID", nullable = false)
@ -72,11 +71,11 @@ public class ScimResource {
this.externalId = externalId; this.externalId = externalId;
} }
public ScimResourceType getType() { public String getType() {
return type; return type;
} }
public void setType(ScimResourceType type) { public void setType(String type) {
this.type = type; this.type = type;
} }

4
src/main/java/sh/libre/scim/jpa/ScimResourceDao.java
View file

@ -45,7 +45,7 @@ public class ScimResourceDao {
public void create(KeycloakId id, EntityOnRemoteScimId externalId, ScimResourceType type) { public void create(KeycloakId id, EntityOnRemoteScimId externalId, ScimResourceType type) {
ScimResource entity = new ScimResource(); ScimResource entity = new ScimResource();
entity.setType(type); entity.setType(type.name());
entity.setExternalId(externalId.asString()); entity.setExternalId(externalId.asString());
entity.setComponentId(componentId); entity.setComponentId(componentId);
entity.setRealmId(realmId); entity.setRealmId(realmId);
@ -56,7 +56,7 @@ public class ScimResourceDao {
private TypedQuery<ScimResource> getScimResourceTypedQuery(String queryName, String id, ScimResourceType type) { private TypedQuery<ScimResource> getScimResourceTypedQuery(String queryName, String id, ScimResourceType type) {
return getEntityManager() return getEntityManager()
.createNamedQuery(queryName, ScimResource.class) .createNamedQuery(queryName, ScimResource.class)
.setParameter("type", type) .setParameter("type", type.name())
.setParameter("realmId", getRealmId()) .setParameter("realmId", getRealmId())
.setParameter("componentId", getComponentId()) .setParameter("componentId", getComponentId())
.setParameter("id", id); .setParameter("id", id);

11
src/main/java/sh/libre/scim/jpa/ScimResourceId.java
View file

@ -1,7 +1,6 @@
package sh.libre.scim.jpa; package sh.libre.scim.jpa;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import sh.libre.scim.core.ScimResourceType;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
@ -10,13 +9,13 @@ public class ScimResourceId implements Serializable {
private String id; private String id;
private String realmId; private String realmId;
private String componentId; private String componentId;
private ScimResourceType type; private String type;
private String externalId; private String externalId;
public ScimResourceId() { public ScimResourceId() {
} }
public ScimResourceId(String id, String realmId, String componentId, ScimResourceType type, String externalId) { public ScimResourceId(String id, String realmId, String componentId, String type, String externalId) {
this.setId(id); this.setId(id);
this.setRealmId(realmId); this.setRealmId(realmId);
this.setComponentId(componentId); this.setComponentId(componentId);
@ -48,11 +47,11 @@ public class ScimResourceId implements Serializable {
this.componentId = componentId; this.componentId = componentId;
} }
public ScimResourceType getType() { public String getType() {
return type; return type;
} }
public void setType(ScimResourceType type) { public void setType(String type) {
this.type = type; this.type = type;
} }
@ -75,7 +74,7 @@ public class ScimResourceId implements Serializable {
return (StringUtils.equals(o.id, id) && return (StringUtils.equals(o.id, id) &&
StringUtils.equals(o.realmId, realmId) && StringUtils.equals(o.realmId, realmId) &&
StringUtils.equals(o.componentId, componentId) && StringUtils.equals(o.componentId, componentId) &&
Objects.equals(o.type, type) && StringUtils.equals(o.type, type) &&
StringUtils.equals(o.externalId, externalId)); StringUtils.equals(o.externalId, externalId));
} }