[java-identity-provider] branch main updated: Pull deprecated Path-based APIs in module classes.
Scott Cantor
cantor.2 at osu.edu
Thu May 11 17:14:42 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor 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=cbc6ffb3d2179adac62d4a870508094e8bbbcb69
The following commit(s) were added to refs/heads/main by this push:
new cbc6ffb3d Pull deprecated Path-based APIs in module classes.
cbc6ffb3d is described below
commit cbc6ffb3d2179adac62d4a870508094e8bbbcb69
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu May 11 13:14:39 2023 -0400
Pull deprecated Path-based APIs in module classes.
---
.../net/shibboleth/idp/module/ModuleContext.java | 24 ----------------------
.../net/shibboleth/idp/module/IdPModuleTest.java | 2 +-
.../idp/admin/impl/LogImplementationDetails.java | 18 +++-------------
.../net/shibboleth/idp/installer/V4Install.java | 2 +-
.../installer/impl/CurrentInstallStateImpl.java | 2 +-
.../idp/installer/plugin/impl/PluginInstaller.java | 2 +-
.../idp/installer/plugin/impl/RollbackTester.java | 4 ++--
7 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/idp-admin-api/src/main/java/net/shibboleth/idp/module/ModuleContext.java b/idp-admin-api/src/main/java/net/shibboleth/idp/module/ModuleContext.java
index 1aae33d54..f5f263d0e 100644
--- a/idp-admin-api/src/main/java/net/shibboleth/idp/module/ModuleContext.java
+++ b/idp-admin-api/src/main/java/net/shibboleth/idp/module/ModuleContext.java
@@ -18,7 +18,6 @@
package net.shibboleth.idp.module;
import java.io.PrintStream;
-import java.nio.file.Path;
import java.util.List;
import java.util.Locale.LanguageRange;
@@ -66,29 +65,6 @@ public final class ModuleContext {
idpHome = Constraint.isNotEmpty(home, "Home location cannot be null or empty");
languageRanges = CollectionSupport.emptyList();
}
-
- /**
- * Constructor.
- *
- * @param home location of IdP install
- */
- public ModuleContext(@Nonnull final Path home) {
- this(home.toString());
- }
-
- /**
- * Gets software installation location.
- *
- * <p>Use the String variant to avoid Windows borkage.</p>
- *
- * @return install path
- *
- * @deprecated
- */
- @Deprecated(since="4.2", forRemoval=true)
- @Nonnull Path getIdPHome() {
- return Path.of(idpHome);
- }
/**
* Gets software installation location.
diff --git a/idp-admin-api/src/test/java/net/shibboleth/idp/module/IdPModuleTest.java b/idp-admin-api/src/test/java/net/shibboleth/idp/module/IdPModuleTest.java
index 9f92156af..896022d5f 100644
--- a/idp-admin-api/src/test/java/net/shibboleth/idp/module/IdPModuleTest.java
+++ b/idp-admin-api/src/test/java/net/shibboleth/idp/module/IdPModuleTest.java
@@ -86,7 +86,7 @@ public class IdPModuleTest {
testModule = opt.get().get();
testHome = Files.createTempDirectory("test-idp-home-");
- context = new ModuleContext(testHome);
+ context = new ModuleContext(testHome.toString());
final HttpClientBuilder builder = new HttpClientBuilder();
builder.setTLSSocketFactory(SecurityEnhancedHttpClientSupport.buildTLSSocketFactory(true, false));
diff --git a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/LogImplementationDetails.java b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/LogImplementationDetails.java
index 60096097a..db7bbae65 100644
--- a/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/LogImplementationDetails.java
+++ b/idp-admin-impl/src/main/java/net/shibboleth/idp/admin/impl/LogImplementationDetails.java
@@ -17,7 +17,6 @@
package net.shibboleth.idp.admin.impl;
-import java.nio.file.Path;
import java.util.List;
import java.util.ServiceLoader;
import java.util.stream.Collectors;
@@ -74,20 +73,9 @@ public final class LogImplementationDetails {
idpPlugin.getMinorVersion(), idpPlugin.getPatchVersion());
}
}
- Path idpHome;
- try {
- if (idpHomeLocation != null) {
- idpHome = Path.of(idpHomeLocation);
- } else {
- idpHome = null;
- }
- } catch (final RuntimeException e) {
- logger.info("Could not resolve idp.home from {} ", idpHomeLocation, e);
- idpHome = null;
- }
-
- if (idpHome != null) {
- final ModuleContext context = new ModuleContext(idpHome);
+
+ if (idpHomeLocation != null) {
+ final ModuleContext context = new ModuleContext(idpHomeLocation);
final List<IdPModule> modules = ServiceLoader.
load(IdPModule.class).
stream().
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 a8e5a6945..a6aa6f673 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
@@ -460,7 +460,7 @@ public class V4Install extends AbstractInitializableComponent {
* @throws BuildException if badness occurs
*/
protected void enableModules() throws BuildException {
- final ModuleContext moduleContext = new ModuleContext(installerProps.getTargetDir());
+ final ModuleContext moduleContext = new ModuleContext(installerProps.getTargetDir().toString());
final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class).iterator();
while (modules.hasNext()) {
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/CurrentInstallStateImpl.java
index c2900fa89..492cee600 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/CurrentInstallStateImpl.java
@@ -182,7 +182,7 @@ public final class CurrentInstallStateImpl extends AbstractInitializableComponen
if (getInstalledVersion() == null) {
return;
}
- final ModuleContext moduleContext = new ModuleContext(targetDir);
+ final ModuleContext moduleContext = new ModuleContext(targetDir.toString());
enabledModules = new HashSet<>();
final Iterator<IdPModule> modules = ServiceLoader.load(IdPModule.class).iterator();
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 4e03a8706..997ec6c09 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
@@ -930,7 +930,7 @@ public final class PluginInstaller extends AbstractInitializableComponent implem
throw new ComponentInitializationException(e);
}
assert idpHome != null;
- moduleContext = new ModuleContext(idpHome);
+ moduleContext = new ModuleContext(idpHome.toString());
moduleContext.setHttpClientSecurityParameters(securityParams);
moduleContext.setHttpClient(httpClient);
distPath = idpHome.resolve("dist");
diff --git a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/RollbackTester.java b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/RollbackTester.java
index 197c022c6..41674b6fc 100644
--- a/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/RollbackTester.java
+++ b/idp-installer/src/test/java/net/shibboleth/idp/installer/plugin/impl/RollbackTester.java
@@ -66,7 +66,7 @@ public class RollbackTester {
final IdPModule enabled2 = new TestModule("enabled2", null, new ModuleException());
final IdPModule disabled1 = new TestModule("disabled1", null, null);
final IdPModule disabled2 = new TestModule("disablde2", new ModuleException(), null);
- final ModuleContext ctx = new ModuleContext(mc);
+ final ModuleContext ctx = new ModuleContext(mc.toString());
try {
assertFalse(from.toFile().exists());
@@ -82,7 +82,7 @@ public class RollbackTester {
assertFalse(disabled1.isEnabled(ctx));
assertFalse(disabled2.isEnabled(ctx));
- try (final RollbackPluginInstall rp = new RollbackPluginInstall(new ModuleContext(parent), new HashMap<>())) {
+ try (final RollbackPluginInstall rp = new RollbackPluginInstall(new ModuleContext(parent.toString()), new HashMap<>())) {
rp.getFilesCopied().add(copied);
rp.getFilesRenamedAway().add(renamed);
rp.getModulesDisabled().add(disabled1);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list