[java-identity-provider] 01/09: IDP-2115 Plugin Installer is doing logging wrongly
Rod Widdowson
rdw at steadingsoftware.com
Tue May 23 08:23:09 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=34552692387b7231932d0d7d49d88fb1297e08eb
commit 34552692387b7231932d0d7d49d88fb1297e08eb
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat May 20 16:21:10 2023 +0100
IDP-2115 Plugin Installer is doing logging wrongly
https://shibboleth.atlassian.net/browse/IDP-2115
We do not need to use the InstallationLogger any more.
---
.../java/net/shibboleth/idp/installer/plugin/impl/PluginInfo.java | 6 +++---
.../net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java | 3 ++-
.../idp/installer/plugin/impl/PluginInstallerArguments.java | 4 ++--
.../idp/installer/plugin/impl/PluginInstallerSupport.java | 4 ++--
.../java/net/shibboleth/idp/installer/plugin/impl/PluginState.java | 4 ++--
.../shibboleth/idp/installer/plugin/impl/RollbackPluginInstall.java | 4 ++--
.../java/net/shibboleth/idp/installer/plugin/impl/TrustStore.java | 4 ++--
7 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInfo.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInfo.java
index 28736e8fa..11df4cfad 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInfo.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInfo.java
@@ -29,14 +29,14 @@ import javax.annotation.Nullable;
import org.slf4j.Logger;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.installer.plugin.impl.PluginState.VersionInfo;
import net.shibboleth.idp.plugin.PluginSupport;
import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
+import net.shibboleth.idp.plugin.PluginVersion;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
-import net.shibboleth.idp.plugin.PluginVersion;
/**
* Class which encapsulates the information about a given plugin as downloaded
@@ -48,7 +48,7 @@ public class PluginInfo {
private static final Pattern SPACE_CONTAINING = Pattern.compile("\\s+");
/** Class logger. */
- @Nonnull private final Logger log = InstallationLogger.getLogger(PluginInfo.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(PluginInfo.class);
/** The support information. */
@Nonnull private final Map<PluginVersion, VersionInfo> versionInfo = new HashMap<>();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
index e121ce71b..7bb5c8c9b 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstaller.java
@@ -84,6 +84,7 @@ import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
import net.shibboleth.shared.logic.PredicateSupport;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
import net.shibboleth.shared.resource.Resource;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
@@ -94,7 +95,7 @@ import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
public final class PluginInstaller extends AbstractInitializableComponent implements AutoCloseable {
/** Class logger. */
- @Nonnull private static final Logger LOG = InstallationLogger.getLogger(PluginInstaller.class);
+ @Nonnull private static final Logger LOG = LoggerFactory.getLogger(PluginInstaller.class);
/** Property Name for version. */
private static final String PLUGIN_VERSION_PROPERTY ="idp.plugin.version";
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
index a84dbc436..9875ae494 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerArguments.java
@@ -32,9 +32,9 @@ import org.slf4j.Logger;
import com.beust.jcommander.Parameter;
import net.shibboleth.idp.cli.AbstractIdPHomeAwareCommandLineArguments;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.plugin.PluginVersion;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.primitive.StringSupport;
/**
@@ -147,7 +147,7 @@ public class PluginInstallerArguments extends AbstractIdPHomeAwareCommandLineArg
/** {@inheritDoc} */
public @Nonnull Logger getLog() {
if (log == null) {
- log = InstallationLogger.getLogger(PluginInstallerArguments.class);
+ log = LoggerFactory.getLogger(PluginInstallerArguments.class);
}
assert log != null;
return log;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerSupport.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerSupport.java
index 35d3f7b6b..bb185e548 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerSupport.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginInstallerSupport.java
@@ -34,9 +34,9 @@ import org.apache.tools.ant.BuildException;
import org.slf4j.Logger;
import net.shibboleth.idp.installer.InstallerSupport;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.collection.Pair;
+import net.shibboleth.shared.primitive.LoggerFactory;
/**
* Support for copying files during plugin manipulation.
@@ -45,7 +45,7 @@ public final class PluginInstallerSupport {
/** Class logger. */
@Nonnull
- private static final Logger LOG = InstallationLogger.getLogger(PluginInstallerSupport.class);
+ private static final Logger LOG = LoggerFactory.getLogger(PluginInstallerSupport.class);
/** Constructor. */
private PluginInstallerSupport() {
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
index a48966bae..d0150518d 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/PluginState.java
@@ -29,7 +29,6 @@ import org.slf4j.Logger;
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.plugin.IdPPlugin;
import net.shibboleth.idp.plugin.PluginSupport.SupportLevel;
import net.shibboleth.idp.plugin.PluginVersion;
@@ -38,6 +37,7 @@ import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
/**
@@ -56,7 +56,7 @@ public class PluginState extends AbstractInitializableComponent {
@Nonnull private final PluginVersion myPluginVersion;
/** Class logger. */
- @Nonnull private final Logger log = InstallationLogger.getLogger(PluginState.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(PluginState.class);
/** The HttpClient to use.*/
@NonnullAfterInit private HttpClient httpClient;
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/RollbackPluginInstall.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/RollbackPluginInstall.java
index 08aa071d0..076d2c1d1 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/RollbackPluginInstall.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/RollbackPluginInstall.java
@@ -34,7 +34,6 @@ import javax.annotation.Nonnull;
import org.slf4j.Logger;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.idp.module.IdPModule;
import net.shibboleth.idp.module.IdPModule.ModuleResource;
import net.shibboleth.idp.module.IdPModule.ResourceResult;
@@ -44,6 +43,7 @@ import net.shibboleth.shared.annotation.constraint.Live;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.collection.Pair;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
/** An object which does installation rollback in its {@link AutoCloseable#close()} method.
*
@@ -51,7 +51,7 @@ import net.shibboleth.shared.logic.Constraint;
public class RollbackPluginInstall implements AutoCloseable {
/** logger. */
- @Nonnull private final Logger log = InstallationLogger.getLogger(RollbackPluginInstall.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(RollbackPluginInstall.class);
/** The modules enabled when the {@link IdPPlugin} was installed. */
@Live @Nonnull private List<IdPModule> modulesEnabled = new ArrayList<>();
diff --git a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/TrustStore.java b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/TrustStore.java
index 36b5b6525..d35926fb9 100644
--- a/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/TrustStore.java
+++ b/idp-installer/src/main/java/net/shibboleth/idp/installer/plugin/impl/TrustStore.java
@@ -46,12 +46,12 @@ import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProv
import org.bouncycastle.util.encoders.Hex;
import org.slf4j.Logger;
-import net.shibboleth.idp.installer.impl.InstallationLogger;
import net.shibboleth.shared.annotation.constraint.NonnullAfterInit;
import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.AbstractInitializableComponent;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.logic.Constraint;
+import net.shibboleth.shared.primitive.LoggerFactory;
/**
* Code to handle (load, update, check) the trust store for an individual plugin.
@@ -60,7 +60,7 @@ import net.shibboleth.shared.logic.Constraint;
@NotThreadSafe public final class TrustStore extends AbstractInitializableComponent {
/** logger. */
- @Nonnull private final Logger log = InstallationLogger.getLogger(TrustStore.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(TrustStore.class);
/** Where the IdP is installed. */
@NonnullAfterInit private Path idpHome;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list