Merge branch 'bugfix/SHIBUI-1414' of bitbucket.org:unicon/shib-idp-ui…

… into feature/SHIBUI-1382
TIER · Aug 21, 2019 · 098b129 · 098b129
2 parents 10d03e7 + 4863ee6
commit 098b129
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
@@ -20,6 +20,7 @@ spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.h2.console.enabled=true
 
 # spring.jackson.default-property-inclusion=non_absent
+spring.jackson.default-property-inclusion=NON_NULL
 
 # Database Configuration PostgreSQL
 #spring.datasource.url=jdbc:postgresql://localhost:5432/shibui

diff --git a/...u/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerIntegrationTests.groovy b/...u/internet2/tier/shibboleth/admin/ui/controller/EntitiesControllerIntegrationTests.groovy
@@ -42,25 +42,16 @@ class EntitiesControllerIntegrationTests extends Specification {
     def "GET /api/entities returns the proper json"() {
         given:
         def expectedBody = '''
-            {
-                "id":null,
-                "serviceProviderName":null,
-                "entityId":"http://test.scaldingspoon.org/test1",
-                "organization":null,
-                "contacts":null,
-                "mdui":null,
+            {               
+                "entityId":"http://test.scaldingspoon.org/test1",                
                 "serviceProviderSsoDescriptor": {
                     "protocolSupportEnum":"SAML 2",
                     "nameIdFormats":["urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"]
-                },
-                "logoutEndpoints":null,
-                "securityInfo":null,
+                },                
                 "assertionConsumerServices":[
                     {"locationUrl":"https://test.scaldingspoon.org/test1/acs","binding":"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST","makeDefault":false}
                 ],
-                "serviceEnabled":false,
-                "createdDate":null,
-                "modifiedDate":null,
+                "serviceEnabled":false,                
                 "relyingPartyOverrides":{},
                 "attributeRelease":["givenName","employeeNumber"]
             }