Cleanup uses and/or overrides of Apache Geode, Spring and Test Framework (e.g. Mockito) deprecated APIs.

This commit is contained in:
John Blum
2020-07-23 14:18:03 -07:00
parent 5ca11cbc44
commit ba24c50ba2
10 changed files with 50 additions and 70 deletions

View File

@@ -17,7 +17,6 @@ package org.springframework.geode.security;
import java.util.Properties;
import org.apache.geode.LogWriter;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.security.AuthInitialize;
import org.apache.geode.security.AuthenticationFailedException;
@@ -41,10 +40,6 @@ public class TestAuthInitialize implements AuthInitialize {
return new TestAuthInitialize();
}
@Override
@SuppressWarnings("deprecation")
public void init(LogWriter systemLogger, LogWriter securityLogger) throws AuthenticationFailedException { }
@Override
public Properties getCredentials(Properties securityProperties, DistributedMember server, boolean isPeer)
throws AuthenticationFailedException {

View File

@@ -58,8 +58,8 @@ public class TestAuthInitializeUnitTests {
@Test
public void getCredentialsUsesProperties() {
Properties credentials =
this.authInitialize.getCredentials(newSecurityProperties("testUser", "s3cr3t"));
Properties securityProperties = newSecurityProperties("testUser", "s3cr3t");
Properties credentials = this.authInitialize.getCredentials(securityProperties, null, false);
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("testUser");
@@ -69,8 +69,8 @@ public class TestAuthInitializeUnitTests {
@Test
public void getCredentialsUsesProvidedUsernameAndDefaultPassword() {
Properties credentials =
this.authInitialize.getCredentials(newSecurityProperties("testUser", null));
Properties securityProperties = newSecurityProperties("testUser", null);
Properties credentials = this.authInitialize.getCredentials(securityProperties, null, false);
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("testUser");
@@ -80,8 +80,8 @@ public class TestAuthInitializeUnitTests {
@Test
public void getCredentialsUsesProvidedPasswordAndDefaultUsername() {
Properties credentials =
this.authInitialize.getCredentials(newSecurityProperties(null, "s3cr3t"));
Properties securityProperties = newSecurityProperties(null, "s3cr3t");
Properties credentials = this.authInitialize.getCredentials(securityProperties, null, false);
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("test");
@@ -91,8 +91,8 @@ public class TestAuthInitializeUnitTests {
@Test
public void getCredentialsUsesDefaultUsernameAndPassword() {
Properties credentials =
this.authInitialize.getCredentials(newSecurityProperties(null, null));
Properties securityProperties = newSecurityProperties(null, null);
Properties credentials = this.authInitialize.getCredentials(securityProperties, null, false);
assertThat(credentials).isNotNull();
assertThat(credentials.getProperty(GeodeConstants.USERNAME)).isEqualTo("test");