SHIBUI-2380

fixing NPE issue
TIER · Oct 7, 2022 · 6dff6c8 · 6dff6c8
1 parent 0145004
commit 6dff6c8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy b/...ain/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JsonSchemaBuilderService.groovy
@@ -48,7 +48,7 @@ class JsonSchemaBuilderService {
     void addRelyingPartyOverridesToJson(Object json, String protocol) {
         def properties = [:]
         customPropertiesConfiguration.getOverrides().stream().filter {
-            it -> it.protocol.contains(protocol)
+            it -> it.getProtocol().contains(protocol)
         }.each {
             if (it.protocol)
             def property
@@ -73,7 +73,7 @@ class JsonSchemaBuilderService {
 
     void addRelyingPartyOverridesCollectionDefinitionsToJson(Object json, String protocol) {
         customPropertiesConfiguration.getOverrides().stream().filter {
-            it -> it.protocol.contains(protocol) && it['displayType'] && (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list')
+            it -> it.getProtocol().contains(protocol) && it['displayType'] && (it['displayType'] == 'list' || it['displayType'] == 'set' || it['displayType'] == 'selection_list')
         }.each {
             def definition = [title      : it['displayName'],
                               description: it['helpText'],

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/domain/CustomEntityAttributeDefinition.java
@@ -12,6 +12,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.Transient;
 
+import liquibase.pro.packaged.O;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
@@ -94,7 +95,12 @@ public String getTypeForUI() {
             return "string";            
         }
     }
-
+
+    @Override
+    public String getProtocol() {
+        return protocol == null ? "saml, oidc" : protocol;
+    }
+
     @Override
     public void setDefaultValues(Set<String> defaultValues) {
         // This is here to comply with the interface only and should not be used to change the set of values in this implementation

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/domain/RelyingPartyOverrideProperty.java
@@ -45,6 +45,7 @@ public CustomAttributeType getAttributeType() {
         }
     }
 
+    @Override
     public String getProtocol() {
         return protocol == null ? "saml, oidc" : protocol;
     }