From 2a1711ebf6b1307cab804b49ec08c8ffcce5fcf4 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 7 Mar 2019 07:53:05 -0600 Subject: [PATCH 1/4] [NOISSUE] updated logo --- ui/src/assets/logo_unicon.png | Bin 2455 -> 20861 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/ui/src/assets/logo_unicon.png b/ui/src/assets/logo_unicon.png index 8d45bb447820c20baeb9f2b14f3e4e2253685e0e..5bd2056f262a68ef8328591eb56ead0ea0f9ffd2 100644 GIT binary patch literal 20861 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 literal 2455 zcmV;I3263-P)?2#?VFtM%GsWNTbcAQHwo1 zLxh(~cR?is^^J~$2#hHA)Ls@u9VmdvVbX><`q>1L1_~e&C{Un4f~O`D$V1w6dipLB z&vlzZ`Ew+rniUsw$>U1t0~C5Uvi(f+edteA=~GEiuukRu1w+4LeD=5ErIr*aUn!J6 zJmNEC91$P#o*?f*4euNyRp7ryzB%()Y~?B2T`-RIM2WDqW39-bR;~d=UTP7eeRqOT zdKlWBVAemQwr)I%GW;X;V7M4m5hI)z08xdbu4SS@t0sOznYt;l$kar@UXB{ct zan1dO!na@=i*l^FfaJ2G^D|MY$w_{ob6-&gDc-Y`e;=zr8PXXudh7te?DB4N^b}lR zx>o|ll^1~JcX?eI7%^qwa|8ra-nYp6rUmZ^@Bc2_o1-zZfILPJE~pOdZptVHWeK03 zB8ImSLLgnsr8 zfbfYC=$DLbQ6Q4w^Trri#pq}@Y7`UFnZp8-vFDkeOlNdWY6G(GNnN^D;dQ;E%~VN4 zZYm&DP$`81AOj6}TpQGf=5^@}MkW9x(*~*Mt`vKlV#v0JEyubr)T>-cuLhO+Q;0+k zjN-aHx+Ud4I&J_UV8CMvlmIN`HN^;Dbovn=-+eOA*Mn~vncUOP$Uj7<|D`Nw1bsO=+CSB#aFw!7#H6Du7MMa*kH=8mR* z8-s|eJUtLUWd?>;P6u{z4T;WSrH-QzUjRleQaobRc~HUJW@V_gN2#wfP__+}HLk^K;Q>#+fl#2o_?O3$1* zCX_+sgEx-PriC2pfF$c0ko-TLxwy9phe9;c4G1he;(s`$*RLZLdn}@&4fxHUU4xp07K5`^V;C6 zPF~JD-l^ml_lX6N+=_lq_pU9Bp4&V9;C?6sl9?fpOgzdv-y?_=9(jA4PTr@}&@Fqn zeL;wN4Z4d&DOSWBVxL)fNL%FsU|*Rim#~|ea{=0Ct{7t-VdDuzJ`n%EV}3Scr(w`H z77&4Gfh7P>zN|?<&*yNN{G{SXgd17Hy9AxsIjTge{NlMYL9Cm@4 zNxWom79-*3O<`N7A$);IdG3U;0Fpvp<&M}z%YFhFjb(dNEa2|LJC0B>+D0LlJ{78B zxMR_sniUmxU%HA$FappyxP)N_O;-+pu~;~kuQ#V*vK2rqqY>*lW@+>*d7X%tt?Enx zr92v72w)_y%&{y?W|o#M6}xUbzCyPH7iS2HK+=ht71kyegadQANQ#=xu$~Texoet* z(E|uUdtt?);jmPvPQNgN&bC@i_YBw~PA+L2s1uEQrtV5AyYY zG%CvvV(G4*nYZADX zb9Bp^1Z*<&J8{oa5Ie0Qh!un^ZwLS}9&g#+FSf`q)(PP>#Z3r2K*^N zEywLnyqv=Vw({B_dRX;3YI1Q{Dyg9=7D2A@38$1!Y`OF;&d=n$A!mXO3Q=_^F_u-)DUV6*S@r);eN? zK`l_3Kn5v;CyJ2oMp3GqI;^_k^F>YC$9r^gC^-6uwU;t=h?J;cpy*l|b>x`BY?$Oy z$9trVaiQ=o1k+CSm{M=JWw}F_TD4yV5fkHRM?D4-LnC4v>_CA61qu}C;ORdB1^}2W VD!C`v6y5*;002ovPDHLkV1hb*TzLQh From 98ed17615ac23195ac9b615552617825ba251dfd Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 7 Mar 2019 12:22:20 -0600 Subject: [PATCH 2/4] [NOISSUE] fix overrides in filters refactor --- .../filters/EntityAttributesFilter.java | 2 +- .../JPAEntityDescriptorServiceImpl.java | 14 +-- .../ui/service/JPAEntityServiceImpl.java | 87 +------------ .../util/ModelRepresentationConversions.java | 115 ++++++++++-------- .../AuxiliaryJPAEntityServiceTests.groovy | 3 +- .../admin/ui/util/TestObjectGenerator.groovy | 4 +- 6 files changed, 77 insertions(+), 148 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java index 86a2181c7..9d68c39b3 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/EntityAttributesFilter.java @@ -68,6 +68,6 @@ private void rebuildAttributes() { @PostLoad public void intoTransientRepresentation() { this.attributeRelease = getAttributeReleaseListFromAttributeList(this.attributes); - this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(attributes); + this.relyingPartyOverrides = getRelyingPartyOverridesRepresentationFromAttributeList(this.attributes); } } \ No newline at end of file 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 49823c008..5137773b5 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 @@ -66,6 +66,7 @@ import java.util.stream.Collectors; import static edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions.getStringListOfAttributeValues; +import static edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions.getValueFromXMLObject; /** * Default implementation of {@link EntityDescriptorService} @@ -684,18 +685,9 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope return representation; } + // TODO: remove private String getValueFromXMLObject(XMLObject xmlObject) { - String objectType = xmlObject.getClass().getSimpleName(); - switch (objectType) { - case "XSAny": - return ((XSAny)xmlObject).getTextContent(); - case "XSString": - return ((XSString)xmlObject).getValue(); - case "XSBoolean": - return ((XSBoolean)xmlObject).getStoredValue(); - default: - throw new RuntimeException(String.format("Unsupported XML Object type [%s]", objectType)); - } + return ModelRepresentationConversions.getValueFromXMLObject(xmlObject); } @Override diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java index 7afbac551..111adb394 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityServiceImpl.java @@ -17,6 +17,8 @@ import java.util.List; import java.util.Map; +import static edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions.getAttributeFromObjectAndRelyingPartyOverrideProperty; + public class JPAEntityServiceImpl implements EntityService { @Autowired @@ -64,95 +66,16 @@ public List getAttributeListFromEntityRepresentation(EntityDescriptor @Override public edu.internet2.tier.shibboleth.admin.ui.domain.Attribute getAttributeFromAttributeReleaseList(List attributeReleaseList) { - edu.internet2.tier.shibboleth.admin.ui.domain.Attribute attribute = ((AttributeBuilder) openSamlObjects - .getBuilderFactory() - .getBuilder(edu.internet2.tier.shibboleth.admin.ui.domain.Attribute.DEFAULT_ELEMENT_NAME)) - .buildObject(); - - attribute.setName(MDDCConstants.RELEASE_ATTRIBUTES); - - attributeReleaseList.forEach(attributeRelease -> { - XSString xsString = (XSString) openSamlObjects - .getBuilderFactory() - .getBuilder(XSString.TYPE_NAME) - .buildObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSString.TYPE_NAME); - xsString.setValue(attributeRelease); - attribute.getAttributeValues().add(xsString); - }); - - return attribute; + return (edu.internet2.tier.shibboleth.admin.ui.domain.Attribute) ModelRepresentationConversions.getAttributeListFromAttributeReleaseList(attributeReleaseList).get(0); } @Override public List getAttributeListFromAttributeReleaseList(List attributeReleaseList) { - List attributeList = new ArrayList<>(); - - if (attributeReleaseList != null && attributeReleaseList.size() > 0) { - attributeList.add(attributeUtility.createAttributeWithStringValues(MDDCConstants.RELEASE_ATTRIBUTES, attributeReleaseList)); - } - - return (List)(List)attributeList; - } - - edu.internet2.tier.shibboleth.admin.ui.domain.Attribute getAttributeFromObjectAndRelyingPartyOverrideProperty(Object o, RelyingPartyOverrideProperty overrideProperty) { - switch (ModelRepresentationConversions.AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) { - case BOOLEAN: - if ((o instanceof Boolean && ((Boolean)o)) || - (o instanceof String) && Boolean.valueOf((String)o)) { - if (overrideProperty.getPersistType() != null && - !overrideProperty.getPersistType().equalsIgnoreCase("boolean")) { - return attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - overrideProperty.getPersistValue()); - } else { - if (o instanceof String) { - return attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - Boolean.valueOf((String) o)); - } else { - Boolean value = Boolean.valueOf(overrideProperty.getInvert()) ^ (Boolean)o; - return attributeUtility.createAttributeWithBooleanValue(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - value); - } - } - } - return null; - case INTEGER: - return attributeUtility.createAttributeWithIntegerValue(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - Integer.valueOf((String) o)); - case STRING: - return attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (String) o); - case SET: - return attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (List) o); - case LIST: - return attributeUtility.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (List) o); - default: - throw new UnsupportedOperationException("getAttributeListFromRelyingPartyOverridesRepresentation was called with an unsupported type (" + overrideProperty.getDisplayType() + ")!"); - } + return ModelRepresentationConversions.getAttributeListFromAttributeReleaseList(attributeReleaseList); } @Override public List getAttributeListFromRelyingPartyOverridesRepresentation(Map relyingPartyOverridesRepresentation) { - List overridePropertyList = customPropertiesConfiguration.getOverrides(); - List list = new ArrayList<>(); - - for (Map.Entry entry : relyingPartyOverridesRepresentation.entrySet()) { - String key = (String) entry.getKey(); - RelyingPartyOverrideProperty overrideProperty = overridePropertyList.stream().filter(op -> op.getName().equals(key)).findFirst().get(); - edu.internet2.tier.shibboleth.admin.ui.domain.Attribute attribute = getAttributeFromObjectAndRelyingPartyOverrideProperty(entry.getValue(), overrideProperty); - if (attribute != null) { - list.add(attribute); - } - } - - return (List) (List) list; + return ModelRepresentationConversions.getAttributeListFromRelyingPartyOverridesRepresentation(relyingPartyOverridesRepresentation); } } 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 08c5431e2..afdae5ce7 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 @@ -127,9 +127,9 @@ public static Object getOverrideFromAttribute(Attribute attribute) { case BOOLEAN: if (relyingPartyOverrideProperty.getPersistType() != null && (!relyingPartyOverrideProperty.getPersistType().equalsIgnoreCase("boolean"))) { - return true; + return relyingPartyOverrideProperty.getPersistValue().equals(getValueFromXMLObject(attributeValues.get(0))); } else { - return Boolean.valueOf(((XSBoolean) attributeValues.get(0)).getStoredValue()); + return Boolean.valueOf(relyingPartyOverrideProperty.getInvert()) ^ Boolean.valueOf(((XSBoolean) attributeValues.get(0)).getStoredValue()); } case INTEGER: return ((XSInteger) attributeValues.get(0)).getValue(); @@ -147,6 +147,20 @@ public static Object getOverrideFromAttribute(Attribute attribute) { } } + public static String getValueFromXMLObject(XMLObject xmlObject) { + String objectType = xmlObject.getClass().getSimpleName(); + switch (objectType) { + case "XSAny": + return ((XSAny)xmlObject).getTextContent(); + case "XSString": + return ((XSString)xmlObject).getValue(); + case "XSBoolean": + return ((XSBoolean)xmlObject).getStoredValue(); + default: + throw new RuntimeException(String.format("Unsupported XML Object type [%s]", objectType)); + } + } + public static List getAttributeListFromAttributeReleaseList(List attributeReleaseList) { List attributeList = new ArrayList<>(); @@ -166,55 +180,9 @@ public static List getAttributeListFromA for (Map.Entry entry : relyingPartyOverridesRepresentation.entrySet()) { String key = (String) entry.getKey(); RelyingPartyOverrideProperty overrideProperty = overridePropertyList.stream().filter(op -> op.getName().equals(key)).findFirst().get(); - switch (AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) { - case BOOLEAN: - if (overrideProperty.getPersistType() != null && - !overrideProperty.getPersistType().equals(overrideProperty.getDisplayType())) { - list.add(ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - overrideProperty.getPersistValue())); - } else { - list.add(ATTRIBUTE_UTILITY.createAttributeWithBooleanValue(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (Boolean) entry.getValue())); - } - break; - case INTEGER: - list.add(ATTRIBUTE_UTILITY.createAttributeWithIntegerValue(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (Integer) entry.getValue())); - break; - case STRING: - list.add(ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - (String) entry.getValue())); - break; - case SET: - Set setValues; - if (entry.getValue() instanceof Set) { - setValues = (Set) entry.getValue(); - } else if (entry.getValue() instanceof List) { - setValues = new HashSet<>(); - setValues.addAll((List) entry.getValue()); - } else { - throw new UnsupportedOperationException("The collection passed from the UI is neither a Set or List. This shouldn't happen. Fix this!"); - } - if (setValues.size() > 0) { - list.add(ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - new ArrayList<>(setValues))); - } - break; - case LIST: - List listValues = (List) entry.getValue(); - if (listValues.size() > 0) { - list.add(ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), - overrideProperty.getAttributeFriendlyName(), - listValues)); - } - break; - default: - throw new UnsupportedOperationException("getAttributeListFromRelyingPartyOverridesRepresentation was called with an unsupported type (" + overrideProperty.getDisplayType() + ")!"); + Attribute attribute = getAttributeFromObjectAndRelyingPartyOverrideProperty(entry.getValue(), overrideProperty); + if (attribute != null) { + list.add(attribute); } } } @@ -222,6 +190,51 @@ public static List getAttributeListFromA return (List) (List) list; } + public static Attribute getAttributeFromObjectAndRelyingPartyOverrideProperty(Object o, RelyingPartyOverrideProperty overrideProperty) { + switch (ModelRepresentationConversions.AttributeTypes.valueOf(overrideProperty.getDisplayType().toUpperCase())) { + case BOOLEAN: + if ((o instanceof Boolean && ((Boolean)o)) || + (o instanceof String) && Boolean.valueOf((String)o)) { + if (overrideProperty.getPersistType() != null && + !overrideProperty.getPersistType().equalsIgnoreCase("boolean")) { + return ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + overrideProperty.getPersistValue()); + } else { + if (o instanceof String) { + return ATTRIBUTE_UTILITY.createAttributeWithBooleanValue(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + Boolean.valueOf((String) o)); + } else { + Boolean value = Boolean.valueOf(overrideProperty.getInvert()) ^ (Boolean)o; + return ATTRIBUTE_UTILITY.createAttributeWithBooleanValue(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + value); + } + } + } + return null; + case INTEGER: + return ATTRIBUTE_UTILITY.createAttributeWithIntegerValue(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + Integer.valueOf((String) o)); + case STRING: + return ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + (String) o); + case SET: + return ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + (List) o); + case LIST: + return ATTRIBUTE_UTILITY.createAttributeWithStringValues(overrideProperty.getAttributeName(), + overrideProperty.getAttributeFriendlyName(), + (List) o); + default: + throw new UnsupportedOperationException("getAttributeListFromRelyingPartyOverridesRepresentation was called with an unsupported type (" + overrideProperty.getDisplayType() + ")!"); + } + } + public enum AttributeTypes { BOOLEAN, diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/AuxiliaryJPAEntityServiceTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/AuxiliaryJPAEntityServiceTests.groovy index 92c2627aa..2e70f1884 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/AuxiliaryJPAEntityServiceTests.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/service/AuxiliaryJPAEntityServiceTests.groovy @@ -5,6 +5,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.RelyingPartyOverridePropert import edu.internet2.tier.shibboleth.admin.ui.domain.XSBoolean import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects import edu.internet2.tier.shibboleth.admin.util.AttributeUtility +import edu.internet2.tier.shibboleth.admin.util.ModelRepresentationConversions import spock.lang.Shared import spock.lang.Specification import spock.lang.Unroll @@ -33,7 +34,7 @@ class AuxiliaryJPAEntityServiceTests extends Specification { displayType: 'boolean', invert: 'true' ) - Attribute att = jpaEntityService.getAttributeFromObjectAndRelyingPartyOverrideProperty(input, overrideProperty) + Attribute att = ModelRepresentationConversions.getAttributeFromObjectAndRelyingPartyOverrideProperty(input, overrideProperty) expect: assert att && att.getAttributeValues()[0] instanceof XSBoolean && ((XSBoolean) att.getAttributeValues()[0]).value.value == output diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy index 5da927e25..982722ebd 100644 --- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy +++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy @@ -305,9 +305,9 @@ class TestObjectGenerator { case ModelRepresentationConversions.AttributeTypes.BOOLEAN: if (override.getPersistType() != null && override.getPersistType() != override.getDisplayType()) { - attributes.add(attributeUtility.createAttributeWithStringValues(override.getAttributeName(), override.getAttributeFriendlyName(), generator.randomString(30))) + attributes.add(attributeUtility.createAttributeWithStringValues(override.getAttributeName(), override.getAttributeFriendlyName(), override.persistValue)) } else { - attributes.add(attributeUtility.createAttributeWithBooleanValue(override.getAttributeName(), override.getAttributeFriendlyName(), true)) + attributes.add(attributeUtility.createAttributeWithBooleanValue(override.getAttributeName(), override.getAttributeFriendlyName(), Boolean.valueOf(override.invert) ^ true)) } break case ModelRepresentationConversions.AttributeTypes.INTEGER: From ab57ae1e9aa0bb14ea046b393abd6dfd403642ef Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 7 Mar 2019 13:39:18 -0600 Subject: [PATCH 3/4] [NOISSUE] fix default value --- .../shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy index 90e2d12e0..ab3ae6fda 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy @@ -38,7 +38,7 @@ class JsonSchemaBuilderService { description: it['helpText'], type : it['displayType']] if (it['displayType'] == 'boolean') { - property['default'] = (Boolean)(it['defaultValue']) + property['default'] = Boolean.valueOf(it['defaultValue']) } else { property['default'] = it['defaultValue'] } From 77359f87d4fcbfe0ce420c619ed2792341114df2 Mon Sep 17 00:00:00 2001 From: Jj! Date: Thu, 7 Mar 2019 14:20:25 -0600 Subject: [PATCH 4/4] [NOISSUE] get rid of a workaround --- .../ui/service/JPAEntityDescriptorServiceImpl.java | 3 --- .../admin/util/ModelRepresentationConversions.java | 11 ----------- 2 files changed, 14 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 5137773b5..9bbf5ec2a 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 @@ -676,9 +676,6 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope } } - // TODO: fix this; there is a problem with the way that defaults are working and the processing from the front end - ModelRepresentationConversions.completeMe(relyingPartyOverrides); - representation.setRelyingPartyOverrides(relyingPartyOverrides); } 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 afdae5ce7..b1669d8a9 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 @@ -99,17 +99,6 @@ public static Map getRelyingPartyOverridesRepresentationFromAttr return relyingPartyOverrides; } - // TODO: fix this; currently there is a problem with not returning a value - public static Map completeMe(Map relyingPartyOverrides) { - customPropertiesConfiguration - .getOverrides() - .stream() - .filter(o -> !relyingPartyOverrides.containsKey(o.getName())) - .filter(o -> o.getDisplayType().equals("boolean")) - .forEach(p -> relyingPartyOverrides.put(p.getName(), getDefaultValueFromProperty(p))); - return relyingPartyOverrides; - } - private static Object getDefaultValueFromProperty(RelyingPartyOverrideProperty property) { switch (property.getDisplayType()) { case "boolean":