[SHIBUI-1253]

fix property condition include writing of metadata providers
TIER · May 30, 2019 · 714a7da · 714a7da
1 parent c1a55bf
commit 714a7da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java b/...edu/internet2/tier/shibboleth/admin/ui/scheduled/EntityDescriptorFilesScheduledTasks.java
@@ -35,7 +35,7 @@
  * @since 1.0
  */
 @Configuration
-@ConditionalOnProperty(name = "shibui-metadata-dir")
+@ConditionalOnProperty(name = "shibui.metadata-dir")
 public class EntityDescriptorFilesScheduledTasks {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(EntityDescriptorFilesScheduledTasks.class);

diff --git a/...ava/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java b/...ava/edu/internet2/tier/shibboleth/admin/ui/scheduled/MetadataProvidersScheduledTasks.java
@@ -19,6 +19,7 @@
 import javax.xml.transform.stream.StreamResult;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.StringWriter;
 
 @Configuration
 @ConditionalOnProperty("shibui.metadataProviders.target")
@@ -38,13 +39,14 @@ public MetadataProvidersScheduledTasks(Resource target, MetadataResolverService
     @Scheduled(fixedRateString = "${shibui.metadataProviders.taskRunRate:30000}")
     @Transactional(readOnly = true)
     public void generateMetadataProvidersFile() {
-        try (OutputStream os = ((WritableResource)target).getOutputStream()) {
+        try (StringWriter os = new StringWriter()) {
             Transformer transformer = TransformerFactory.newInstance().newTransformer();
             transformer.setOutputProperty(OutputKeys.INDENT, "yes");
             transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
 
 
             transformer.transform(new DOMSource(metadataResolverService.generateConfiguration()), new StreamResult(os));
+            this.fileWritingService.write((WritableResource)this.target, os.toString());
         } catch (IOException | TransformerException e) {
             logger.error(e.getLocalizedMessage(), e);
         }