allow configuration of default value for remoteDatacenterFallbackEnab…

…led (#1875) * allow configuration of default value for remoteDatacenterFallbackEnabled * remove redundant test
allegro · Jul 2, 2024 · 1e634b4 · 1e634b4
1 parent 2673b98
commit 1e634b4
Show file tree

Hide file tree

Showing 12 changed files with 90 additions and 19 deletions.
diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/Topic.java
@@ -37,7 +37,8 @@ public class Topic {
     private boolean jsonToAvroDryRunEnabled = false;
     @NotNull
     private Ack ack;
-    private boolean fallbackToRemoteDatacenterEnabled;
+    public static final String DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY = "defaultFallbackToRemoteDatacenterEnabled";
+    private final boolean fallbackToRemoteDatacenterEnabled;
     private PublishingChaosPolicy chaos;
     @NotNull
     private ContentType contentType;
@@ -58,8 +59,10 @@ public class Topic {
     private Instant modifiedAt;
 
     public Topic(TopicName name, String description, OwnerId owner, RetentionTime retentionTime,
-                 boolean migratedFromJsonType, Ack ack, boolean fallbackToRemoteDatacenterEnabled, PublishingChaosPolicy chaos,
-                 boolean trackingEnabled, ContentType contentType, boolean jsonToAvroDryRunEnabled,
+                 boolean migratedFromJsonType, Ack ack,
+                 @JacksonInject(value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, useInput = OptBoolean.TRUE)
+                 Boolean fallbackToRemoteDatacenterEnabled,
+                 PublishingChaosPolicy chaos, boolean trackingEnabled, ContentType contentType, boolean jsonToAvroDryRunEnabled,
                  @JacksonInject(value = DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, useInput = OptBoolean.TRUE)
                  Boolean schemaIdAwareSerializationEnabled,
                  int maxMessageSize, PublishingAuth publishingAuth, boolean subscribingRestricted,
@@ -93,7 +96,8 @@ public Topic(
             @JsonProperty("retentionTime") RetentionTime retentionTime,
             @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
             @JsonProperty("ack") Ack ack,
-            @JsonProperty("fallbackToRemoteDatacenterEnabled") boolean fallbackToRemoteDatacenterEnabled,
+            @JacksonInject(value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, useInput = OptBoolean.TRUE)
+            @JsonProperty("fallbackToRemoteDatacenterEnabled") Boolean fallbackToRemoteDatacenterEnabled,
             @JsonProperty("chaos") PublishingChaosPolicy chaos,
             @JsonProperty("trackingEnabled") boolean trackingEnabled,
             @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,

diff --git a/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java b/hermes-api/src/main/java/pl/allegro/tech/hermes/api/TopicWithSchema.java
@@ -32,7 +32,9 @@ public TopicWithSchema(@JsonProperty("schema") String schema,
                            @JsonProperty("retentionTime") RetentionTime retentionTime,
                            @JsonProperty("jsonToAvroDryRun") boolean jsonToAvroDryRunEnabled,
                            @JsonProperty("ack") Ack ack,
-                           @JsonProperty("fallbackToRemoteDatacenterEnabled") boolean fallbackToRemoteDatacenterEnabled,
+                           @JsonProperty("fallbackToRemoteDatacenterEnabled")
+                           @JacksonInject(value = DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, useInput = OptBoolean.TRUE)
+                           boolean fallbackToRemoteDatacenterEnabled,
                            @JsonProperty("chaos") PublishingChaosPolicy chaos,
                            @JsonProperty("trackingEnabled") boolean trackingEnabled,
                            @JsonProperty("migratedFromJsonType") boolean migratedFromJsonType,

diff --git a/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java b/hermes-api/src/test/java/pl/allegro/tech/hermes/api/TopicTest.java
@@ -9,7 +9,7 @@
 
 public class TopicTest {
 
-    private final ObjectMapper objectMapper = createObjectMapper();
+    private final ObjectMapper objectMapper = createObjectMapper(false);
 
     @Test
     public void shouldDeserializeTopicWithDefaults() throws Exception {
@@ -65,11 +65,42 @@ public void shouldSkippedDeserializedOldSchemaVersionId() throws Exception {
         assertThat(topic.getName().getName()).isEqualTo("bar");
     }
 
-    private ObjectMapper createObjectMapper() {
+    @Test
+    public void shouldDeserializeFallbackToRemoteDatacenterWithDefaults() throws Exception {
+        // given
+        String json = "{\"name\":\"foo.bar\", \"description\": \"description\"}";
+
+        // when
+        Topic topic = objectMapper.readValue(json, Topic.class);
+
+        // then
+        assertThat(topic.isFallbackToRemoteDatacenterEnabled()).isEqualTo(false);
+
+        // and when
+        Topic topic2 = createObjectMapper(true).readValue(json, Topic.class);
+
+        // then
+        assertThat(topic2.isFallbackToRemoteDatacenterEnabled()).isEqualTo(true);
+    }
+
+    @Test
+    public void shouldDeserializeFallbackToRemoteDatacenter() throws Exception {
+        // given
+        String json = "{\"name\":\"foo.bar\", \"description\": \"description\", \"fallbackToRemoteDatacenterEnabled\": true}";
+
+        // when
+        Topic topic = objectMapper.readValue(json, Topic.class);
+
+        // then
+        assertThat(topic.isFallbackToRemoteDatacenterEnabled()).isEqualTo(true);
+    }
+
+    private ObjectMapper createObjectMapper(boolean fallbackToRemoteDatacenterEnabled) {
         ObjectMapper mapper = new ObjectMapper();
 
         final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues
-            .Std().addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, true);
+            .Std().addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, true)
+                .addValue(Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, fallbackToRemoteDatacenterEnabled);
 
         mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
         mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);

diff --git a/...-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java b/...-common/src/main/java/pl/allegro/tech/hermes/common/di/factories/ObjectMapperFactory.java
@@ -11,9 +11,11 @@
 public class ObjectMapperFactory {
 
     private final boolean schemaIdSerializationEnabled;
+    private final boolean fallbackToRemoteDatacenterEnabled;
 
-    public ObjectMapperFactory(boolean schemaIdSerializationEnabled) {
+    public ObjectMapperFactory(boolean schemaIdSerializationEnabled, boolean fallbackToRemoteDatacenterEnabled) {
         this.schemaIdSerializationEnabled = schemaIdSerializationEnabled;
+        this.fallbackToRemoteDatacenterEnabled = fallbackToRemoteDatacenterEnabled;
     }
 
     public ObjectMapper provide() {
@@ -23,8 +25,9 @@ public ObjectMapper provide() {
         objectMapper.disable(SerializationFeature.WRITE_NULL_MAP_VALUES);
         objectMapper.registerModule(new JavaTimeModule());
 
-        final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues
-                .Std().addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, schemaIdSerializationEnabled);
+        final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues.Std()
+                .addValue(Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY, schemaIdSerializationEnabled)
+                .addValue(Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, fallbackToRemoteDatacenterEnabled);
         objectMapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
 
         return objectMapper;

diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
@@ -31,7 +31,7 @@ abstract class IntegrationTest extends Specification {
 
     protected RepositoryWaiter wait = new RepositoryWaiter(zookeeperResource.curator(), paths)
 
-    protected ObjectMapper mapper = new ObjectMapperFactory(true).provide()
+    protected ObjectMapper mapper = new ObjectMapperFactory(true, false).provide()
 
     protected ZookeeperGroupRepository groupRepository = new ZookeeperGroupRepository(zookeeper(), mapper, paths)
 

diff --git a/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java b/hermes-common/src/test/java/pl/allegro/tech/hermes/common/di/ObjectMapperFactoryTest.java
@@ -14,7 +14,7 @@ public class ObjectMapperFactoryTest {
 
     @Before
     public void init() {
-        ObjectMapperFactory factory = new ObjectMapperFactory(false);
+        ObjectMapperFactory factory = new ObjectMapperFactory(false, false);
         mapper = factory.provide();
     }
 

diff --git a/...-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java b/...-consumers/src/main/java/pl/allegro/tech/hermes/consumers/config/CommonConfiguration.java
@@ -176,7 +176,11 @@ public ZookeeperAdminCache zookeeperAdminCache(ZookeeperPaths zookeeperPaths,
 
     @Bean
     public ObjectMapper objectMapper(SchemaProperties schemaProperties) {
-        return new ObjectMapperFactory(schemaProperties.isIdSerializationEnabled()).provide();
+        return new ObjectMapperFactory(
+                schemaProperties.isIdSerializationEnabled(),
+                /* fallbackToRemoteDatacenter is frontend specific property, we so don't expose consumer side property for it */
+                false
+        ).provide();
     }
 
 

diff --git a/...es-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java b/...es-frontend/src/main/java/pl/allegro/tech/hermes/frontend/config/CommonConfiguration.java
@@ -83,7 +83,8 @@
         ZookeeperClustersProperties.class,
         KafkaClustersProperties.class,
         ContentRootProperties.class,
-        DatacenterNameProperties.class
+        DatacenterNameProperties.class,
+        TopicDefaultsProperties.class
 })
 public class CommonConfiguration {
 
@@ -183,8 +184,8 @@ public ZookeeperAdminCache zookeeperAdminCache(ZookeeperPaths zookeeperPaths,
     }
 
     @Bean
-    public ObjectMapper objectMapper(SchemaProperties schemaProperties) {
-        return new ObjectMapperFactory(schemaProperties.isIdSerializationEnabled()).provide();
+    public ObjectMapper objectMapper(SchemaProperties schemaProperties, TopicDefaultsProperties topicDefaults) {
+        return new ObjectMapperFactory(schemaProperties.isIdSerializationEnabled(), topicDefaults.isFallbackToRemoteDatacenterEnabled()).provide();
     }
 
     @Bean

diff --git a/...rontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicDefaultsProperties.java b/...rontend/src/main/java/pl/allegro/tech/hermes/frontend/config/TopicDefaultsProperties.java
@@ -0,0 +1,16 @@
+package pl.allegro.tech.hermes.frontend.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "frontend.topic.defaults")
+public class TopicDefaultsProperties {
+    private boolean fallbackToRemoteDatacenterEnabled = false;
+
+    public boolean isFallbackToRemoteDatacenterEnabled() {
+        return fallbackToRemoteDatacenterEnabled;
+    }
+
+    public void setFallbackToRemoteDatacenterEnabled(boolean fallbackToRemoteDatacenterEnabled) {
+        this.fallbackToRemoteDatacenterEnabled = fallbackToRemoteDatacenterEnabled;
+    }
+}
diff --git a/...ement/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java b/...ement/src/main/java/pl/allegro/tech/hermes/management/config/ManagementConfiguration.java
@@ -46,7 +46,8 @@ public ObjectMapper objectMapper() {
 
         final InjectableValues defaultSchemaIdAwareSerializationEnabled = new InjectableValues.Std().addValue(
                 Topic.DEFAULT_SCHEMA_ID_SERIALIZATION_ENABLED_KEY,
-                topicProperties.isDefaultSchemaIdAwareSerializationEnabled());
+                topicProperties.isDefaultSchemaIdAwareSerializationEnabled())
+                .addValue(Topic.DEFAULT_FALLBACK_TO_REMOTE_DATACENTER_KEY, topicProperties.isDefaultFallbackToRemoteDatacenterEnabled());
 
         mapper.setInjectableValues(defaultSchemaIdAwareSerializationEnabled);
 

diff --git a/...es-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java b/...es-management/src/main/java/pl/allegro/tech/hermes/management/config/TopicProperties.java
@@ -34,6 +34,8 @@ public class TopicProperties {
 
     private boolean defaultSchemaIdAwareSerializationEnabled = false;
 
+    private boolean defaultFallbackToRemoteDatacenterEnabled = false;
+
     private boolean avroContentTypeMetadataRequired = true;
 
     /**
@@ -155,6 +157,14 @@ public void setDefaultSchemaIdAwareSerializationEnabled(boolean defaultSchemaIdA
         this.defaultSchemaIdAwareSerializationEnabled = defaultSchemaIdAwareSerializationEnabled;
     }
 
+    public boolean isDefaultFallbackToRemoteDatacenterEnabled() {
+        return defaultFallbackToRemoteDatacenterEnabled;
+    }
+
+    public void setDefaultFallbackToRemoteDatacenterEnabled(boolean defaultFallbackToRemoteDatacenterEnabled) {
+        this.defaultFallbackToRemoteDatacenterEnabled = defaultFallbackToRemoteDatacenterEnabled;
+    }
+
     public boolean isAvroContentTypeMetadataRequired() {
         return avroContentTypeMetadataRequired;
     }

diff --git a/...management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java b/...management/src/main/java/pl/allegro/tech/hermes/management/domain/topic/TopicService.java
@@ -5,7 +5,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import pl.allegro.tech.hermes.api.ContentType;
 import pl.allegro.tech.hermes.api.MessageTextPreview;
 import pl.allegro.tech.hermes.api.OwnerId;
 import pl.allegro.tech.hermes.api.PatchData;