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

DATAGEODE-306 - Fix compilation errors in GemfireTemplate and MappingPdxSerializer.

Browse Source 
The compilation errors were caused by the downmerge from Neumann/2.3 to Moore/2.2 and API changes in Spring Data Commons and Mockito.
This commit is contained in:
John Blum
2020-09-14 16:12:56 -07:00
parent cc09d1e25a
commit 85b0c95479
8 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/data/gemfire/GemfireTemplate.java
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire;
import java.lang.reflect.InvocationHandler;
@@ -23,6 +22,7 @@ import java.lang.reflect.Proxy;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.apache.geode.GemFireCheckedException;
import org.apache.geode.GemFireException;
@@ -34,12 +34,14 @@ import org.apache.geode.cache.query.Query;
import org.apache.geode.cache.query.QueryInvalidException;
import org.apache.geode.cache.query.QueryService;
import org.apache.geode.cache.query.SelectResults;
import org.apache.geode.internal.cache.LocalRegion;
import org.springframework.dao.DataAccessException;
import org.springframework.dao.InvalidDataAccessApiUsageException;
import org.springframework.data.gemfire.util.RegionUtils;
import org.springframework.data.gemfire.util.SpringUtils;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
/**
@@ -420,7 +422,19 @@ public class GemfireTemplate extends GemfireAccessor implements GemfireOperation
}
boolean isLocalWithNoServerProxy(Region<?, ?> region) {
return region instanceof LocalRegion && !((LocalRegion) region).hasServerProxy();
if (RegionUtils.isLocal(region)) {
SpringUtils.ValueReturningThrowableOperation<Boolean> hasServerProxyMethod = () ->
Optional.ofNullable(ReflectionUtils.findMethod(region.getClass(), "hasServerProxy"))
.map(method -> ReflectionUtils.invokeMethod(method, region))
.map(Boolean.FALSE::equals)
.orElse(false);
return SpringUtils.safeGetValue(hasServerProxyMethod, false);
}
return false;
}
boolean requiresPooledQueryService(Region<?, ?> region) {

16
src/main/java/org/springframework/data/gemfire/mapping/MappingPdxSerializer.java
View File

@@ -34,6 +34,8 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.data.convert.EntityInstantiator;
import org.springframework.data.convert.EntityInstantiators;
import org.springframework.data.gemfire.util.Filter;
import org.springframework.data.mapping.MappingException;
import org.springframework.data.mapping.PersistentEntity;
@@ -41,8 +43,6 @@ import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.PersistentPropertyAccessor;
import org.springframework.data.mapping.PropertyHandler;
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
import org.springframework.data.mapping.model.EntityInstantiator;
import org.springframework.data.mapping.model.EntityInstantiators;
import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
import org.springframework.data.mapping.model.SpELContext;
import org.springframework.lang.NonNull;
@@ -72,8 +72,8 @@ import org.slf4j.LoggerFactory;
* @see org.springframework.data.mapping.PersistentPropertyAccessor
* @see org.springframework.data.mapping.PropertyHandler
* @see org.springframework.data.mapping.model.ConvertingPropertyAccessor
* @see org.springframework.data.mapping.model.EntityInstantiator
* @see org.springframework.data.mapping.model.EntityInstantiators
* @see org.springframework.data.convert.EntityInstantiator
* @see org.springframework.data.convert.EntityInstantiators
* @see org.springframework.data.mapping.model.PersistentEntityParameterValueProvider
* @since 1.2.0
*/
@@ -323,7 +323,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
*
* @param entityInstantiators {@link EntityInstantiator EntityInstantiators} used to create the instances
* read by this {@link PdxSerializer}; must not be {@literal null}.
* @see org.springframework.data.mapping.model.EntityInstantiator
* @see org.springframework.data.convert.EntityInstantiator
*/
public void setEntityInstantiators(@NonNull EntityInstantiators entityInstantiators) {
@@ -338,7 +338,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
*
* @param gemfireInstantiators mapping of {@link Class types} to {@link EntityInstantiator} objects;
* must not be {@literal null}.
* @see org.springframework.data.mapping.model.EntityInstantiator
* @see org.springframework.data.convert.EntityInstantiator
* @see java.util.Map
*/
public void setEntityInstantiators(@NonNull Map<Class<?>, EntityInstantiator> gemfireInstantiators) {
@@ -349,7 +349,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
* Returns the configured {@link EntityInstantiators} handling instantiation for Pivotal GemFire persistent entities.
*
* @return the configured {@link EntityInstantiators} handling instantiation for GemFire persistent entities.
* @see org.springframework.data.mapping.model.EntityInstantiators
* @see org.springframework.data.convert.EntityInstantiators
*/
protected EntityInstantiators getEntityInstantiators() {
return this.entityInstantiators;
@@ -709,7 +709,7 @@ public class MappingPdxSerializer implements PdxSerializer, ApplicationContextAw
* @param entity {@link PersistentEntity} object used to lookup a custom, registered {@link EntityInstantiator}
* for the entity.
* @return an {@link EntityInstantiator} for the given {@link PersistentEntity}.
* @see org.springframework.data.mapping.model.EntityInstantiator
* @see org.springframework.data.convert.EntityInstantiator
* @see org.springframework.data.mapping.PersistentEntity
*/
@SuppressWarnings("rawtypes")

13
src/main/java/org/springframework/data/gemfire/util/RegionUtils.java
View File

@@ -21,6 +21,7 @@ import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.client.ClientRegionShortcut;
import org.apache.geode.internal.cache.LocalRegion;
import org.springframework.data.gemfire.client.ClientRegionShortcutWrapper;
import org.springframework.lang.NonNull;
@@ -137,6 +138,18 @@ public abstract class RegionUtils extends CacheUtils {
.isPresent();
}
/**
* Determines whether the given {@link Region} is a non-distributed, {@literal local} {@link Region}.
*
* @param region {@link Region} to evaluate.
* @return a boolean value indicating whether the given {@link Region} is a non-distributed,
* {@literal local} {@link Region}.
* @see org.apache.geode.cache.Region
*/
public static boolean isLocal(@Nullable Region<?, ?> region) {
return region instanceof LocalRegion;
}
@Nullable
public static String toRegionName(@Nullable Region<?, ?> region) {
return Optional.ofNullable(region).map(Region::getName).orElse(null);

1
src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerIntegrationTests.java
View File

@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire.mapping;
import static org.assertj.core.api.Assertions.assertThat;

14
src/test/java/org/springframework/data/gemfire/mapping/MappingPdxSerializerUnitTests.java
View File

@@ -28,7 +28,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException;
@@ -55,6 +55,8 @@ import org.springframework.core.convert.ConversionService;
import org.springframework.core.convert.support.DefaultConversionService;
import org.springframework.core.convert.support.GenericConversionService;
import org.springframework.core.type.ClassMetadata;
import org.springframework.data.convert.EntityInstantiator;
import org.springframework.data.convert.EntityInstantiators;
import org.springframework.data.domain.Page;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.data.gemfire.repository.sample.Account;
@@ -72,8 +74,6 @@ import org.springframework.data.gemfire.test.support.MapBuilder;
import org.springframework.data.mapping.MappingException;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
import org.springframework.data.mapping.model.EntityInstantiator;
import org.springframework.data.mapping.model.EntityInstantiators;
import org.springframework.data.mapping.model.ParameterValueProvider;
/**
@@ -483,8 +483,8 @@ public class MappingPdxSerializerUnitTests {
verify(this.pdxSerializer, times(1)).getEntityInstantiators();
verify(mockEntityInstantiators, times(1)).getInstantiatorFor(eq(mockEntity));
verifyNoInteractions(mockEntityInstantiator);
verifyNoInteractions(mockEntity);
verifyZeroInteractions(mockEntityInstantiator);
verifyZeroInteractions(mockEntity);
}
@Test
@@ -503,8 +503,8 @@ public class MappingPdxSerializerUnitTests {
verify(this.pdxSerializer, times(1)).getEntityInstantiators();
verify(mockEntityInstantiators, times(1)).getInstantiatorFor(eq(mockEntity));
verifyNoInteractions(mockEntityInstantiator);
verifyNoInteractions(mockEntity);
verifyZeroInteractions(mockEntityInstantiator);
verifyZeroInteractions(mockEntity);
}
@Test

12
src/test/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepositoryUnitTests.java
View File

@@ -27,8 +27,8 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
@@ -208,7 +208,7 @@ public class SimpleGemfireRepositoryUnitTests {
assertThat(repository.getLogger()).isNotNull();
assertThat(repository.getTemplate()).isEqualTo(template);
verifyNoInteractions(template, mockRegion, mockEntityInformation);
verifyZeroInteractions(template, mockRegion, mockEntityInformation);
}
@Test(expected = IllegalArgumentException.class)
@@ -258,7 +258,7 @@ public class SimpleGemfireRepositoryUnitTests {
assertThat(repository.getRegion()).isEqualTo(mockRegion);
verify(template, times(1)).getRegion();
verifyNoInteractions(mockRegion, mockEntityInformation);
verifyZeroInteractions(mockRegion, mockEntityInformation);
verifyNoMoreInteractions(template);
}
@@ -383,7 +383,7 @@ public class SimpleGemfireRepositoryUnitTests {
assertThat(iterable).isNotNull();
assertThat(iterable).isEmpty();
verifyNoInteractions(mockRegion);
verifyZeroInteractions(mockRegion);
}
@Test
@@ -698,7 +698,7 @@ public class SimpleGemfireRepositoryUnitTests {
assertThat(animals).isNotNull();
assertThat(animals).isEmpty();
verifyNoInteractions(mockRegion);
verifyZeroInteractions(mockRegion);
}
@Test
@@ -734,7 +734,7 @@ public class SimpleGemfireRepositoryUnitTests {
assertThat(repository.findById(null).isPresent()).isFalse();
verifyNoInteractions(mockRegion);
verifyZeroInteractions(mockRegion);
}
@Test

17
src/test/java/org/springframework/data/gemfire/util/RegionUtilsUnitTests.java
View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionService;
import org.apache.geode.internal.cache.LocalRegion;
import org.junit.Test;
@@ -164,4 +165,20 @@ public class RegionUtilsUnitTests {
verify(mockRegion, times(1)).getRegionService();
}
@Test
@SuppressWarnings("all")
public void nullRegionIsNotLocal() {
assertThat(RegionUtils.isLocal(null)).isFalse();
}
@Test
public void localRegionIsLocal() {
assertThat(RegionUtils.isLocal(mock(LocalRegion.class))).isTrue();
}
@Test
public void nonLocalRegionIsNotLocal() {
assertThat(RegionUtils.isLocal(mock(Region.class))).isFalse();
}
}

4
src/test/java/org/springframework/data/gemfire/util/SpringUtilsUnitTests.java
View File

@@ -26,8 +26,8 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import static org.springframework.data.gemfire.util.ArrayUtils.asArray;
import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException;
@@ -460,7 +460,7 @@ public class SpringUtilsUnitTests {
assertThat(SpringUtils.safeDoOperation(() -> operationValue.set("MOCK"), mockRunnable)).isTrue();
assertThat(operationValue.get()).isEqualTo("MOCK");
verifyNoInteractions(mockRunnable);
verifyZeroInteractions(mockRunnable);
}
@Test