root
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Polishing 

See gh-4666
This commit is contained in:
Kazuki Shimizu 2017-10-23 07:03:59 +09:00 committed by Rob Winch
parent 0805ef0394
commit 2937477405
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java
View File

@ -16,9 +16,6 @@
package org.springframework.security.crypto.password; package org.springframework.security.crypto.password;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import java.util.Map; import java.util.Map;
/** /**
@ -124,7 +121,6 @@ import java.util.Map;
public class DelegatingPasswordEncoder implements PasswordEncoder { public class DelegatingPasswordEncoder implements PasswordEncoder {
private static final String PREFIX = "{"; private static final String PREFIX = "{";
private static final String SUFFIX = "}"; private static final String SUFFIX = "}";
private final Log logger = LogFactory.getLog(getClass());
private final String idForEncode; private final String idForEncode;
private final PasswordEncoder passwordEncoderForEncode; private final PasswordEncoder passwordEncoderForEncode;
private final Map<String,PasswordEncoder> idToPasswordEncoder; private final Map<String,PasswordEncoder> idToPasswordEncoder;

10
crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java
View File

@ -16,14 +16,11 @@
package org.springframework.security.crypto.password; package org.springframework.security.crypto.password;
import com.sun.org.apache.xpath.internal.SourceTree;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -50,8 +47,6 @@ public class DelegatingPasswordEncoderTests {
private String bcryptId = "bcrypt"; private String bcryptId = "bcrypt";
private String noopId = "noop";
private String rawPassword = "password"; private String rawPassword = "password";
private String encodedPassword = "ENCODED-PASSWORD"; private String encodedPassword = "ENCODED-PASSWORD";
@ -68,15 +63,14 @@ public class DelegatingPasswordEncoderTests {
public void setup() { public void setup() {
this.delegates = new HashMap<>(); this.delegates = new HashMap<>();
this.delegates.put(this.bcryptId, this.bcrypt); this.delegates.put(this.bcryptId, this.bcrypt);
this.delegates.put(this.noopId, this.noop); this.delegates.put("noop", this.noop);
this.passwordEncoder = new DelegatingPasswordEncoder(this.bcryptId, this.delegates); this.passwordEncoder = new DelegatingPasswordEncoder(this.bcryptId, this.delegates);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void constructorWhenIdForEncodeNullThenIllegalArgumentException() { public void constructorWhenIdForEncodeNullThenIllegalArgumentException() {
String id = null; new DelegatingPasswordEncoder(null, this.delegates);
new DelegatingPasswordEncoder(id, this.delegates);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)