diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java index 375e91ad6..558af5789 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/service/EnversMetadataResolverVersionService.java @@ -1,14 +1,9 @@ package edu.internet2.tier.shibboleth.admin.ui.service; import edu.internet2.tier.shibboleth.admin.ui.domain.filters.EntityAttributesFilter; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.DynamicHttpMetadataResolver; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataRequestURLConstructionScheme; import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.MetadataResolver; -import edu.internet2.tier.shibboleth.admin.ui.domain.resolvers.RegexScheme; import edu.internet2.tier.shibboleth.admin.ui.domain.versioning.Version; import edu.internet2.tier.shibboleth.admin.ui.envers.EnversVersionServiceSupport; -import org.springframework.aop.framework.Advised; -import org.springframework.aop.support.AopUtils; import java.util.List; @@ -41,26 +36,8 @@ public MetadataResolver findSpecificVersionOfMetadataResolver(String resourceId, //The @PostLoad is not honored by Envers. So need to do this manually for EntityAttributesFilters //So the correct representation is built and returned to upstream clients expecting JSON resolver.entityAttributesFilterIntoTransientRepresentation(); - if (resolver instanceof DynamicHttpMetadataResolver) { - MetadataRequestURLConstructionScheme scheme = ((DynamicHttpMetadataResolver)resolver).getMetadataRequestURLConstructionScheme(); - RegexScheme rs = null; - try { - rs = getTargetObject(scheme, RegexScheme.class); - ((DynamicHttpMetadataResolver)resolver).setMetadataRequestURLConstructionScheme(rs); - } - catch (Exception e) { - } - } return resolver; - } - @SuppressWarnings({"unchecked"}) - protected T getTargetObject(Object proxy, Class targetClass) throws Exception { - if (AopUtils.isJdkDynamicProxy(proxy)) { - return (T) ((Advised)proxy).getTargetSource().getTarget(); - } else { - return (T) proxy; // expected to be cglib proxy then, which is simply a specialized class - } } } \ No newline at end of file