From 607581a92653540b46452cb931267deecbdac8ca Mon Sep 17 00:00:00 2001 From: Kazuki Shimizu Date: Mon, 23 Oct 2017 07:03:59 +0900 Subject: [PATCH] Polishing See gh-4666 --- .../crypto/password/DelegatingPasswordEncoder.java | 4 ---- .../password/DelegatingPasswordEncoderTests.java | 10 ++-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java b/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java index 4161ce94b07..94b197eb3ff 100644 --- a/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java +++ b/crypto/src/main/java/org/springframework/security/crypto/password/DelegatingPasswordEncoder.java @@ -16,9 +16,6 @@ package org.springframework.security.crypto.password; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import java.util.Map; /** @@ -124,7 +121,6 @@ public class DelegatingPasswordEncoder implements PasswordEncoder { private static final String PREFIX = "{"; private static final String SUFFIX = "}"; - private final Log logger = LogFactory.getLog(getClass()); private final String idForEncode; private final PasswordEncoder passwordEncoderForEncode; private final Map idToPasswordEncoder; diff --git a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java index f819515104e..dd474e164ff 100644 --- a/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java +++ b/crypto/src/test/java/org/springframework/security/crypto/password/DelegatingPasswordEncoderTests.java @@ -16,14 +16,11 @@ package org.springframework.security.crypto.password; -import com.sun.org.apache.xpath.internal.SourceTree; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; 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.Map; @@ -50,8 +47,6 @@ public class DelegatingPasswordEncoderTests { private String bcryptId = "bcrypt"; - private String noopId = "noop"; - private String rawPassword = "password"; private String encodedPassword = "ENCODED-PASSWORD"; @@ -68,15 +63,14 @@ public class DelegatingPasswordEncoderTests { public void setup() { this.delegates = new HashMap<>(); 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); } @Test(expected = IllegalArgumentException.class) public void constructorWhenIdForEncodeNullThenIllegalArgumentException() { - String id = null; - new DelegatingPasswordEncoder(id, this.delegates); + new DelegatingPasswordEncoder(null, this.delegates); } @Test(expected = IllegalArgumentException.class)