Merge from master

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AbstractElementExtensibleXMLObject.java

@@ -9,6 +9,7 @@
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.List;
@@ -19,6 +20,7 @@
 @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
 public abstract class AbstractElementExtensibleXMLObject extends AbstractXMLObject implements ElementExtensibleXMLObject {
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<AbstractXMLObject> unknownXMLObjects = new ArrayList<>();
 
     @Nonnull

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AffiliationDescriptor.java

@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.List;
 
 
@@ -19,10 +20,12 @@ public class AffiliationDescriptor extends AbstractDescriptor implements org.ope
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "affildesc_affilmemb_id")
+    @OrderColumn
     private List<AffiliateMember> affiliateMembers;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "affildesc_keydesc_id")
+    @OrderColumn
     private List<KeyDescriptor> keyDescriptors;
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Attribute.java

@@ -7,6 +7,7 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -23,6 +24,7 @@ public class Attribute extends AbstractAttributeExtensibleXMLObject implements o
     private String friendlyName;
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<AbstractXMLObject> attributeValues = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeAuthorityDescriptor.java

@@ -6,6 +6,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,22 +17,27 @@ public class AttributeAuthorityDescriptor extends RoleDescriptor implements org.
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribauthdesc_attribserv_id")
+    @OrderColumn
     private List<AttributeService> attributeServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribauthdesc_assertidreqservc_id")
+    @OrderColumn
     private List<AssertionIDRequestService> assertionIDRequestServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribauthdesc_nameidfrmt_id")
+    @OrderColumn
     private List<NameIDFormat> nameIDFormats = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribauthdesc_attribprofile_id")
+    @OrderColumn
     private List<AttributeProfile> attributeProfiles = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribauthdesc_attrib_id")
+    @OrderColumn
     private List<Attribute> attributes = new ArrayList<>();
 
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AttributeConsumingService.java

@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,14 +22,17 @@ public class AttributeConsumingService extends AbstractXMLObject implements org.
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribconsserv_servicename_id")
+    @OrderColumn
     private List<ServiceName> serviceNames = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribconsserv_servicedesc_id")
+    @OrderColumn
     private List<ServiceDescription> serviceDescriptions = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "attribconsserv_requestedattrib_id")
+    @OrderColumn
     private List<RequestedAttribute> requestedAttributes = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/AuthnAuthorityDescriptor.java

@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.List;
 
 
@@ -16,14 +17,17 @@ public class AuthnAuthorityDescriptor extends RoleDescriptor implements org.open
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "authnauthdesc_authnqueryserv_id")
+    @OrderColumn
     private List<AuthnQueryService> authnQueryServices;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "authnauthdesc_assertidreqserv_id")
+    @OrderColumn
     private List<AssertionIDRequestService> assertionIDRequestServices;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "authnauthdesc_nameidfmt_id")
+    @OrderColumn
     private List<NameIDFormat> nameIDFormats;
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/ContactPerson.java

@@ -30,10 +30,12 @@ public class ContactPerson extends AbstractAttributeExtensibleXMLObject implemen
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "contactpersn_emailaddr_id")
+    @OrderColumn
     private List<EmailAddress> emailAddresses = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "contactpersn_telenmbr_id")
+    @OrderColumn
     private List<TelephoneNumber> telephoneNumbers = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributes.java

@@ -8,6 +8,7 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import javax.persistence.Transient;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -18,6 +19,7 @@
 public class EntityAttributes extends AbstractElementExtensibleXMLObject implements org.opensaml.saml.ext.saml2mdattr.EntityAttributes {
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<Attribute> attributes = new ArrayList<>();
 
     @Transient // TODO: check to make sure this won't ever be used

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilter.java

@@ -6,6 +6,7 @@
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -16,6 +17,7 @@ public class EntityAttributesFilter extends MetadataFilter {
     private EntityAttributesFilterTarget entityAttributesFilterTarget;
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<Attribute> attributes = new ArrayList<>();
 
     public EntityAttributesFilterTarget getEntityAttributesFilterTarget() {

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityAttributesFilterTarget.java

@@ -6,6 +6,7 @@
 
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,6 +22,7 @@ public enum EntityAttributesFilterTargetType {
     private EntityAttributesFilterTargetType entityAttributesFilterTargetType;
 
     @ElementCollection
+    @OrderColumn
     private List<String> value;
 
     public EntityAttributesFilterTargetType getEntityAttributesFilterTargetType() {

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/EntityDescriptor.java

@@ -14,6 +14,7 @@
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
+import javax.persistence.OrderColumn;
 import javax.persistence.Transient;
 
 import javax.xml.namespace.QName;
@@ -42,13 +43,16 @@ public class EntityDescriptor extends AbstractDescriptor implements org.opensaml
     private Organization organization;
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<ContactPerson> contactPersons = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     private List<RoleDescriptor> roleDescriptors;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "entitydesc_addlmetdatlocations_id")
+    @OrderColumn
     private List<AdditionalMetadataLocation> additionalMetadataLocations = new ArrayList<>();
 
     @OneToOne(cascade = CascadeType.ALL)

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/IDPSSODescriptor.java

@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,22 +20,27 @@ public class IDPSSODescriptor extends SSODescriptor implements org.opensaml.saml
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "idpssodesc_ssoserv_id")
+    @OrderColumn
     private List<SingleSignOnService> singleSignOnServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "idpssodesc_nameidmapserv_id")
+    @OrderColumn
     private List<NameIDMappingService> nameIDMappingServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "idpssodesc_asseridreqserv_id")
+    @OrderColumn
     private List<AssertionIDRequestService> assertionIDRequestServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "idpssodesc_attribprofile_id")
