From 13c387d840359994f386c89ccd1bb7ea25c60879 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Tue, 23 Aug 2022 14:02:35 -0700
Subject: [PATCH] SHIBUI-2270

SHIBUI-2354 fixing display issue for filter target type
---
 .../service/JPAMetadataResolverServiceImpl.groovy  |  2 +-
 .../ui/domain/filters/AlgorithmFilterTarget.java   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 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 cc7bc869e..ddd925e7c 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 {
                 method.setAlgorithm(algValue)
                 mkp.yieldUnescaped(openSamlObjects.marshalToXmlString(method, false))
             }
-            switch (filter.algorithmFilterTarget.targetType) {
+            switch (filter.algorithmFilterTarget.algorithmFilterTargetType) {
                 case AlgorithmFilterTarget.AlgorithmFilterTargetType.ENTITY:
                     filter.algorithmFilterTarget.value.each {
                         Entity(it)
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
index 0b881a987..8a80dba6a 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java
@@ -1,9 +1,12 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AbstractFilterTarget;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.envers.AuditOverride;
 import org.hibernate.envers.Audited;
@@ -17,15 +20,14 @@
 @AuditOverride(forClass = AbstractAuditable.class)
 @JsonIgnoreProperties({"handler", "hibernateLazyInitializer"})
 public class AlgorithmFilterTarget extends AbstractFilterTarget {
-    private AlgorithmFilterTargetType targetType;
+    @Getter
+    @Setter
+    private AlgorithmFilterTargetType algorithmFilterTargetType;
 
     @Override
+    @JsonIgnore
     public String getTargetTypeValue() {
-        return targetType == null ? "NONE" : targetType.name();
-    }
-
-    public void setAlgorithmFilterTargetType(AlgorithmFilterTargetType type) {
-        this.targetType = type;
+        return algorithmFilterTargetType == null ? "NONE" : algorithmFilterTargetType.name();
     }
 
     public enum AlgorithmFilterTargetType {