Spring/spring-boot-data-geode
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

5
apache-geode-extensions/src/main/java/org/springframework/geode/security/TestAuthInitialize.java
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 {

16
apache-geode-extensions/src/test/java/org/springframework/geode/security/TestAuthInitializeUnitTests.java
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");

3
spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java
View File

@@ -13,7 +13,6 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.geode.boot.autoconfigure.configuration.support;
import java.util.Properties;
@@ -45,7 +44,7 @@ public class PoolProperties {
private boolean prSingleHopEnabled = PoolFactory.DEFAULT_PR_SINGLE_HOP_ENABLED;
private boolean readyForEvents = DEFAULT_READY_FOR_EVENTS;
private boolean subscriptionEnabled = PoolFactory.DEFAULT_SUBSCRIPTION_ENABLED;
private boolean threadLocalConnections = PoolFactory.DEFAULT_THREAD_LOCAL_CONNECTIONS;
private boolean threadLocalConnections = false;
private int freeConnectionTimeout = PoolFactory.DEFAULT_FREE_CONNECTION_TIMEOUT;
private int loadConditioningInterval = PoolFactory.DEFAULT_LOAD_CONDITIONING_INTERVAL;

1
spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/HttpBasicAuthenticationSecurityConfiguration.java
View File

@@ -58,6 +58,7 @@ import org.springframework.web.client.RestTemplate;
* @see org.springframework.http.client.ClientHttpRequestInterceptor
* @see org.springframework.web.client.RestTemplate
* @since 1.0.0
* @deprecated
*/
@Deprecated
@Configuration

16
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/ClientCachePoolCustomizationsIntegrationTests.java vendored
View File

@@ -104,7 +104,6 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
assertThat(namedPoolBean).isNotNull();
assertThat(namedPoolBean.getName()).isEqualTo(poolName);
assertThat(namedPoolBean.getServerGroup()).isEqualTo("TestServerGroup");
assertThat(namedPoolBean.getThreadLocalConnections()).isTrue();
}
Pool namedPool = PoolManager.find(poolName);
@@ -112,7 +111,6 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
assertThat(namedPool).isNotNull();
assertThat(namedPool.getName()).isEqualTo(poolName);
assertThat(namedPool.getServerGroup()).isEqualTo("TestServerGroup");
assertThat(namedPool.getThreadLocalConnections()).isTrue();
if (DEFAULT_POOL_NAME.equals(poolName)) {
assertThat(namedPool).isSameAs(clientCache.getDefaultPool());
@@ -308,12 +306,7 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
@Bean
PoolConfigurer allPoolsConfigurer() {
return (beanName, poolFactoryBean) -> {
poolFactoryBean.setServerGroup("TestServerGroup");
poolFactoryBean.setThreadLocalConnections(true);
};
return (beanName, poolFactoryBean) -> poolFactoryBean.setServerGroup("TestServerGroup");
}
}
@@ -327,12 +320,7 @@ public class ClientCachePoolCustomizationsIntegrationTests extends SpringBootApp
@Bean
PoolConfigurer allPoolsConfigurer() {
return (beanName, poolFactoryBean) -> {
poolFactoryBean.setServerGroup("TestServerGroup");
poolFactoryBean.setThreadLocalConnections(true);
};
return (beanName, poolFactoryBean) -> poolFactoryBean.setServerGroup("TestServerGroup");
}
}
}

1
spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/http/HttpBasicAuthenticationSecurityConfigurationUnitTests.java
View File

