fix: clone configuration instead of creating a new one

gravitee-io · Jan 8, 2024 · 80b3989 · 80b3989
1 parent d555303
commit 80b3989
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 7 deletions.
diff --git a/gravitee-plugin-annotation-processors/pom.xml b/gravitee-plugin-annotation-processors/pom.xml
@@ -61,6 +61,11 @@
             <artifactId>lombok</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
         <!-- Tests dependencies -->
         <dependency>
             <groupId>com.google.testing.compile</groupId>
@@ -101,4 +106,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
diff --git a/gravitee-plugin-annotation-processors/src/main/resources/templates/evaluatorHeader.mustache b/gravitee-plugin-annotation-processors/src/main/resources/templates/evaluatorHeader.mustache
@@ -15,13 +15,14 @@
 */
 package {{packageName}};
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import io.gravitee.gateway.reactive.api.ExecutionFailure;
 import io.gravitee.gateway.reactive.api.context.ExecutionContext;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.core.Single;
-
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
@@ -43,6 +44,8 @@ public class {{evaluatorSimpleClassName}} {
 
     private final Logger logger = LoggerFactory.getLogger({{evaluatorSimpleClassName}}.class);
 
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
     private final {{simpleClassName}} configuration;
 
     private static final Validator validator;
@@ -194,8 +197,14 @@ public class {{evaluatorSimpleClassName}} {
             return Single.just(evaluatedConf);
         }
 
-        {{simpleClassName}} evaluatedConfiguration = new {{simpleClassName}}();
+        {{simpleClassName}} evaluatedConfiguration;
+        try {
+            evaluatedConfiguration = objectMapper.readValue(objectMapper.writeValueAsString(configuration), {{simpleClassName}}.class);
+        } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
+            logger.error("Unable to clone configuration", e);
+            return Single.error(e);
+        }
+
         String currentAttributePrefix = attributePrefix;
 
         List<Maybe<String>> toEval = new ArrayList<>();
-
diff --git a/...est/java/io/gravitee/plugin/annotation/processor/ConfigurationEvaluatorGeneratedTest.java b/...est/java/io/gravitee/plugin/annotation/processor/ConfigurationEvaluatorGeneratedTest.java
@@ -24,18 +24,23 @@
 import static org.mockito.Mockito.when;
 
 import io.gravitee.gateway.reactive.api.context.ExecutionContext;
+import io.gravitee.plugin.annotation.processor.result.KeyStore;
+import io.gravitee.plugin.annotation.processor.result.SecurityConfiguration;
 import io.gravitee.plugin.annotation.processor.result.SecurityProtocol;
+import io.gravitee.plugin.annotation.processor.result.Ssl;
 import io.gravitee.plugin.annotation.processor.result.TestConfiguration;
 import io.gravitee.plugin.annotation.processor.result.TestConfigurationEvaluator;
+import io.gravitee.plugin.annotation.processor.result.TrustStore;
 import io.reactivex.rxjava3.core.Maybe;
 import io.reactivex.rxjava3.observers.TestObserver;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import java.util.Map;
