From 770cdc6e52e1933db33de31870f8ef932fd93f4b Mon Sep 17 00:00:00 2001 From: chasegawa Date: Tue, 15 Jun 2021 17:10:09 -0700 Subject: [PATCH] SHIBUI-1788 Bug fix for list items in the relying party config screen --- .../admin/ui/domain/CustomEntityAttributeDefinition.java | 2 +- .../admin/ui/service/JPAEntityDescriptorServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java index 6c3186ea9..d0522c0d6 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java @@ -77,7 +77,7 @@ public Set getDefaultValues() { @Override public String getDisplayName() { // This is here only to ensure proper functionality works until the full definition is revised with all the fields - return displayName == null ? "DEFAULTED to name: " + name : displayName; + return displayName == null ? name : displayName; } @Override 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 e30800cd9..4409731d2 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,12 +650,16 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope Object attributeValues = null; switch (ModelRepresentationConversions.AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) { case STRING: + case DOUBLE: + case DURATION: + case SPRING_BEAN_ID: if (jpaAttribute.getAttributeValues().size() != 1) { throw new RuntimeException("Multiple/No values detected where one is expected!"); } 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!"); } @@ -675,6 +679,7 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope break; case SET: case LIST: + case SELECTION_LIST: attributeValues = jpaAttribute.getAttributeValues().stream() .map(attributeValue -> getValueFromXMLObject(attributeValue)) .collect(Collectors.toList());