Merge pull request #5 from alexvasseur/pr_libupdate

lettucemod timeseries; default username auth in UI

Author: NLxAROSA

pom.xml

@@ -51,9 +51,9 @@
 			<version>2.12.3</version>
 		</dependency>
 		<dependency>
-			<groupId>com.redislabs</groupId>
-			<artifactId>spring-redisearch</artifactId>
-			<version>3.1.2</version>
+			<groupId>com.redis</groupId>
+			<artifactId>spring-lettucemod</artifactId>
+			<version>2.19.3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.javafaker</groupId>

src/main/java/com/redislabs/demos/redisbank/RedisTimeSeriesConfiguration.java

@@ -13,13 +13,12 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.redis.lettucemod.api.StatefulRedisModulesConnection;
+import com.redis.lettucemod.api.sync.RediSearchCommands;
+import com.redis.lettucemod.search.Field;
+import com.redis.lettucemod.timeseries.CreateOptions;
 import com.redislabs.demos.redisbank.SerializationUtil;
 import com.redislabs.demos.redisbank.Utilities;
-import com.redislabs.demos.redisbank.timeseries.TimeSeriesCommands;
-import com.redislabs.lettusearch.Field;
-import com.redislabs.lettusearch.Field.Text.PhoneticMatcher;
-import com.redislabs.lettusearch.RediSearchCommands;
-import com.redislabs.lettusearch.StatefulRediSearchConnection;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,14 +46,11 @@ public class BankTransactionGenerator {
     private final NumberFormat nf = NumberFormat.getCurrencyInstance(Locale.GERMANY);
 
     private final StringRedisTemplate redis;
-    private final StatefulRediSearchConnection<String, String> connection;
-    private final TimeSeriesCommands tsc;
+    private final StatefulRedisModulesConnection<String, String> connection;
 
-    public BankTransactionGenerator(StringRedisTemplate redis, StatefulRediSearchConnection<String, String> connection,
-            TimeSeriesCommands tsc) throws NoSuchAlgorithmException, UnsupportedEncodingException {
+    public BankTransactionGenerator(StringRedisTemplate redis, StatefulRedisModulesConnection<String, String> connection) throws NoSuchAlgorithmException, UnsupportedEncodingException {
         this.redis = redis;
         this.connection = connection;
-        this.tsc = tsc;
         transactionSources = SerializationUtil.loadObjectList(TransactionSource.class, "/transaction_sources.csv");
         random = SecureRandom.getInstance("SHA1PRNG");
         random.setSeed("lars".getBytes("UTF-8")); // Prime the RNG so it always generates the same pseudorandom set
@@ -70,8 +66,8 @@ public BankTransactionGenerator(StringRedisTemplate redis, StatefulRediSearchCon
     private void createSearchIndices() {
         RediSearchCommands<String, String> commands = connection.sync();
         try {
-            commands.dropIndex(ACCOUNT_INDEX);
-            commands.dropIndex(SEARCH_INDEX);
+            commands.dropindex(ACCOUNT_INDEX);
+            commands.dropindex(SEARCH_INDEX);
         } catch (RedisCommandExecutionException e) {
             if (!e.getMessage().equals("Unknown Index name")) {
                 LOGGER.error("Error dropping index: {}", e.getMessage());
@@ -81,9 +77,9 @@ private void createSearchIndices() {
         commands.create(ACCOUNT_INDEX, Field.text("toAccountName").build());
         LOGGER.info("Created {} index", ACCOUNT_INDEX);
 
-        commands.create(SEARCH_INDEX, Field.text("description").matcher(PhoneticMatcher.English).build(),
-                Field.text("fromAccountName").matcher(PhoneticMatcher.English).build(),
-                Field.text("transactionType").matcher(PhoneticMatcher.English).build());
+        commands.create(SEARCH_INDEX, Field.text("description").matcher(Field.TextField.PhoneticMatcher.ENGLISH).build(),
+                Field.text("fromAccountName").matcher(Field.TextField.PhoneticMatcher.ENGLISH).build(),
+                Field.text("transactionType").matcher(Field.TextField.PhoneticMatcher.ENGLISH).build());
         LOGGER.info("Created {} index", SEARCH_INDEX);
     }
 
@@ -95,7 +91,8 @@ private void deleteSortedSet() {
 
     private void createTimeSeries() {
         redis.delete(BALANCE_TS);
-        tsc.create(BALANCE_TS, 0);
+        CreateOptions co = CreateOptions.builder().retentionPeriod(0).build();
+        connection.sync().create(BALANCE_TS, co);
         LOGGER.info("Created {} time seris", BALANCE_TS);
     }
 
@@ -153,7 +150,7 @@ private String createTransactionAmount(String accountName) {
         }
 
         balance = balance + roundedAmount;
-        tsc.add(BALANCE_TS, balance);
+        connection.sync().addAutoTimestamp(BALANCE_TS, balance);
         redis.opsForZSet().incrementScore(SORTED_SET_KEY, accountName, roundedAmount * -1);
 
         return nf.format(roundedAmount);

src/main/java/com/redislabs/demos/redisbank/timeseries/TimeSeriesCommands.java

@@ -1,18 +1,18 @@
 package com.redislabs.demos.redisbank.transactions;
 
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import com.redis.lettucemod.api.StatefulRedisModulesConnection;
+import com.redis.lettucemod.api.sync.RediSearchCommands;
+import com.redis.lettucemod.search.SearchOptions;
+import com.redis.lettucemod.search.SearchResults;
+import com.redis.lettucemod.timeseries.Sample;
+import com.redis.lettucemod.timeseries.TimeRange;
 import com.redislabs.demos.redisbank.Config;
 import com.redislabs.demos.redisbank.Config.StompConfig;
-import com.redislabs.demos.redisbank.timeseries.TimeSeriesCommands;
-import com.redislabs.lettusearch.RediSearchCommands;
-import com.redislabs.lettusearch.SearchOptions;
-import com.redislabs.lettusearch.SearchOptions.Highlight;
-import com.redislabs.lettusearch.SearchOptions.Highlight.Tag;
-import com.redislabs.lettusearch.SearchResults;
-import com.redislabs.lettusearch.StatefulRediSearchConnection;
 
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ZSetOperations.TypedTuple;
@@ -33,15 +33,13 @@ public class TransactionOverviewController {
     private static final String SORTED_SET_KEY = "bigspenders";
 
     private final Config config;
-    private final StatefulRediSearchConnection<String, String> srsc;
+    private final StatefulRedisModulesConnection<String, String> srsc;
     private final StringRedisTemplate redis;
-    private final TimeSeriesCommands tsc;
 
-    public TransactionOverviewController(Config config, StatefulRediSearchConnection<String, String> srsc,
-            TimeSeriesCommands tsc, StringRedisTemplate redis) {
+    public TransactionOverviewController(Config config, StatefulRedisModulesConnection<String, String> srsc,
+            StringRedisTemplate redis) {
         this.config = config;
         this.srsc = srsc;
-        this.tsc = tsc;
         this.redis = redis;
     }
 
@@ -52,13 +50,14 @@ public StompConfig stompConfig() {
 
     @GetMapping("/balance")
     public Balance[] balance() {
-        Map<String, String> tsValues = tsc.range(BALANCE_TS, System.currentTimeMillis() - (1000 * 60 * 60 * 24 * 7),
-                System.currentTimeMillis());
+        List<Sample> tsValues = srsc.sync().range(BALANCE_TS,
+                TimeRange.from(System.currentTimeMillis() - (1000 * 60 * 60 * 24 * 7))
+                        .to(System.currentTimeMillis()).build());
         Balance[] balanceTs = new Balance[tsValues.size()];
         int i = 0;
 
-        for (Entry<String, String> entry : tsValues.entrySet()) {
-            Object keyString = entry.getKey();
+        for (Sample entry : tsValues) {
+            Object keyString = entry.getTimestamp();
             Object valueString = entry.getValue();
             balanceTs[i] = new Balance(keyString, valueString);
             i++;
@@ -91,9 +90,8 @@ public SearchResults<String, String> searchTransactions(@RequestParam("term") St
         RediSearchCommands<String, String> commands = srsc.sync();
 
         SearchOptions options = SearchOptions
-                .builder().highlight(Highlight.builder().field("description").field("fromAccountName")
-                        .field("transactionType").tag(Tag.builder().open("<mark>").close("</mark>").build()).build())
-                .build();
+                .builder().highlight(SearchOptions.Highlight.builder().field("description").field("fromAccountName")
+                        .field("transactionType").tags("<mark>","</mark>").build()).build();
 
         SearchResults<String, String> results = commands.search(SEARCH_INDEX, term, options);
         return results;

src/main/java/com/redislabs/demos/redisbank/transactions/BankTransactionGenerator.java

@@ -26,13 +26,13 @@ <h1 class="auth-subtitle">Welcome to Redis Enterprise Bank!</h1>
 
                     <form name="f" action="/perform_login" method="POST">
                         <div class="form-group position-relative has-icon-left mb-4">
-                            <input type="text" name="username" class="form-control form-control-xl" placeholder="Username" autofocus>
+                            <input type="text" name="username" value="lars" class="form-control form-control-xl" placeholder="Username" autofocus>
                             <div class="form-control-icon">
                                 <i class="bi bi-person"></i>
                             </div>
                         </div>
                         <div class="form-group position-relative has-icon-left mb-4">
-                            <input type="password" name="password" class="form-control form-control-xl" placeholder="Password">
+                            <input type="password" name="password" value="larsje" class="form-control form-control-xl" placeholder="Password">
                             <div class="form-control-icon">
                                 <i class="bi bi-shield-lock"></i>
                             </div>