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

DATAREDIS-1084 - Polishing.

Browse Source 
Rename PendingMessage.getStringId to PendingMessage.getIdAsString for consistent naming scheme. Remove getElapsedTimeSinceLastDeliveryMS method for now in favor of getElapsedTimeSinceLastDelivery.

Use primitive long instead of boxed wrapper to avoid nullability where possible. Move PendingMessage* converters to StreamConverters.

Add assertions.

Original pull request: #512.
This commit is contained in:
Mark Paluch
2020-03-10 09:39:50 +01:00
parent 52fd648157
commit 87d3bb5660
15 changed files with 216 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/test/java/org/springframework/data/redis/connection/AbstractConnectionIntegrationTests.java
View File

@@ -3158,8 +3158,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(pending.get(0).getConsumerName()).isEqualTo("my-consumer");
assertThat(pending.get(0).getGroupName()).isEqualTo("my-group");
assertThat(pending.get(0).getTotalDeliveryCount()).isOne();
assertThat(pending.get(0).getStringId()).isNotNull();
assertThat(pending.get(0).getIdAsString()).isNotNull();
}
@Test // DATAREDIS-1084
@@ -3183,7 +3182,7 @@ public abstract class AbstractConnectionIntegrationTests {
assertThat(pending.get(0).getConsumerName()).isEqualTo("my-consumer");
assertThat(pending.get(0).getGroupName()).isEqualTo("my-group");
assertThat(pending.get(0).getTotalDeliveryCount()).isOne();
assertThat(pending.get(0).getStringId()).isNotNull();
assertThat(pending.get(0).getIdAsString()).isNotNull();
}
@Test // DATAREDIS-1084
@@ -3234,7 +3233,8 @@ public abstract class AbstractConnectionIntegrationTests {
StreamOffset.create(KEY_1, ReadOffset.lastConsumed())));
List<MapRecord<String, String, String>> messages = (List<MapRecord<String, String, String>>) getResults().get(2);
TimeUnit.MILLISECONDS.sleep(5);
TimeUnit.MILLISECONDS.sleep(15);
actual.add(connection.xClaim(KEY_1, "my-group", "my-consumer",
XClaimOptions.minIdle(Duration.ofMillis(1)).ids(messages.get(0).getId())));

4
src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveStreamCommandsTests.java
View File

@@ -275,7 +275,7 @@ public class LettuceReactiveStreamCommandsTests extends LettuceReactiveCommandsT
assertThat(it.get(0).getConsumerName()).isEqualTo("my-consumer");
assertThat(it.get(0).getGroupName()).isEqualTo("my-group");
assertThat(it.get(0).getTotalDeliveryCount()).isOne();
assertThat(it.get(0).getStringId()).isNotNull();
assertThat(it.get(0).getIdAsString()).isNotNull();
}).verifyComplete();
}
@@ -300,7 +300,7 @@ public class LettuceReactiveStreamCommandsTests extends LettuceReactiveCommandsT
assertThat(it.get(0).getConsumerName()).isEqualTo("my-consumer");
assertThat(it.get(0).getGroupName()).isEqualTo("my-group");
assertThat(it.get(0).getTotalDeliveryCount()).isOne();
assertThat(it.get(0).getStringId()).isNotNull();
assertThat(it.get(0).getIdAsString()).isNotNull();
}).verifyComplete();
}