switch pending store module to redis

app/build.gradle.kts

@@ -11,7 +11,7 @@ dependencies {
     implementation(project(":module:crypto-demo"))
     implementation(project(":module:request-demo"))
     implementation(project(":module:store-demo"))
-    implementation(project(":module:store-inmemory"))
+    implementation(project(":module:store-redis"))
     implementation(project(":service"))
     implementation(project(":service:module"))
     implementation(libs.dagger.dagger)
@@ -20,7 +20,9 @@ dependencies {
     implementation(libs.jackson.databind)
     implementation(libs.jakartaInject.api)
     implementation(libs.jakartaValidation.api)
+    implementation(libs.jedis.jedis) // for Dagger
     implementation(libs.okhttp.okhttp)
+    implementation(libs.redisEmbedded.redis) // for demo
     implementation(libs.retrofit.retrofit)
 
     testImplementation(project(":testing"))

app/src/main/java/org/example/age/app/AvsApp.java

@@ -14,7 +14,7 @@
 import org.example.age.module.crypto.demo.DemoAvsCryptoModule;
 import org.example.age.module.request.demo.DemoAccountIdModule;
 import org.example.age.module.store.demo.DemoAvsAccountStoreModule;
-import org.example.age.module.store.inmemory.InMemoryPendingStoreModule;
+import org.example.age.module.store.redis.RedisPendingStoreModule;
 import org.example.age.service.AvsServiceModule;
 import org.example.age.service.module.request.RequestContextProvider;
 
@@ -52,7 +52,7 @@ public void run(AvsAppConfig appConfig, Environment env) {
                 DemoAccountIdModule.class,
                 AvsClientModule.class,
                 DemoAvsAccountStoreModule.class,
-                InMemoryPendingStoreModule.class,
+                RedisPendingStoreModule.class,
                 DemoAvsCryptoModule.class,
                 AvsConfigModule.class,
                 EnvModule.class,

app/src/main/java/org/example/age/app/SiteApp.java

@@ -14,7 +14,7 @@
 import org.example.age.module.crypto.demo.DemoSiteCryptoModule;
 import org.example.age.module.request.demo.DemoAccountIdModule;
 import org.example.age.module.store.demo.DemoSiteAccountStoreModule;
-import org.example.age.module.store.inmemory.InMemoryPendingStoreModule;
+import org.example.age.module.store.redis.RedisPendingStoreModule;
 import org.example.age.service.SiteServiceModule;
 import org.example.age.service.module.request.RequestContextProvider;
 
@@ -52,7 +52,7 @@ public void run(SiteAppConfig appConfig, Environment env) {
                 DemoAccountIdModule.class,
                 SiteClientModule.class,
                 DemoSiteAccountStoreModule.class,
-                InMemoryPendingStoreModule.class,
+                RedisPendingStoreModule.class,
                 DemoSiteCryptoModule.class,
                 SiteConfigModule.class,
                 EnvModule.class,

app/src/main/java/org/example/age/app/config/AvsAppConfig.java

@@ -7,6 +7,7 @@
 import org.example.age.module.client.AvsClientsConfig;
 import org.example.age.module.crypto.demo.AvsKeysConfig;
 import org.example.age.module.store.demo.AvsStoresConfig;
+import org.example.age.module.store.redis.RedisConfig;
 import org.example.age.service.AvsServiceConfig;
 
 /** Configuration for the application. */
@@ -20,6 +21,10 @@ public final class AvsAppConfig extends Configuration {
     @NotNull
     private AvsClientsConfig clients;
 
+    @Valid
+    @NotNull
+    private RedisConfig redis;
+
     @Valid
     @NotNull
     private AvsStoresConfig stores;
@@ -48,6 +53,16 @@ public void setClients(AvsClientsConfig clients) {
         this.clients = clients;
     }
 
+    @JsonProperty
+    public RedisConfig getRedis() {
+        return redis;
+    }
+
+    @JsonProperty
+    public void setRedis(RedisConfig redis) {
+        this.redis = redis;
+    }
+
     @JsonProperty
     public AvsStoresConfig getStores() {
         return stores;

app/src/main/java/org/example/age/app/config/AvsConfigModule.java

@@ -5,13 +5,15 @@
 import org.example.age.module.client.AvsClientsConfig;
 import org.example.age.module.crypto.demo.AvsKeysConfig;
 import org.example.age.module.store.demo.AvsStoresConfig;
+import org.example.age.module.store.redis.RedisConfig;
 import org.example.age.service.AvsServiceConfig;
 
 /**
  * Dagger module that binds...
  * <ul>
  *     <li>{@link AvsServiceConfig}
  *     <li>{@link AvsClientsConfig}
+ *     <li>{@link RedisConfig}
  *     <li>{@link AvsStoresConfig}
  *     <li>{@link AvsKeysConfig}
  * </ul>
@@ -31,6 +33,11 @@ static AvsClientsConfig provieAvsClientsConfig(AvsAppConfig appConfig) {
         return appConfig.getClients();
     }
 
+    @Provides
+    static RedisConfig provideRedisConfig(AvsAppConfig appConfig) {
+        return appConfig.getRedis();
+    }
+
     @Provides
     static AvsStoresConfig provideAvsStoresConfig(AvsAppConfig appConfig) {
         return appConfig.getStores();

app/src/main/java/org/example/age/app/config/SiteAppConfig.java

@@ -6,6 +6,7 @@
 import jakarta.validation.constraints.NotNull;
 import org.example.age.module.client.SiteClientsConfig;
 import org.example.age.module.crypto.demo.SiteKeysConfig;
+import org.example.age.module.store.redis.RedisConfig;
 import org.example.age.service.SiteServiceConfig;
 
 /** Configuration for the application. */
@@ -19,6 +20,10 @@ public final class SiteAppConfig extends Configuration {
     @NotNull
     private SiteClientsConfig clients;
 
+    @Valid
+    @NotNull
+    private RedisConfig redis;
+
     @Valid
     @NotNull
     private SiteKeysConfig keys;
@@ -43,6 +48,16 @@ public void setClients(SiteClientsConfig clients) {
         this.clients = clients;
     }
 
+    @JsonProperty
+    public RedisConfig getRedis() {
+        return redis;
+    }
+
+    @JsonProperty
+    public void setRedis(RedisConfig redis) {
+        this.redis = redis;
+    }
+
     @JsonProperty
     public SiteKeysConfig getKeys() {
         return keys;

app/src/main/java/org/example/age/app/config/SiteConfigModule.java

@@ -4,13 +4,15 @@
 import dagger.Provides;
 import org.example.age.module.client.SiteClientsConfig;
 import org.example.age.module.crypto.demo.SiteKeysConfig;
+import org.example.age.module.store.redis.RedisConfig;
 import org.example.age.service.SiteServiceConfig;
 
 /**
  * Dagger module that binds...
  * <ul>
  *     <li>{@link SiteServiceConfig}
  *     <li>{@link SiteClientsConfig}
+ *     <li>{@link RedisConfig}
  *     <li>{@link SiteKeysConfig}
  * </ul>
  * <p>
@@ -29,6 +31,11 @@ static SiteClientsConfig provieSiteClientsConfig(SiteAppConfig appConfig) {
         return appConfig.getClients();
     }
 
+    @Provides
+    static RedisConfig provideRedisConfig(SiteAppConfig appConfig) {
+        return appConfig.getRedis();
+    }
+
     @Provides
     static SiteKeysConfig provideSiteKeysConfig(SiteAppConfig appConfig) {
         return appConfig.getKeys();

app/src/main/java/org/example/age/demo/Demo.java

@@ -28,8 +28,9 @@ public final class Demo {
 
     /** Main method. */
     @SuppressWarnings("CatchAndPrintStackTrace")
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
         try {
+            DemoInfra.startRedis();
             DemoInfra.startServer(checkMyAge, "config-check-my-age.yaml");
             DemoInfra.startServer(crackle, "config-crackle.yaml");
             DemoInfra.startServer(pop, "config-pop.yaml");
@@ -41,7 +42,7 @@ public static void main(String[] args) {
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
-            System.exit(0);
+            DemoInfra.stop();
         }
     }
 

app/src/main/java/org/example/age/demo/DemoInfra.java

@@ -5,20 +5,30 @@
 import io.dropwizard.core.Application;
 import io.dropwizard.jackson.Jackson;
 import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import org.example.age.api.client.retrofit.ApiClient;
+import redis.embedded.RedisServer;
 
 /** Client/server infrastructure for the demo. */
 public final class DemoInfra {
 
+    private static RedisServer redis;
+
     private static final OkHttpClient httpClient = new OkHttpClient();
     private static final ObjectWriter objectWriter = Jackson.newObjectMapper()
             .setSerializationInclusion(JsonInclude.Include.NON_NULL)
             .writerWithDefaultPrettyPrinter();
 
+    /** Starts Redis. */
+    public static void startRedis() throws IOException {
+        redis = new RedisServer(6379);
+        redis.start();
+    }
+
     /** Starts an application. */
     public static void startServer(Application<?> app, String configPath) throws Exception {
         app.run("server", getResourcePath(configPath));
@@ -41,6 +51,12 @@ public static ObjectWriter getObjectWriter() {
         return objectWriter;
     }
 
+    /** Stops everything (and terminates the application). */
+    public static void stop() throws IOException {
+        redis.stop();
+        System.exit(0);
+    }
+
     /** Get the absolute path of a resource file. */
     private static String getResourcePath(String relativePath) throws URISyntaxException {
         ClassLoader classLoader = DemoInfra.class.getClassLoader();

app/src/main/resources/config-check-my-age.yaml

@@ -9,6 +9,9 @@ clients:
     crackle: http://localhost:8080
     pop: http://localhost:8081
 
+redis:
+  url: http://localhost:6379
+
 stores:
   verifiedAccounts:
     John Smith:

app/src/main/resources/config-crackle.yaml

@@ -5,6 +5,9 @@ service:
 clients:
   avsUrl: http://localhost:9090
 
+redis:
+  url: http://localhost:6379
+
 keys:
   signing:
     wX: 61340499596180719707288738669477306360190613239883629564918816825111167687915

app/src/main/resources/config-pop.yaml

@@ -5,6 +5,9 @@ service:
 clients:
   avsUrl: http://localhost:9090
 
+redis:
+  url: http://localhost:6379
+
 keys:
   signing:
     wX: 61340499596180719707288738669477306360190613239883629564918816825111167687915

app/src/test/java/org/example/age/app/AppVerificationTest.java

@@ -15,6 +15,7 @@
 import org.example.age.app.config.AvsAppConfig;
 import org.example.age.app.config.SiteAppConfig;
 import org.example.age.app.testing.TestServiceClient;
+import org.example.age.testing.RedisExtension;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import retrofit2.Response;
@@ -29,6 +30,9 @@ public final class AppVerificationTest {
     private static final DropwizardAppExtension<AvsAppConfig> avsApp =
             new DropwizardAppExtension<>(AvsApp.class, ResourceHelpers.resourceFilePath("config-avs.yaml"));
 
+    @RegisterExtension
+    private static final RedisExtension redis = new RedisExtension(6379);
+
     @RegisterExtension
     private static final TestServiceClient<SiteApi> siteClient =
             new TestServiceClient<>(8080, "username", SiteApi.class);

app/src/test/resources/config-avs.yaml

@@ -7,6 +7,9 @@ clients:
   siteUrls:
     site: http://localhost:8080
 
+redis:
+  url: http://localhost:6379
+
 stores:
   verifiedAccounts:
     person:

app/src/test/resources/config-site.yaml

@@ -5,6 +5,9 @@ service:
 clients:
   avsUrl: http://localhost:9090
 
+redis:
+  url: http://localhost:6379
+
 keys:
   signing:
     wX: 61340499596180719707288738669477306360190613239883629564918816825111167687915