[CMTOOL-370] skip migration to elytron tasks if there are no legacy s…

…ecurity resources
wildfly · May 16, 2024 · e6cde32 · e6cde32
1 parent 596171b
commit e6cde32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...in/java/org/jboss/migration/wfly/task/security/MigrateLegacySecurityDomainsToElytron.java b/...in/java/org/jboss/migration/wfly/task/security/MigrateLegacySecurityDomainsToElytron.java
@@ -73,7 +73,7 @@ protected UpdateSubsystems(final LegacySecurityConfigurations legacySecurityConf
                 ServerMigrationTaskResult taskResult = ServerMigrationTaskResult.SKIPPED;
                 final SubsystemResource subsystemResource = params.getResource();
                 final LegacySecurityConfiguration legacySecurityConfiguration = legacySecurityConfigurations.getSecurityConfigurations().get(subsystemResource.getServerConfiguration().getConfigurationPath().getPath().toString());
-                if (legacySecurityConfiguration != null) {
+                if (legacySecurityConfiguration != null && legacySecurityConfiguration.requiresMigration()) {
                     if (migrateSubsystemEJB3(legacySecurityConfiguration, subsystemResource, context)) {
                         taskResult = ServerMigrationTaskResult.SUCCESS;
                     }

diff --git a/...ain/java/org/jboss/migration/wfly/task/security/MigrateLegacySecurityRealmsToElytron.java b/...ain/java/org/jboss/migration/wfly/task/security/MigrateLegacySecurityRealmsToElytron.java
@@ -92,7 +92,7 @@ protected MigrateToElytron(final LegacySecurityConfigurations legacySecurityConf
             final ManageableResourceTaskRunnableBuilder<S, SubsystemResource> runnableBuilder = params -> context -> {
                 final SubsystemResource subsystemResource = params.getResource();
                 final LegacySecurityConfiguration legacySecurityConfiguration = legacySecurityConfigurations.getSecurityConfigurations().get(subsystemResource.getServerConfiguration().getConfigurationPath().getPath().toString());
-                if (legacySecurityConfiguration == null) {
+                if (legacySecurityConfiguration == null || !legacySecurityConfiguration.requiresMigration()) {
                     return ServerMigrationTaskResult.SKIPPED;
                 }
                 migrateSecurityRealms(legacySecurityConfiguration, subsystemResource, context);