SHIBUI-2269

corrections and fixes
TIER · Jun 29, 2022 · 1db6d3d · 1db6d3d
1 parent c5161d6
commit 1db6d3d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 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
@@ -288,7 +288,7 @@ class JPAMetadataResolverServiceImpl implements MetadataResolverService {
     }
 
     void constructXmlNodeForResolver(ExternalMetadataResolver resolver, def markupBuilderDelegate, Closure childNodes) {
-        markupBuilderDelegate.MetadataFilters(providerRef: 'InCommonMD') {
+        markupBuilderDelegate.MetadataFilters(providerRef: resolver.getXmlId()) {
             childNodes()
         }
     }

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/controller/MetadataResolversController.java
@@ -82,7 +82,7 @@ public ResponseEntity<?> unableToParseJson(Exception ex) {
         return ResponseEntity.badRequest().body(new ErrorResponse(HttpStatus.BAD_REQUEST.toString(), ex.getMessage(), ex.getCause().getMessage()));
     }
 
-    @GetMapping("/MetadataResolvers")
+    @GetMapping(value = "/MetadataResolvers", produces = "application/json")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getAll() {
         List<MetadataResolver> resolvers = positionOrderContainerService.getAllMetadataResolversInDefinedOrderOrUnordered();
@@ -92,7 +92,6 @@ public ResponseEntity<?> getAll() {
     @GetMapping(value = "/MetadataResolvers", produces = "application/xml")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getXml() throws IOException, TransformerException {
-        // TODO: externalize
         try (StringWriter writer = new StringWriter()) {
             Transformer transformer = TransformerFactory.newInstance().newTransformer();
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");
@@ -106,7 +105,6 @@ public ResponseEntity<?> getXml() throws IOException, TransformerException {
     @GetMapping(value = "/MetadataResolvers/External", produces = "application/xml")
     @Transactional(readOnly = true)
     public ResponseEntity<?> getExternalXml() throws IOException, TransformerException {
-        // TODO: externalize
         try (StringWriter writer = new StringWriter()) {
             Transformer transformer = TransformerFactory.newInstance().newTransformer();
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");

diff --git a/...ava/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java b/...ava/edu/internet2/tier/shibboleth/admin/ui/domain/resolvers/ExternalMetadataResolver.java
@@ -19,9 +19,6 @@ public class ExternalMetadataResolver extends MetadataResolver {
     @Column
     private String description;
 
-    @Column(unique = true)
-    private String externalResolverId;
-
     @Column
     String name;
 

diff --git a/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy b/...edu/internet2/tier/shibboleth/admin/ui/service/JPAMetadataResolverServiceImplTests.groovy
@@ -97,7 +97,7 @@ class JPAMetadataResolverServiceImplTests extends AbstractBaseDataJpaTest {
         def resolver = new ExternalMetadataResolver().with {
             it.setEnabled(true)
             it.setName("testme")
-            it.setExternalResolverId("InCommonMD")
+            it.setXmlId("InCommonMD")
             it.setDescription("some description that won't appear in the xml")
             it.addFilter(new EntityAttributesFilter().with {
                 it.name = 'EntityAttributes'