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

Fix bug in the mockQueryService() method storing the created CqQueries and OQL Indexes in an instance of java.util.concurrent.ConcurrentSkipListSet, which requires the o.a.g.cache.query.Index interface to implement java.lang.Comparable.

Browse Source 
Fix bug in the mockLuceneIndexFactory() method, setFields(:String[]) method on the o.a.g.cache.lucene.LuceneIndexFactory to properly handle the String array argument.
This commit is contained in:
John Blum
2018-05-09 16:37:45 -07:00
parent bd7dacc41f
commit 95a9e1221f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/springframework/data/gemfire/tests/mock/GemFireMockObjectsSupport.java
View File

@@ -56,7 +56,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.TimeUnit;
@@ -1566,8 +1565,8 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
QueryService mockQueryService = mock(QueryService.class);
Set<CqQuery> cqQueries = new ConcurrentSkipListSet<>();
Set<Index> indexes = new ConcurrentSkipListSet<>();
Set<CqQuery> cqQueries = Collections.synchronizedSet(new HashSet<>());
Set<Index> indexes = Collections.synchronizedSet(new HashSet<>());
try {
when(mockQueryService.getCqs()).thenAnswer(invocation -> cqQueries.toArray(new CqQuery[cqQueries.size()]));
@@ -1835,10 +1834,14 @@ public abstract class GemFireMockObjectsSupport extends MockObjectsSupport {
when(mockLuceneIndexFactory.setFields(ArgumentMatchers.<String[]>any())).thenAnswer(invocation -> {
String[] fieldsArgument = invocation.getArgument(0);
Object[] fieldsArgument = invocation.getArguments();
fields.clear();
fields.addAll(Arrays.asList(nullSafeArray(fieldsArgument, String.class)));
Arrays.stream(nullSafeArray(fieldsArgument, Object.class))
.filter(field -> field instanceof String)
.map(String::valueOf)
.forEach(fields::add);
return mockLuceneIndexFactory;
});