Skip to content
Open
Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/main/java/io/neonbee/cache/CachingDataVerticle.java
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ public final Future<T> retrieveData(DataQuery query, DataMap require, DataContex
if (lock != null) {
lock.release(); // safety-safe, or if data was cached in the meantime!
}
})).compose(data -> filterDataFromCache(query, data, context));
});
}));
}).compose(data -> filterDataFromCache(query, data, context));
}

/**
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/io/neonbee/cache/CachingDataVerticleTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,40 @@ public Future<Integer> retrieveDataToCache(DataQuery query, DataMap require, Dat
assertDataEquals(requestData(dr), 2, testContext)))
.onComplete(testContext.succeedingThenComplete());
}

@Test
@DisplayName("FilterDataFromCache should be called for each data request even if data is in the cache")
void callFilterDataFromCacheOnEachDataRequest(VertxTestContext testContext) {
CachingDataVerticle<Integer> testClass = new CachingDataVerticle<>() {
int filterCallCounter;

@Override
public String getName() {
return "TestCachingVerticle";
}

@Override
public Future<Collection<DataRequest>> requireDataForCaching(DataQuery query, DataContext context) {
return Future.succeededFuture(List.of());
}

@Override
public Future<Integer> retrieveDataToCache(DataQuery query, DataMap require, DataContext context) {
return Future.succeededFuture(1);
}

@Override
protected Future<Integer> filterDataFromCache(DataQuery query, Integer data, DataContext context) {
filterCallCounter++;
return Future.succeededFuture(filterCallCounter);
}

};

DataRequest dr = new DataRequest(testClass.getName());
deployVerticle(testClass)
.compose(id -> assertDataEquals(requestData(dr), 1, testContext))
.compose(v -> assertDataEquals(requestData(dr), 2, testContext))
.onComplete(testContext.succeedingThenComplete());
}
}