=peq #21724 #19174 unify naming of query methods

This commit is contained in:
Konrad Malawski 2016-12-14 14:04:55 +01:00
parent e29e06f850
commit abaa8f394e
30 changed files with 105 additions and 253 deletions

View file

@ -88,9 +88,9 @@ public class PersistenceQueryDocTest {
//#my-read-journal
public class MyJavadslReadJournal implements
akka.persistence.query.javadsl.ReadJournal,
akka.persistence.query.javadsl.EventsByTagQuery2,
akka.persistence.query.javadsl.EventsByTagQuery,
akka.persistence.query.javadsl.EventsByPersistenceIdQuery,
akka.persistence.query.javadsl.AllPersistenceIdsQuery,
akka.persistence.query.javadsl.PersistenceIdsQuery,
akka.persistence.query.javadsl.CurrentPersistenceIdsQuery {
private final FiniteDuration refreshInterval;
@ -102,11 +102,11 @@ public class PersistenceQueryDocTest {
}
@Override
public Source<EventEnvelope2, NotUsed> eventsByTag(String tag, Offset offset) {
public Source<EventEnvelope, NotUsed> eventsByTag(String tag, Offset offset) {
if(offset instanceof Sequence){
Sequence sequenceOffset = (Sequence) offset;
final Props props = MyEventsByTagPublisher.props(tag, sequenceOffset.value(), refreshInterval);
return Source.<EventEnvelope2>actorPublisher(props).
return Source.<EventEnvelope>actorPublisher(props).
mapMaterializedValue(m -> NotUsed.getInstance());
}
else
@ -121,7 +121,7 @@ public class PersistenceQueryDocTest {
}
@Override
public Source<String, NotUsed> allPersistenceIds() {
public Source<String, NotUsed> persistenceIds() {
// implement in a similar way as eventsByTag
throw new UnsupportedOperationException("Not implemented yet");
}
@ -148,9 +148,9 @@ public class PersistenceQueryDocTest {
//#my-read-journal
public class MyScaladslReadJournal implements
akka.persistence.query.scaladsl.ReadJournal,
akka.persistence.query.scaladsl.EventsByTagQuery2,
akka.persistence.query.scaladsl.EventsByTagQuery,
akka.persistence.query.scaladsl.EventsByPersistenceIdQuery,
akka.persistence.query.scaladsl.AllPersistenceIdsQuery,
akka.persistence.query.scaladsl.PersistenceIdsQuery,
akka.persistence.query.scaladsl.CurrentPersistenceIdsQuery {
private final MyJavadslReadJournal javadslReadJournal;
@ -160,7 +160,7 @@ public class PersistenceQueryDocTest {
}
@Override
public akka.stream.scaladsl.Source<EventEnvelope2, NotUsed> eventsByTag(
public akka.stream.scaladsl.Source<EventEnvelope, NotUsed> eventsByTag(
String tag, akka.persistence.query.Offset offset) {
return javadslReadJournal.eventsByTag(tag, offset).asScala();
}
@ -173,8 +173,8 @@ public class PersistenceQueryDocTest {
}
@Override
public akka.stream.scaladsl.Source<String, NotUsed> allPersistenceIds() {
return javadslReadJournal.allPersistenceIds().asScala();
public akka.stream.scaladsl.Source<String, NotUsed> persistenceIds() {
return javadslReadJournal.persistenceIds().asScala();
}
@Override
@ -218,7 +218,7 @@ public class PersistenceQueryDocTest {
"akka.persistence.query.my-read-journal");
//#all-persistence-ids-live
readJournal.allPersistenceIds();
readJournal.persistenceIds();
//#all-persistence-ids-live
}
@ -256,7 +256,7 @@ public class PersistenceQueryDocTest {
//#events-by-tag
// assuming journal is able to work with numeric offsets we can:
final Source<EventEnvelope2, NotUsed> blueThings =
final Source<EventEnvelope, NotUsed> blueThings =
readJournal.eventsByTag("blue", new Sequence(0L));
// find top 10 blue things:
@ -270,7 +270,7 @@ public class PersistenceQueryDocTest {
}, mat);
// start another query, from the known offset
Source<EventEnvelope2, NotUsed> blue = readJournal.eventsByTag("blue", new Sequence(10));
Source<EventEnvelope, NotUsed> blue = readJournal.eventsByTag("blue", new Sequence(10));
//#events-by-tag
}