@@ -65,6 +65,7 @@ import org.springframework.web.client.RestTemplate;
* @see org.springframework.geode.boot.autoconfigure.support.HttpBasicAuthenticationSecurityConfiguration
* @since 1.0.0
*/
@SuppressWarnings("deprecation")
public class HttpBasicAuthenticationSecurityConfigurationUnitTests {
private TestHttpBasicAuthenticationSecurityConfiguration httpSecurityConfiguration =

12
spring-geode/src/main/java/org/springframework/geode/function/config/AbstractFunctionExecutionAutoConfigurationExtension.java
View File

@@ -13,21 +13,16 @@
* or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/
package org.springframework.geode.function.config;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException;
import java.util.Optional;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.core.type.StandardAnnotationMetadata;
import org.springframework.data.gemfire.function.config.AbstractFunctionExecutionConfigurationSource;
import org.springframework.data.gemfire.function.config.AnnotationFunctionExecutionConfigurationSource;
import org.springframework.data.gemfire.function.config.FunctionExecutionBeanDefinitionRegistrar;
@@ -53,12 +48,10 @@ public abstract class AbstractFunctionExecutionAutoConfigurationExtension
private BeanFactory beanFactory;
@Override
@SuppressWarnings("all")
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
this.beanFactory = beanFactory;
}
@SuppressWarnings("all")
protected BeanFactory getBeanFactory() {
Assert.state(this.beanFactory != null, "BeanFactory was not properly configured");
@@ -73,8 +66,7 @@ public abstract class AbstractFunctionExecutionAutoConfigurationExtension
protected AbstractFunctionExecutionConfigurationSource newAnnotationBasedFunctionExecutionConfigurationSource(
AnnotationMetadata annotationMetadata) {
StandardAnnotationMetadata metadata =
new StandardAnnotationMetadata(getConfiguration(), true);
AnnotationMetadata metadata = AnnotationMetadata.introspect(getConfiguration());
return new AnnotationFunctionExecutionConfigurationSource(metadata) {

13
spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheLoaderUnitTests.java vendored
View File

@@ -19,20 +19,22 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import java.util.Optional;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.LoaderHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.apache.geode.cache.CacheLoaderException;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.LoaderHelper;
import org.springframework.core.env.Environment;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
import org.springframework.data.repository.CrudRepository;
@@ -71,7 +73,7 @@ public class RepositoryCacheLoaderUnitTests {
@After
public void tearDown() {
verifyZeroInteractions(this.mockEnvironment);
verifyNoInteractions(this.mockEnvironment);
}
@Test
@@ -126,7 +128,6 @@ public class RepositoryCacheLoaderUnitTests {
}
@Test
@SuppressWarnings("all")
public void newCacheRuntimeExceptionIsCorrect() {
RuntimeException cause = new RuntimeException("TEST");

23
spring-geode/src/test/java/org/springframework/geode/cache/RepositoryCacheWriterUnitTests.java vendored
View File

@@ -21,18 +21,20 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.CacheWriterException;
import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
import org.springframework.core.env.Environment;
import org.springframework.data.repository.CrudRepository;
import org.springframework.geode.cache.support.RepositoryCacheLoaderWriterSupport;
@@ -120,7 +122,7 @@ public class RepositoryCacheWriterUnitTests {
verify(this.mockCrudRepository, times(1)).deleteAll();
verifyZeroInteractions(mockRegionEvent);
verifyNoInteractions(mockRegionEvent);
}
@Test
@@ -138,7 +140,7 @@ public class RepositoryCacheWriterUnitTests {
verify(this.mockCrudRepository, never()).deleteAll();
verifyZeroInteractions(mockRegionEvent);
verifyNoInteractions(mockRegionEvent);
}
@Test
@@ -148,13 +150,12 @@ public class RepositoryCacheWriterUnitTests {
this.cacheWriter.beforeRegionDestroy(mockRegionEvent);
verifyZeroInteractions(this.mockEnvironment);
verifyZeroInteractions(this.mockCrudRepository);
verifyZeroInteractions(mockRegionEvent);
verifyNoInteractions(this.mockEnvironment);
verifyNoInteractions(this.mockCrudRepository);
verifyNoInteractions(mockRegionEvent);
}
@Test
@SuppressWarnings("all")
public void newCacheRuntimeExceptionIsCorrect() {
RuntimeException cause = new RuntimeException("TEST");

30
spring-geode/src/test/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupportUnitTests.java vendored
View File

@@ -21,19 +21,21 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.when;
import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.LoaderHelper;
import org.junit.After;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.apache.geode.cache.CacheRuntimeException;
import org.apache.geode.cache.LoaderHelper;
import org.springframework.core.env.Environment;
import org.springframework.data.repository.CrudRepository;
@@ -51,11 +53,11 @@ import org.springframework.data.repository.CrudRepository;
* @since 1.1.0
*/
@RunWith(MockitoJUnitRunner.class)
@SuppressWarnings("unchecked")
@SuppressWarnings({ "rawtypes", "unchecked" })
public class RepositoryCacheLoaderWriterSupportUnitTests {
@Mock
private CrudRepository mockCrudRepository;
private CrudRepository<?, ?> mockCrudRepository;
@After
public void tearDown() {
@@ -65,7 +67,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
@Test
public void constructsRepositoryCacheLoaderWriterSupportSuccessfully() {
RepositoryCacheLoaderWriterSupport cacheLoaderWriter =
RepositoryCacheLoaderWriterSupport<Object, Object> cacheLoaderWriter =
new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository);
assertThat(cacheLoaderWriter).isNotNull();
@@ -93,7 +95,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
Environment mockEnvironment = mock(Environment.class);
RepositoryCacheLoaderWriterSupport cacheLoaderWriter =
RepositoryCacheLoaderWriterSupport<Object, Object> cacheLoaderWriter =
new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository);
cacheLoaderWriter.setEnvironment(mockEnvironment);
@@ -107,7 +109,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
@Test
public void isNukeAndPaveEnabledReturnsFalse() {
assertThat(new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository)
assertThat(new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository)
.isNukeAndPaveEnabled()).isFalse();
}
@@ -124,7 +126,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
when(mockEnvironment.getProperty(eq(RepositoryCacheLoaderWriterSupport.NUKE_AND_PAVE_PROPERTY),
eq(Boolean.class))).thenReturn(true);
assertThat(new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository)
assertThat(new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository)
.with(mockEnvironment).isNukeAndPaveEnabled()).isTrue();
verify(mockEnvironment, times(1))
@@ -139,7 +141,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
assertThat(Boolean.parseBoolean(System.getProperty(RepositoryCacheLoaderWriterSupport.NUKE_AND_PAVE_PROPERTY)))
.isTrue();
assertThat(new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository).isNukeAndPaveEnabled())
assertThat(new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository).isNukeAndPaveEnabled())
.isTrue();
}
@@ -153,7 +155,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
Object testEntity = new Object();
RepositoryCacheLoaderWriterSupport<Object, Object> cacheLoaderWriter =
new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository);
new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository);
assertThat(cacheLoaderWriter.doRepositoryOp(testEntity, mockRepositoryOperationFunction)).isEqualTo("TEST");
@@ -165,9 +167,9 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
LoaderHelper<?, ?> mockLoadHelper = mock(LoaderHelper.class);
assertThat(new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository).load(mockLoadHelper)).isNull();
assertThat(new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository).load(mockLoadHelper)).isNull();
verifyZeroInteractions(mockLoadHelper);
verifyNoInteractions(mockLoadHelper);
}
@Test(expected = CacheRuntimeException.class)
@@ -180,7 +182,7 @@ public class RepositoryCacheLoaderWriterSupportUnitTests {
Object testEntity = new Object();
RepositoryCacheLoaderWriterSupport<Object, Object> cacheLoaderWriter =
new TestRepositoryCacheLoaderWriterSupport<>(this.mockCrudRepository);
new TestRepositoryCacheLoaderWriterSupport(this.mockCrudRepository);
try {
cacheLoaderWriter.doRepositoryOp(testEntity, mockRepositoryOperationFunction);