SHIBUI-2270

SHIBUI-2354 fixing display issue for filter target type
TIER · Aug 23, 2022 · 13c387d · 13c387d
1 parent a434544
commit 13c387d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...oovy/edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImpl.groovy b/...oovy/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/...ain/java/edu/internet2/tier/shibboleth/admin/ui/domain/filters/AlgorithmFilterTarget.java b/...ain/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 {