From 4429b1eb929ffedf268c1beea5b06b027db3320a Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 24 Aug 2021 15:31:38 -0700
Subject: [PATCH] NOJIRA

default values (or lack of) causing issues
---
 .../JPAMetadataResolverServiceImpl.groovy     |  4 +-
 .../ui/domain/resolvers/MetadataResolver.java | 38 ++++++++++---------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
index 7ffb5b5f7..67a93bfca 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy
@@ -114,7 +114,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
                 if (metadataFilter instanceof NameIdFormatFilter) {
                     NameIdFormatFilter nameIdFormatFilter = NameIdFormatFilter.cast(metadataFilter)
                     NameIDFormatFilter openSamlTargetFilter = new OpenSamlNameIdFormatFilter()
-                    openSamlTargetFilter.removeExistingFormats = nameIdFormatFilter.removeExistingFormats
+                    openSamlTargetFilter.removeExistingFormats = nameIdFormatFilter.removeExistingFormats == null ? false : nameIdFormatFilter.removeExistingFormats
                     Map<Predicate<EntityDescriptor>, Collection<String>> predicateRules = [:]
                     def type = nameIdFormatFilter.nameIdFormatFilterTarget.nameIdFormatFilterTargetType
                     def values = nameIdFormatFilter.nameIdFormatFilterTarget.value
@@ -559,4 +559,4 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
 
     }
 
-}
+}
\ No newline at end of file
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
index 13d573b56..ee329a14c 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/MetadataResolver.java
@@ -84,31 +84,35 @@ public class MetadataResolver extends AbstractAuditable {
     @Transient
     private Integer version;
 
-    @JsonGetter("version")
-    public int getVersion() {
-        if (this.version != null && this.version != 0 ) {
-            return this.version;
-        }
-        return this.hashCode();
-    }
-
     public void addFilter(MetadataFilter metadataFilter) {
         //To make sure that Spring Data auditing infrastructure recognizes update and "touched" modifiedDate
         markAsModified();
         this.metadataFilters.add(metadataFilter);
     }
 
-    public void markAsModified() {
-        this.versionModifiedTimestamp = System.currentTimeMillis();
-    }
-
     public void entityAttributesFilterIntoTransientRepresentation() {
         //expose explicit API to call to convert into transient representation
         //used in unit/integration tests where JPA's @PostLoad callback execution engine is not available
         this.metadataFilters
-                .stream()
-                .filter(EntityAttributesFilter.class::isInstance)
-                .map(EntityAttributesFilter.class::cast)
-                .forEach(EntityAttributesFilter::intoTransientRepresentation);
+                        .stream()
+                        .filter(EntityAttributesFilter.class::isInstance)
+                        .map(EntityAttributesFilter.class::cast)
+                        .forEach(EntityAttributesFilter::intoTransientRepresentation);
+    }
+
+    public Boolean getDoInitialization() {
+        return doInitialization == null ? false : doInitialization;
+    }
+
+    @JsonGetter("version")
+    public int getVersion() {
+        if (this.version != null && this.version != 0 ) {
+            return this.version;
+        }
+        return this.hashCode();
+    }
+
+    public void markAsModified() {
+        this.versionModifiedTimestamp = System.currentTimeMillis();
     }
-}
+}
\ No newline at end of file