SHIBUI-2268

Refactoring and simplifying code related to AlgorithmFilter
TIER · Aug 9, 2022 · 2f1326c · 2f1326c
1 parent ae97066
commit 2f1326c
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 13 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
@@ -11,8 +11,8 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityRoleWhiteList
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AlgorithmFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AlgorithmFilterTarget
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AlgorithmFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AlgorithmFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.opensaml.OpenSamlNameIdFormatFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ExternalMetadataResolver

diff --git a/...ithm/AbstractAlgorithmIdentifierType.java → ...main/AbstractAlgorithmIdentifierType.java b/...ithm/AbstractAlgorithmIdentifierType.java → ...main/AbstractAlgorithmIdentifierType.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm;
+package edu.internet2.tier.shibboleth.admin.ui.domain;
 
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractXMLObject;
 import lombok.EqualsAndHashCode;

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/MGF.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/MGF.java
@@ -1,6 +1,5 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AbstractAlgorithmIdentifierType;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OtherSource.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/OtherSource.java
@@ -1,6 +1,5 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AbstractAlgorithmIdentifierType;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PRF.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/domain/PRF.java
@@ -1,6 +1,5 @@
 package edu.internet2.tier.shibboleth.admin.ui.domain;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AbstractAlgorithmIdentifierType;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...in/filters/algorithm/AlgorithmFilter.java → ...in/ui/domain/filters/AlgorithmFilter.java b/...in/filters/algorithm/AlgorithmFilter.java → ...in/ui/domain/filters/AlgorithmFilter.java
@@ -1,8 +1,5 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm;
+package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.IFilterTarget;
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.ITargetable;
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ters/algorithm/AlgorithmFilterTarget.java → ...domain/filters/AlgorithmFilterTarget.java b/...ters/algorithm/AlgorithmFilterTarget.java → ...domain/filters/AlgorithmFilterTarget.java
@@ -1,4 +1,4 @@
-package edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm;
+package edu.internet2.tier.shibboleth.admin.ui.domain.filters;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import edu.internet2.tier.shibboleth.admin.ui.domain.AbstractAuditable;

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -11,7 +11,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFil
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.MetadataFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AlgorithmFilterTarget
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AlgorithmFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ClasspathMetadataResource
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ExternalMetadataResolver

diff --git a/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy b/...nd/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/util/TestObjectGenerator.groovy
@@ -17,7 +17,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.NameIdFormatFilterTarget
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.RequiredValidUntilFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.filters.SignatureValidationFilter
-import edu.internet2.tier.shibboleth.admin.ui.domain.filters.algorithm.AlgorithmFilter
+import edu.internet2.tier.shibboleth.admin.ui.domain.filters.AlgorithmFilter
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.FilterRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.domain.frontend.FilterTargetRepresentation
 import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.ClasspathMetadataResource