[SHIBUI-906]

Various fixes based on PR comments. Replaced groovy exception with Java class. Updated a couple groovy map assignments. Added lombok to RelyingPartyOverrideProperty.
TIER · Nov 8, 2018 · 561efb4 · 561efb4
1 parent c2f3a50
commit 561efb4
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 89 deletions.
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
@@ -1,11 +1,15 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
-import java.util.Collection;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.List;
 
 /**
  * @author Bill Smith (wsmith@unicon.net)
  */
+@Setter
+@Getter
 public class RelyingPartyOverrideProperty {
     private String name;
     private String displayName;
@@ -18,86 +22,6 @@ public class RelyingPartyOverrideProperty {
     private String attributeName;
     private String attributeFriendlyName;
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getDisplayName() {
-        return displayName;
-    }
-
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
-    }
-
-    public String getDisplayType() {
-        return displayType;
-    }
-
-    public void setDisplayType(String displayType) {
-        this.displayType = displayType;
-    }
-
-    public String getDefaultValue() {
-        return defaultValue;
-    }
-
-    public void setDefaultValue(String defaultValue) {
-        this.defaultValue = defaultValue;
-    }
-
-    public String getHelpText() {
-        return helpText;
-    }
-
-    public void setHelpText(String helpText) {
-        this.helpText = helpText;
-    }
-
-    public String getPersistType() {
-        return persistType;
-    }
-
-    public void setPersistType(String persistType) {
-        this.persistType = persistType;
-    }
-
-    public String getPersistValue() {
-        return persistValue;
-    }
-
-    public void setPersistValue(String persistValue) {
-        this.persistValue = persistValue;
-    }
-
-    public List<String> getDefaultValues() {
-        return defaultValues;
-    }
-
-    public void setDefaultValues(List<String> defaultValues) {
-        this.defaultValues = defaultValues;
-    }
-
-    public String getAttributeName() {
-        return attributeName;
-    }
-
-    public void setAttributeName(String attributeName) {
-        this.attributeName = attributeName;
-    }
-
-    public String getAttributeFriendlyName() {
-        return attributeFriendlyName;
-    }
-
-    public void setAttributeFriendlyName(String attributeFriendlyName) {
-        this.attributeFriendlyName = attributeFriendlyName;
-    }
-
     @Override
     public String toString() {
         return "RelyingPartyOverrideProperty{"

diff --git a/...sonSchemaValidationFailedException.groovy → .../JsonSchemaValidationFailedException.java b/...sonSchemaValidationFailedException.groovy → .../JsonSchemaValidationFailedException.java
@@ -1,4 +1,6 @@
-package edu.internet2.tier.shibboleth.admin.ui.jsonschema
+package edu.internet2.tier.shibboleth.admin.ui.jsonschema;
+
+import java.util.List;
 
 /**
  * Indicates JSON schema validation failure. Encapsulates a list of error messages produced by JSON schema validator
@@ -8,9 +10,9 @@
  */
 class JsonSchemaValidationFailedException extends RuntimeException {
 
-    def errors
+    List<String> errors;
 
     JsonSchemaValidationFailedException(List<String> errors) {
-        this.errors = errors
+        this.errors = errors;
     }
 }
diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy b/.../edu/internet2/tier/shibboleth/admin/ui/repository/MetadataResolverRepositoryTests.groovy
@@ -121,8 +121,7 @@ class MetadataResolverRepositoryTests extends Specification {
             it.name = 'updated'
             it.resourceId = 'new-filter-UUID'
             it.attributeRelease = ['attr-for-release', 'attr-for-release2']
-            it.relyingPartyOverrides = [:]
-            it.relyingPartyOverrides.put("signAssertion", false)
+            it.relyingPartyOverrides = ['signAssertion': false]
             it
         }
         metadataResolver = metadataResolverRepository.findAll().iterator().next()

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImplTests.groovy
@@ -7,7 +7,14 @@ import edu.internet2.tier.shibboleth.admin.ui.configuration.CustomPropertiesConf
 import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptor
 import edu.internet2.tier.shibboleth.admin.ui.domain.XSAny
 import edu.internet2.tier.shibboleth.admin.ui.domain.XSBoolean
-import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.*
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.AssertionConsumerServiceRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ContactRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.EntityDescriptorRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.LogoutEndpointRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.MduiRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.OrganizationRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.SecurityInfoRepresentation
+import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.ServiceProviderSsoDescriptorRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.opensaml.OpenSamlObjects
 import edu.internet2.tier.shibboleth.admin.ui.util.RandomGenerator
 import edu.internet2.tier.shibboleth.admin.ui.util.TestObjectGenerator
@@ -473,8 +480,7 @@ class JPAEntityDescriptorServiceImplTests extends Specification {
 
         def test = openSamlObjects.marshalToXmlString(service.createDescriptorFromRepresentation(new EntityDescriptorRepresentation().with {
             it.entityId = 'http://test.example.org/test1'
-            it.relyingPartyOverrides = [:]
-            it.relyingPartyOverrides["forceAuthn"] = true
+            it.relyingPartyOverrides = ['forceAuthn': true]
             it
         }))