From 27f26332145abe9aca32cf5080ca249b2fe668e1 Mon Sep 17 00:00:00 2001 From: chasegawa Date: Wed, 30 Jun 2021 16:56:00 -0700 Subject: [PATCH] SHIBUI-1983 fixes for long type conversion --- .../admin/ui/service/JPAEntityDescriptorServiceImpl.java | 2 +- .../shibboleth/admin/util/ModelRepresentationConversions.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java index 4409731d2..05477d616 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java @@ -650,6 +650,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope Object attributeValues = null; switch (ModelRepresentationConversions.AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) { case STRING: + case LONG: case DOUBLE: case DURATION: case SPRING_BEAN_ID: @@ -659,7 +660,6 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope attributeValues = getValueFromXMLObject(jpaAttribute.getAttributeValues().get(0)); break; case INTEGER: - case LONG: if (jpaAttribute.getAttributeValues().size() != 1) { throw new RuntimeException("Multiple/No values detected where one is expected!"); } diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java index 45269b7cf..1cf4273bd 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/util/ModelRepresentationConversions.java @@ -232,7 +232,7 @@ public enum AttributeTypes { LIST, DOUBLE, // no org.opensaml.core.xml.schema.XSTYPE - will treat as STRING DURATION, // no org.opensaml.core.xml.schema.XSTYPE - will treat as STRING - LONG, // no org.opensaml.core.xml.schema.XSTYPE - will treat as INTEGER for generating XML + LONG, // no org.opensaml.core.xml.schema.XSTYPE - will treat as STRING for generating XML SELECTION_LIST, // another name for LIST SPRING_BEAN_ID // treat as STRING }