Switched priority of properties during merging (application.propertie…

…s > annotation properties (in a bean))
smallrye · Nov 7, 2024 · 1d5fee3 · 1d5fee3
1 parent ba24405
commit 1d5fee3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...ementation/src/main/java/io/smallrye/graphql/client/impl/GraphQLClientsConfiguration.java b/...ementation/src/main/java/io/smallrye/graphql/client/impl/GraphQLClientsConfiguration.java
@@ -152,11 +152,12 @@ public void addTypesafeClientApis(List<Class<?>> apis) {
     /**
      * Scan the passed Java interface for `@GraphQLClientApi` annotations and create and register
      * client configuration objects for it. This needs to be called by the runtime some time during initialization,
-     * before clients are actually created.
+     * before clients are actually created. Properties from the annotation will be overridden by {@code application.properties}.
      */
     public void initTypesafeClientApi(Class<?> api) {
         TypesafeClientConfigurationReader reader = new TypesafeClientConfigurationReader(api);
-        clients.merge(reader.getConfigKey(), reader.getClientConfiguration(), GraphQLClientConfiguration::merge);
+        clients.merge(reader.getConfigKey(), reader.getClientConfiguration(),
+                (graphQLClientConfiguration, fromAnnotations) -> fromAnnotations.merge(graphQLClientConfiguration));
     }
 
     public GraphQLClientConfiguration getClient(String key) {