Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/main/java/ru/rt/restream/reindexer/ReindexerNamespace.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import ru.rt.restream.reindexer.util.BeanPropertyUtils;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -248,11 +247,16 @@ void registerPrecept(ReindexerPrecept precept) {

PreceptExpression[] getPrecepts(Object item, int format) {
Predicate<ReindexerPrecept> isNullPredicate = getIsNullPredicate(item, format);
List<PreceptExpression> precepts = new ArrayList<>();
for (ReindexerPrecept precept : getPrecepts()) {
applyPrecept(precept, isNullPredicate, precepts);
List<PreceptExpression> result = new ArrayList<>();
lock.readLock().lock();
try {
for (ReindexerPrecept precept : precepts.values()) {
applyPrecept(precept, isNullPredicate, result);
}
} finally {
lock.readLock().unlock();
}
return precepts.toArray(new PreceptExpression[0]);
return result.toArray(new PreceptExpression[0]);
}

private Predicate<ReindexerPrecept> getIsNullPredicate(Object item, int format) {
Expand All @@ -267,15 +271,6 @@ private Predicate<ReindexerPrecept> getIsNullPredicate(Object item, int format)
return it -> BeanPropertyUtils.getProperty(item, it.getFieldPath()) == null;
}

private Collection<ReindexerPrecept> getPrecepts() {
lock.readLock().lock();
try {
return precepts.values();
} finally {
lock.readLock().unlock();
}
}

private void applyPrecept(ReindexerPrecept precept, Predicate<ReindexerPrecept> isNullPredicate,
List<PreceptExpression> precepts) {
// Apply precept according to the strategy.
Expand Down
Loading