[java-identity-provider] 04/09: IDP-2106 Remove all API interfaces from the installer
Rod Widdowson
rdw at steadingsoftware.com
Thu May 18 10:21:50 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3f3109a34f559cf401b0b574d064401b56f5b273
commit 3f3109a34f559cf401b0b574d064401b56f5b273
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed May 17 13:37:11 2023 +0100
IDP-2106 Remove all API interfaces from the installer
https://shibboleth.atlassian.net/browse/IDP-2106
Rename the CurrentInstallState class CurrentInstall
---
.../src/main/java/net/shibboleth/idp/installer/BuildWar.java | 4 ++--
.../java/net/shibboleth/idp/installer/CopyDistribution.java | 6 +++---
.../src/main/java/net/shibboleth/idp/installer/V4Install.java | 10 +++++-----
.../net/shibboleth/idp/installer/ant/impl/V4InstallTask.java | 6 +++---
.../{CurrentInstallStateImpl.java => CurrentInstallState.java} | 10 +++++-----
.../main/java/net/shibboleth/idp/installer/impl/Installer.java | 2 +-
.../src/test/java/net/shibboleth/idp/installer/Test.java | 4 ++--
7 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
index fb9c35ea9..c46995d7f 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/BuildWar.java
@@ -29,7 +29,7 @@ import org.apache.tools.ant.taskdefs.Jar;
import org.slf4j.Logger;
import net.shibboleth.idp.Version;
-import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.impl.CurrentInstallState;
import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -61,7 +61,7 @@ public final class BuildWar extends AbstractInitializableComponent {
* @param props The environment for the work.
* @param installState Where we are right now.
*/
- public BuildWar(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallStateImpl installState) {
+ public BuildWar(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallState installState) {
if (!props.isInitialized()) {
throw new UninitializedComponentException("Installer Properties not initialized");
}
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 79bccee2f..c410e7381 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
@@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.taskdefs.Copy;
import org.slf4j.Logger;
-import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.impl.CurrentInstallState;
import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.UninitializedComponentException;
@@ -46,13 +46,13 @@ public final class CopyDistribution extends AbstractInitializableComponent {
@Nonnull private final InstallerProperties installerProps;
/** The state of the current install. */
- @Nonnull private final CurrentInstallStateImpl installState;
+ @Nonnull private final CurrentInstallState installState;
/** Constructor.
* @param props The environment for the work.
* @param state Where we are right now.
*/
- public CopyDistribution(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallStateImpl state) {
+ public CopyDistribution(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallState state) {
if (!props.isInitialized()) {
throw new UninitializedComponentException("Installer Properties not Initialized");
}
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
index 016c5659f..330dc3c2d 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/V4Install.java
@@ -47,7 +47,7 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import net.shibboleth.idp.Version;
-import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.impl.CurrentInstallState;
import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.installer.plugin.impl.PluginState;
import net.shibboleth.idp.module.IdPModule;
@@ -78,7 +78,7 @@ public class V4Install extends AbstractInitializableComponent {
@Nonnull private final InstallerProperties installerProps;
/** Current Install. */
- @Nonnull private final CurrentInstallStateImpl currentState;
+ @Nonnull private final CurrentInstallState currentState;
/** Key Manager. */
@Nonnull private final KeyManagement keyManager;
@@ -90,7 +90,7 @@ public class V4Install extends AbstractInitializableComponent {
* @param props The properties to drive the installs.
* @param installState The current install.
*/
- public V4Install(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallStateImpl installState) {
+ public V4Install(@Nonnull final InstallerProperties props, @Nonnull final CurrentInstallState installState) {
if (!props.isInitialized()) {
throw new UninitializedComponentException("Installer Properties not Initialized");
}
@@ -536,7 +536,7 @@ public class V4Install extends AbstractInitializableComponent {
@Nonnull private final InstallerProperties installerProps;
/** Current Install. */
- @Nonnull private final CurrentInstallStateImpl currentState;
+ @Nonnull private final CurrentInstallState currentState;
/** Did we create idp-signing.*?*/
private boolean createdSigning;
@@ -555,7 +555,7 @@ public class V4Install extends AbstractInitializableComponent {
* @param installState - about where we installing into.
*/
protected KeyManagement(@Nonnull final InstallerProperties props,
- @Nonnull final CurrentInstallStateImpl installState) {
+ @Nonnull final CurrentInstallState installState) {
if (!props.isInitialized()) {
throw new UninitializedComponentException("Installer Properties not Initialized");
}
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
index ce3dfa511..4e64bdc44 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/ant/impl/V4InstallTask.java
@@ -30,7 +30,7 @@ import net.shibboleth.idp.installer.BuildWar;
import net.shibboleth.idp.installer.CopyDistribution;
import net.shibboleth.idp.installer.InstallerPropertiesImpl;
import net.shibboleth.idp.installer.V4Install;
-import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.impl.CurrentInstallState;
import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorImpl;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
@@ -81,9 +81,9 @@ public class V4InstallTask extends Task {
e-> (String) e.getValue(),
CollectionSupport.warningMergeFunction("InstallerProperties", true))));
- final CurrentInstallStateImpl is;
+ final CurrentInstallState is;
ip.initialize();
- is = new CurrentInstallStateImpl(ip);
+ is = new CurrentInstallState(ip);
is.initialize();
if (copyInstall) {
final CopyDistribution dist = new CopyDistribution(ip, is);
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
similarity index 97%
rename from idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java
rename to idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
index 125ce8877..dd5ee5410 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallStateImpl.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/CurrentInstallState.java
@@ -59,10 +59,10 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.primitive.LoggerFactory;
/** Tells the installers about the current install state. */
-public final class CurrentInstallStateImpl extends AbstractInitializableComponent {
+public final class CurrentInstallState extends AbstractInitializableComponent {
/** Class logger. */
- @Nonnull private final Logger log = InstallationLogger.getLogger(CurrentInstallStateImpl.class);
+ @Nonnull private final Logger log = InstallationLogger.getLogger(CurrentInstallState.class);
/** Where we are installing to. */
@Nonnull private final Path targetDir;
@@ -97,7 +97,7 @@ public final class CurrentInstallStateImpl extends AbstractInitializableComponen
/** Constructor.
* @param installerProps the installer situation.
*/
- public CurrentInstallStateImpl(final InstallerProperties installerProps) {
+ public CurrentInstallState(final InstallerProperties installerProps) {
targetDir = installerProps.getTargetDir();
enabledModules = CollectionSupport.emptySet();
}
@@ -120,13 +120,13 @@ public final class CurrentInstallStateImpl extends AbstractInitializableComponen
try {
vers.load(new FileInputStream(currentInstall.toFile()));
} catch (final IOException e) {
- LoggerFactory.getLogger(CurrentInstallStateImpl.class).
+ LoggerFactory.getLogger(CurrentInstallState.class).
error("Could not load {}", currentInstall.toAbsolutePath(), e);
throw new ComponentInitializationException(e);
}
oldVersion = vers.getProperty(InstallerSupport.VERSION_NAME);
if (null == oldVersion) {
- LoggerFactory.getLogger(CurrentInstallStateImpl.class).
+ LoggerFactory.getLogger(CurrentInstallState.class).
error("Failed loading {}", currentInstall.toAbsolutePath());
throw new ComponentInitializationException("File " + InstallerSupport.VERSION_NAME +
" did not contain property " + InstallerSupport.VERSION_NAME);
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/Installer.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/Installer.java
index a129f03bd..20b7818c2 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/Installer.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/impl/Installer.java
@@ -56,7 +56,7 @@ public final class Installer {
}
final InstallerPropertiesImpl ip = new InstallerPropertiesImpl(!copyInstall);
ip.initialize();
- final CurrentInstallStateImpl is = new CurrentInstallStateImpl(ip);
+ final CurrentInstallState is = new CurrentInstallState(ip);
is.initialize();
if (copyInstall) {
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
index 2a0e23d9b..54f7415df 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/Test.java
@@ -19,7 +19,7 @@ package net.shibboleth.idp.installer;
import java.io.IOException;
-import net.shibboleth.idp.installer.impl.CurrentInstallStateImpl;
+import net.shibboleth.idp.installer.impl.CurrentInstallState;
import net.shibboleth.idp.installer.metadata.impl.MetadataGeneratorImpl;
import net.shibboleth.shared.component.ComponentInitializationException;
/**
@@ -46,7 +46,7 @@ public class Test {
final InstallerProperties ip = new InstallerPropertiesImpl(false);
ip.initialize();
- final CurrentInstallStateImpl is = new CurrentInstallStateImpl(ip);
+ final CurrentInstallState is = new CurrentInstallState(ip);
is.initialize();
final CopyDistribution dist = new CopyDistribution(ip, is);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list