Merge pull request quarkusio#7946 from stuartwdouglas/3227

Remove usage of deprecated WildFlyElytronProvide
stuartwdouglas · Mar 19, 2020 · 895da87 · 895da87
2 parents 85e2ff7 + f07f763
commit 895da87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...on-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcRecorder.java b/...on-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcRecorder.java
@@ -5,12 +5,12 @@
 
 import javax.sql.DataSource;
 
-import org.wildfly.security.WildFlyElytronProvider;
 import org.wildfly.security.auth.realm.jdbc.JdbcSecurityRealm;
 import org.wildfly.security.auth.realm.jdbc.JdbcSecurityRealmBuilder;
 import org.wildfly.security.auth.realm.jdbc.QueryBuilder;
 import org.wildfly.security.auth.realm.jdbc.mapper.AttributeMapper;
 import org.wildfly.security.auth.server.SecurityRealm;
+import org.wildfly.security.password.WildFlyElytronPasswordProvider;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.runtime.RuntimeValue;
@@ -19,7 +19,7 @@
 @Recorder
 public class JdbcRecorder {
 
-    private static final Provider[] PROVIDERS = new Provider[] { new WildFlyElytronProvider() };
+    private static final Provider[] PROVIDERS = new Provider[] { new WildFlyElytronPasswordProvider() };
 
     /**
      * Create a runtime value for a {@linkplain JdbcSecurityRealm}

diff --git a/...erties-file/deployment/src/test/java/io/quarkus/security/test/SecurityRealmsTestCase.java b/...erties-file/deployment/src/test/java/io/quarkus/security/test/SecurityRealmsTestCase.java
@@ -11,7 +11,6 @@
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.wildfly.security.WildFlyElytronProvider;
 import org.wildfly.security.auth.principal.NamePrincipal;
 import org.wildfly.security.auth.realm.LegacyPropertiesSecurityRealm;
 import org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm;
@@ -23,6 +22,7 @@
 import org.wildfly.security.authz.MapAttributes;
 import org.wildfly.security.credential.Credential;
 import org.wildfly.security.credential.PasswordCredential;
+import org.wildfly.security.password.WildFlyElytronPasswordProvider;
 import org.wildfly.security.password.interfaces.ClearPassword;
 
 /**
@@ -41,7 +41,7 @@ public void testLegacyPropertiesSecurityRealm() throws IOException {
                 .setProviders(new Supplier<Provider[]>() {
                     @Override
                     public Provider[] get() {
-                        return new Provider[] { new WildFlyElytronProvider() };
+                        return new Provider[] { new WildFlyElytronPasswordProvider() };
                     }
                 })
                 .build();

diff --git a/...time/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java b/...time/src/main/java/io/quarkus/elytron/security/runtime/ElytronPropertiesFileRecorder.java
@@ -17,7 +17,6 @@
 
 import org.jboss.logging.Logger;
 import org.wildfly.common.iteration.ByteIterator;
-import org.wildfly.security.WildFlyElytronProvider;
 import org.wildfly.security.auth.realm.LegacyPropertiesSecurityRealm;
 import org.wildfly.security.auth.realm.SimpleMapBackedSecurityRealm;
 import org.wildfly.security.auth.realm.SimpleRealmEntry;
@@ -44,7 +43,7 @@
 public class ElytronPropertiesFileRecorder {
     static final Logger log = Logger.getLogger(ElytronPropertiesFileRecorder.class);
 
-    private static final Provider[] PROVIDERS = new Provider[] { new WildFlyElytronProvider() };
+    private static final Provider[] PROVIDERS = new Provider[] { new WildFlyElytronPasswordProvider() };
 
     /**
      * Load the user.properties and roles.properties files into the {@linkplain SecurityRealm}