[java-identity-provider] 03/05: IDP-1499 Installer: tighten up initialize checking

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=e93e44efb0f8baea4a294ab822f35204e49bd5d1

commit e93e44efb0f8baea4a294ab822f35204e49bd5d1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Oct 15 13:37:23 2019 +0100

    IDP-1499 Installer: tighten up initialize checking
    
    https://issues.shibboleth.net/jira/browse/IDP-1499
---
 .../src/main/java/net/shibboleth/idp/installer/CopyDistribution.java  | 1 +
 .../src/main/java/net/shibboleth/idp/installer/MetadataGenerator.java | 2 +-
 .../shibboleth/idp/installer/metadata/impl/MetadataGeneratorImpl.java | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/CopyDistribution.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/CopyDistribution.java
index 3b0f04b..831df9a 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/CopyDistribution.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/CopyDistribution.java
@@ -61,6 +61,7 @@ public final class CopyDistribution extends AbstractInitializableComponent {
      * @throws BuildException if badness occurs
      */
     public void execute() throws BuildException {
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         backupOld();
         deleteOld();
         copyDist();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/MetadataGenerator.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/MetadataGenerator.java
index d164c81..cc624fe 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/MetadataGenerator.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/MetadataGenerator.java
@@ -36,7 +36,7 @@ public interface MetadataGenerator extends InitializableComponent {
     public void setOutput(@Nonnull File file);
 
     /** Set a description of the IdP.
-     * @param what what to set.
+     * @param what what to set.  This component does not have to be initialized.
      */
     public void setParameters(@Nonnull final MetadataGeneratorParameters what);
 
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorImpl.java
index 5045482..9c63fe1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/impl/MetadataGeneratorImpl.java
@@ -64,6 +64,7 @@ import net.shibboleth.idp.saml.xmlobject.Scope;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.AbstractInitializableComponent;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
 import net.shibboleth.utilities.java.support.xml.XMLConstants;
@@ -162,11 +163,13 @@ public class MetadataGeneratorImpl extends AbstractInitializableComponent implem
 
     /** {@inheritDoc} */
     public void setOutput(@Nonnull final File file) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         output = Constraint.isNotNull(file, "provided file must be nonnull");
     }
 
     /** {@inheritDoc} */
     public void setParameters(@Nonnull final MetadataGeneratorParameters what) {
+        ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
         params = Constraint.isNotNull(what, "provided params must be nonnull");
     }
 
@@ -233,6 +236,7 @@ public class MetadataGeneratorImpl extends AbstractInitializableComponent implem
 
     /** {@inheritDoc} */
     public void generate() throws BuildException {
+        ComponentSupport.ifNotInitializedThrowUninitializedComponentException(this);
         try {
             writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
             writer.newLine();

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.