-import java.util.Set;
 
 /**
  * @author Remi Baptiste (remi.baptiste at graviteesource.com)
@@ -135,4 +140,39 @@ public void should_return_evaluated_configuration_from_internal_attribute() {
 
         verify(spiedContext, times(0)).setInternalAttribute(anyString(), any(TestConfiguration.class));
     }
+
+    @Test
+    public void should_return_original_configuration() {
+        var consumer = TestConfiguration.Consumer
+            .builder()
+            .enabled(true)
+            .autoOffsetReset("none")
+            .attributes(List.of("attribute1"))
+            .topics(Set.of("topic1"))
+            .build();
+        consumer.setTopicPattern("topic-pattern");
+        consumer.setTrustStore(TrustStore.builder().key("my-key").build());
+        var securityConfiguration = SecurityConfiguration.builder().property("my-prop").build();
+        var ssl = Ssl.builder().keyStore(KeyStore.builder().key("keystore-key").build()).timeout(10L).build();
+
+        var originalConfiguration = new TestConfiguration(SecurityProtocol.SASL_SSL, ssl, securityConfiguration, consumer);
+        evaluator = new TestConfigurationEvaluator(originalConfiguration);
+
+        TestObserver<TestConfiguration> testObserver = evaluator.eval(new ExecutionContext()).test();
+
+        testObserver.assertComplete();
+
+        testObserver.assertValue(testConfiguration -> {
+            assertThat(testConfiguration.getConsumer().isEnabled()).isTrue();
+            assertThat(testConfiguration.getConsumer().getAutoOffsetReset()).isEqualTo("none");
+            assertThat(testConfiguration.getConsumer().getAttributes()).isEqualTo(List.of("attribute1"));
+            assertThat(testConfiguration.getConsumer().getTopics()).isEqualTo(Set.of("topic1"));
+            assertThat(testConfiguration.getConsumer().getTopicPattern()).isEqualTo("topic-pattern");
+            assertThat(testConfiguration.getConsumer().getTrustStore().getKey()).isEqualTo("my-key");
+            assertThat(testConfiguration.getSecurity().getProperty()).isEqualTo("my-prop");
+            assertThat(testConfiguration.getSsl().getKeyStore().getKey()).isEqualTo("keystore-key");
+            assertThat(testConfiguration.getSsl().getTimeout()).isEqualTo(10L);
+            return true;
+        });
+    }
 }
diff --git a/...ion-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/KeyStore.java b/...ion-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/KeyStore.java
@@ -15,6 +15,13 @@
  */
 package io.gravitee.plugin.annotation.processor.result;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class KeyStore {
 
     private String key;

diff --git a/...s/src/test/java/io/gravitee/plugin/annotation/processor/result/SecurityConfiguration.java b/...s/src/test/java/io/gravitee/plugin/annotation/processor/result/SecurityConfiguration.java
@@ -15,6 +15,13 @@
  */
 package io.gravitee.plugin.annotation.processor.result;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class SecurityConfiguration {
 
     private String property;

diff --git a/...notation-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/Ssl.java b/...notation-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/Ssl.java
@@ -15,6 +15,13 @@
  */
 package io.gravitee.plugin.annotation.processor.result;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Ssl {
 
     private KeyStore keyStore;

diff --git a/...n-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/TrustStore.java b/...n-processors/src/test/java/io/gravitee/plugin/annotation/processor/result/TrustStore.java
@@ -15,6 +15,13 @@
  */
 package io.gravitee.plugin.annotation.processor.result;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class TrustStore {
 
     private String key;

diff --git a/...itee-plugin-annotation-processors/src/test/resources/test/TestConfigurationEvaluator.java b/...itee-plugin-annotation-processors/src/test/resources/test/TestConfigurationEvaluator.java
@@ -15,6 +15,7 @@
  */
 package io.gravitee.plugin.annotation.processor.result;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.gravitee.gateway.reactive.api.ExecutionFailure;
 import io.gravitee.gateway.reactive.api.context.ExecutionContext;
 import io.reactivex.rxjava3.core.Completable;
@@ -40,6 +41,8 @@ public class TestConfigurationEvaluator {
 
     private final Logger logger = LoggerFactory.getLogger(TestConfigurationEvaluator.class);
 
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
     private final TestConfiguration configuration;
 
     private static final Validator validator;
@@ -179,7 +182,13 @@ public Single<TestConfiguration> eval(ExecutionContext ctx) {
             return Single.just(evaluatedConf);
         }
 
-        TestConfiguration evaluatedConfiguration = new TestConfiguration();
+        TestConfiguration evaluatedConfiguration;
+        try {
+            evaluatedConfiguration = objectMapper.readValue(objectMapper.writeValueAsString(configuration), TestConfiguration.class);
+        } catch (com.fasterxml.jackson.core.JsonProcessingException e) {
+            logger.error("Unable to clone configuration", e);
+            return Single.error(e);
+        }
         String currentAttributePrefix = attributePrefix;
 
         List<Maybe<String>> toEval = new ArrayList<>();