fully remove of hyperjaxb functionality from DB-configuration implementation

1 files changed, 28 insertions, 38 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
index c48d4522d..90f46efe1 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
@@ -11,24 +11,14 @@ package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+
 import javax.persistence.Transient;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-import org.jvnet.hyperjaxb3.item.ItemUtils;
+
 import org.jvnet.jaxb2_commons.lang.Equals;
 import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
 import org.jvnet.jaxb2_commons.lang.HashCode;
@@ -73,7 +63,7 @@ public class IdentityLinkSigners
     protected List<String> x509SubjectName;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems;
+//    protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems;
 
     /**
      * Gets the value of the x509SubjectName property.
@@ -140,31 +130,31 @@ public class IdentityLinkSigners
         this.hjid = value;
     }
 
-    @OneToMany(targetEntity = IdentityLinkSignersX509SubjectNameItem.class, cascade = {
-        CascadeType.ALL
-    })
-    
-    public List<IdentityLinkSignersX509SubjectNameItem> getX509SubjectNameItems() {
-        if (this.x509SubjectNameItems == null) {
-            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
-        }
-        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
-            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
-        }
-        return this.x509SubjectNameItems;
-    }
-
-    public void setX509SubjectNameItems(List<IdentityLinkSignersX509SubjectNameItem> value) {
-        this.x509SubjectName = null;
-        this.x509SubjectNameItems = null;
-        this.x509SubjectNameItems = value;
-        if (this.x509SubjectNameItems == null) {
-            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
-        }
-        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
-            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
-        }
-    }
+//    @OneToMany(targetEntity = IdentityLinkSignersX509SubjectNameItem.class, cascade = {
+//        CascadeType.ALL
+//    })
+//    
+//    public List<IdentityLinkSignersX509SubjectNameItem> getX509SubjectNameItems() {
+//        if (this.x509SubjectNameItems == null) {
+//            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
+//        }
+//        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
+//            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
+//        }
+//        return this.x509SubjectNameItems;
+//    }
+//
+//    public void setX509SubjectNameItems(List<IdentityLinkSignersX509SubjectNameItem> value) {
+//        this.x509SubjectName = null;
+//        this.x509SubjectNameItems = null;
+//        this.x509SubjectNameItems = value;
+//        if (this.x509SubjectNameItems == null) {
+//            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
+//        }
+//        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
+//            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
+//        }
+//    }
 
     public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
         if (!(object instanceof IdentityLinkSigners)) {