Revert "Type "type" column in Hibernate"
This reverts commit 0bf5aa1a76aeece12b71b14bedc672850671a794.
This commit is contained in:
parent
55730a8021
commit
080cc8c273
3 changed files with 10 additions and 12 deletions
|
@ -9,7 +9,6 @@ import jakarta.persistence.NamedQuery;
|
|||
import jakarta.persistence.Table;
|
||||
import sh.libre.scim.core.EntityOnRemoteScimId;
|
||||
import sh.libre.scim.core.KeycloakId;
|
||||
import sh.libre.scim.core.ScimResourceType;
|
||||
|
||||
@Entity
|
||||
@IdClass(ScimResourceId.class)
|
||||
|
@ -34,7 +33,7 @@ public class ScimResource {
|
|||
|
||||
@Id
|
||||
@Column(name = "TYPE", nullable = false)
|
||||
private ScimResourceType type;
|
||||
private String type;
|
||||
|
||||
@Id
|
||||
@Column(name = "EXTERNAL_ID", nullable = false)
|
||||
|
@ -72,11 +71,11 @@ public class ScimResource {
|
|||
this.externalId = externalId;
|
||||
}
|
||||
|
||||
public ScimResourceType getType() {
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(ScimResourceType type) {
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,7 @@ public class ScimResourceDao {
|
|||
|
||||
public void create(KeycloakId id, EntityOnRemoteScimId externalId, ScimResourceType type) {
|
||||
ScimResource entity = new ScimResource();
|
||||
entity.setType(type);
|
||||
entity.setType(type.name());
|
||||
entity.setExternalId(externalId.asString());
|
||||
entity.setComponentId(componentId);
|
||||
entity.setRealmId(realmId);
|
||||
|
@ -56,7 +56,7 @@ public class ScimResourceDao {
|
|||
private TypedQuery<ScimResource> getScimResourceTypedQuery(String queryName, String id, ScimResourceType type) {
|
||||
return getEntityManager()
|
||||
.createNamedQuery(queryName, ScimResource.class)
|
||||
.setParameter("type", type)
|
||||
.setParameter("type", type.name())
|
||||
.setParameter("realmId", getRealmId())
|
||||
.setParameter("componentId", getComponentId())
|
||||
.setParameter("id", id);
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
package sh.libre.scim.jpa;
|
||||
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import sh.libre.scim.core.ScimResourceType;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
@ -10,13 +9,13 @@ public class ScimResourceId implements Serializable {
|
|||
private String id;
|
||||
private String realmId;
|
||||
private String componentId;
|
||||
private ScimResourceType type;
|
||||
private String type;
|
||||
private String externalId;
|
||||
|
||||
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.setRealmId(realmId);
|
||||
this.setComponentId(componentId);
|
||||
|
@ -48,11 +47,11 @@ public class ScimResourceId implements Serializable {
|
|||
this.componentId = componentId;
|
||||
}
|
||||
|
||||
public ScimResourceType getType() {
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(ScimResourceType type) {
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
|
||||
|
@ -75,7 +74,7 @@ public class ScimResourceId implements Serializable {
|
|||
return (StringUtils.equals(o.id, id) &&
|
||||
StringUtils.equals(o.realmId, realmId) &&
|
||||
StringUtils.equals(o.componentId, componentId) &&
|
||||
Objects.equals(o.type, type) &&
|
||||
StringUtils.equals(o.type, type) &&
|
||||
StringUtils.equals(o.externalId, externalId));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue