Skip to content

Commit

Permalink
Showing 7 changed files with 18 additions and 7 deletions.
@@ -2,11 +2,14 @@

import lombok.EqualsAndHashCode;
import org.hibernate.envers.Audited;
import org.hibernate.envers.NotAudited;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
import org.opensaml.core.xml.util.AttributeMap;

import javax.annotation.Nonnull;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.MapKeyColumn;
import javax.persistence.MappedSuperclass;
import javax.persistence.PostLoad;
import javax.persistence.PrePersist;
@@ -31,7 +34,10 @@ public AttributeMap getUnknownAttributes() {
return this.unknownAttributes;
}

@ElementCollection
//@ElementCollection
//@MapKeyColumn(length = 1000)
//@NotAudited
@Transient
private Map<QName,String> storageAttributeMap = new HashMap<>();

@PrePersist
@@ -43,4 +49,4 @@ void prePersist() {
void postLoad() {
this.unknownAttributes.putAll(this.storageAttributeMap);
}
}
}
@@ -4,8 +4,10 @@
import org.opensaml.core.xml.util.AttributeMap;

import javax.annotation.Nonnull;
import javax.persistence.Column;
import javax.persistence.ElementCollection;
import javax.persistence.Entity;
import javax.persistence.MapKeyColumn;
import javax.persistence.PostLoad;
import javax.persistence.PrePersist;
import javax.persistence.Transient;
@@ -51,7 +53,9 @@ public void setResponseLocation(String location) {
this.responseLocation = location;
}

@ElementCollection
//@ElementCollection
//@MapKeyColumn(length = 1000)
@Transient
private Map<QName,String> storageAttributeMap = new HashMap<>();

@Transient
@@ -32,7 +32,7 @@ public enum EntityAttributesFilterTargetType {

@ElementCollection
@OrderColumn
@Column(length = 4000)
//@Column(length = 1000)
private List<String> value;

public EntityAttributesFilterTargetType getEntityAttributesFilterTargetType() {
@@ -41,6 +41,7 @@ public Role(String name, int rank) {
@Column(unique = true)
private String name;

@Column(name = "ROLE_RANK")
private int rank;

//Ignore properties annotation here is to prevent stack overflow recursive error during JSON serialization
@@ -32,7 +32,7 @@
@Setter
@EqualsAndHashCode(callSuper = true, exclude = "roles")
@ToString(exclude = "roles")
@Table(name = "\"USER\"")
@Table(name = "USERS")
public class User extends AbstractAuditable {

@Column(nullable = false, unique = true)
2 changes: 1 addition & 1 deletion gradle.properties
@@ -7,7 +7,7 @@ opensaml.version=3.4.0

spring-boot.version=2.0.0.RELEASE

hibernate.version=5.2.11.Final
hibernate.version=5.3.14.Final

lucene.version=7.2.1

2 changes: 1 addition & 1 deletion testbed/mysql/conf/application.yml
@@ -10,7 +10,7 @@ spring:
jpa:
properties:
hibernate:
dialect: org.hibernate.dialect.MySQL5Dialect
dialect: org.hibernate.dialect.MySQL8Dialect
server:
port: 8443
ssl:

0 comments on commit 6dc26bb

Please sign in to comment.