+    @OrderColumn
     private List<AttributeProfile> attributeProfiles = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "idpssodesc_attrib_id")
+    @OrderColumn
     private List<Attribute> attributes = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyDescriptor.java

@@ -23,6 +23,7 @@ public class KeyDescriptor extends AbstractXMLObject implements org.opensaml.sam
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "keydesc_encryptionmethod_id")
+    @OrderColumn
     private List<EncryptionMethod> encryptionMethods = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/KeyInfo.java

@@ -19,6 +19,7 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import javax.xml.namespace.QName;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,6 +32,7 @@
 public class KeyInfo extends AbstractXMLObject implements org.opensaml.xmlsec.signature.KeyInfo {
 
     @OneToMany(cascade = CascadeType.ALL)
+    @OrderColumn
     List<AbstractXMLObject> xmlObjects = new ArrayList<>();
 
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Keywords.java

@@ -5,12 +5,14 @@
 import javax.annotation.Nullable;
 import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
+import javax.persistence.OrderColumn;
 import java.util.List;
 
 @Entity
 @EqualsAndHashCode(callSuper = true)
 public class Keywords extends AbstractXMLObject implements org.opensaml.saml.ext.saml2mdui.Keywords {
     @ElementCollection
+    @OrderColumn
     private List<String> keywords;
     private String xmlLang;
 

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/Organization.java

@@ -18,14 +18,17 @@ public class Organization extends AbstractAttributeExtensibleXMLObject implement
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "org_orgname_id")
+    @OrderColumn
     private List<OrganizationName> organizationNames = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "org_orgdisplayname_id")
+    @OrderColumn
     private List<OrganizationDisplayName> organizationDisplayNames = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "org_orgurl_id")
+    @OrderColumn
     private List<OrganizationURL> organizationURLs = new ArrayList<>();
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PDPDescriptor.java

@@ -7,6 +7,7 @@
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import java.util.List;
 
 
@@ -16,14 +17,17 @@ public class PDPDescriptor extends RoleDescriptor implements org.opensaml.saml.s
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "pdpdesc_authzserv_id")
+    @OrderColumn
     private List<AuthzService> authzServices;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "pdpdesc_assertidreqserv_id")
+    @OrderColumn
     private List<AssertionIDRequestService> assertionIDRequestServices;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "pdpdesc_nameidfmt_id")
+    @OrderColumn
     private List<NameIDFormat> nameIDFormats;
 
     @Override

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RoleDescriptor.java

@@ -10,6 +10,7 @@
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
 import javax.persistence.Transient;
 import javax.persistence.ElementCollection;
 import javax.persistence.JoinColumn;
@@ -23,25 +24,29 @@
 import java.util.List;
 
 @Entity
-@EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true, exclude={"unknownAttributes"})
 public class RoleDescriptor extends AbstractDescriptor implements org.opensaml.saml.saml2.metadata.RoleDescriptor {
 
     @ElementCollection
+    @OrderColumn
     private List<String> supportedProtocols = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "roledesc_keydesc_id")
+    @OrderColumn
     private List<KeyDescriptor> keyDescriptors = new ArrayList<>(); // TODO: implement
 
     @OneToOne(cascade = CascadeType.ALL)
     private Organization organization;
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "roledesc_contactperson_id")
+    @OrderColumn
     private List<ContactPerson> contactPersons = new ArrayList<>(); // TODO: implement
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "roledesc_endpoint_id")
+    @OrderColumn
     private List<Endpoint> endpoints = new ArrayList<>();
 
     private boolean isSupportedProtocol;

backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/SPSSODescriptor.java

@@ -21,10 +21,12 @@ public class SPSSODescriptor extends SSODescriptor implements org.opensaml.saml.
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "spssodesc_attribconsserv_id")
+    @OrderColumn
     private List<AttributeConsumingService> attributeConsumingServices = new ArrayList<>();
 
     @OneToMany(cascade = CascadeType.ALL)
     @JoinColumn(name = "spssodesc_assertconsserv_id")
+    @OrderColumn
     private List<AssertionConsumerService> assertionConsumerServices = new ArrayList<>();