Skip to content

Spring cloud azure 6.0 preview #45222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrm9084 merged 50 commits into from
Aug 26, 2025
Merged

Spring cloud azure 6.0 preview #45222

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
8dd4aae
Spring Feature Management - RemoveV1Schema (#43405)
mrm9084 Dec 16, 2024
48fdd28
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Jan 15, 2025
c7a559a
New Data loader (#43802)
mrm9084 Jan 23, 2025
a6d8ed1
Fix Endian (#43932)
mrm9084 Feb 3, 2025
d3750bf
Feature context and Async Filters (#43435)
mrm9084 Feb 5, 2025
a4de2bc
Push Refresh Telemetry (#44170)
mrm9084 Feb 13, 2025
cb2c369
Update to use Evaluation Event (#44070)
mrm9084 Feb 13, 2025
8ed4901
Adding Default Filters (#43935)
mrm9084 Feb 21, 2025
736d9f5
Variants (#42853)
mrm9084 Feb 24, 2025
c394d7f
Removed feature flags from configuration (#44558)
mrm9084 Mar 31, 2025
6ac0c5e
Feature management Snapshot (#44621)
mrm9084 Apr 22, 2025
383d84d
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Apr 29, 2025
d59dafa
Adding missing java docs (#45169)
mrm9084 May 1, 2025
57e5cc5
Feature Management Telemetry (#45073)
mrm9084 May 6, 2025
a52639d
Update external_dependencies.txt
mrm9084 May 7, 2025
aecbc40
fixing external dependencies
mrm9084 May 16, 2025
61e2f5c
Update external_dependencies.txt
mrm9084 May 16, 2025
6090a6a
Update external_dependencies.txt
mrm9084 May 16, 2025
641c527
pom update
mrm9084 May 20, 2025
d664129
Fix Log
mrm9084 May 20, 2025
6fd9779
Fixing some bugs
mrm9084 May 27, 2025
cee0305
Adding missing java docs (#45551)
mrm9084 Jun 3, 2025
871dc26
App Config 6.0 bug fixes (#45568)
mrm9084 Jun 3, 2025
f297bd0
Fix format issues
mrm9084 Jun 3, 2025
4577892
fix build issues
mrm9084 Jun 3, 2025
8d2ff20
Updating poms
mrm9084 Jun 3, 2025
58b393d
Update external_dependencies.txt
mrm9084 Jun 3, 2025
8ffeab4
Fixing poms
mrm9084 Jun 4, 2025
e980eae
Update pom.xml
mrm9084 Jun 4, 2025
cd2a4e4
try to fix pom
mrm9084 Jun 4, 2025
d8a1a0e
Increment package versions for spring releases (#45589)
azure-sdk Jun 5, 2025
1c0b4cd
Undoing change from beta release
mrm9084 Aug 5, 2025
c4960f0
Updating provider readme
mrm9084 Aug 5, 2025
1fe1577
Update version_client.txt
mrm9084 Aug 5, 2025
a703c0b
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 6, 2025
d1ebd3d
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 6, 2025
f2d378c
Update external_dependencies.txt
mrm9084 Aug 6, 2025
4bc47f2
Merge branch 'SpringCloudAzure6.0-Preview' of https://github.com/Azur…
mrm9084 Aug 6, 2025
07ab3ae
Update pom.xml
mrm9084 Aug 6, 2025
b61c375
Update pom.xml
mrm9084 Aug 6, 2025
6d6dee5
Update pom.xml
mrm9084 Aug 6, 2025
b1b0d51
Fixing deprecation
mrm9084 Aug 6, 2025
bded510
Copilot fixes
mrm9084 Aug 7, 2025
df1ffc7
Update LoggerTelemetryPublisher.java
mrm9084 Aug 7, 2025
da8508d
code review items
mrm9084 Aug 12, 2025
3499e15
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 12, 2025
c391fff
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 14, 2025
1aa68c0
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 15, 2025
eb346cf
Merge branch 'main' into SpringCloudAzure6.0-Preview
mrm9084 Aug 22, 2025
6d86973
Fixing feature name setting + adding tests
mrm9084 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,6 @@ springboot3_org.springframework.boot:spring-boot-test;3.5.4
springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.4
springboot3_org.springframework.cloud:spring-cloud-bus;4.3.0
springboot3_org.springframework.cloud:spring-cloud-context;4.3.0
springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;4.3.0
springboot3_org.springframework.cloud:spring-cloud-starter-stream-kafka;4.3.0
springboot3_org.springframework.cloud:spring-cloud-stream-test-binder;4.3.0
springboot3_org.springframework.cloud:spring-cloud-stream;4.3.0
Expand Down Expand Up @@ -413,6 +412,8 @@ springboot3_org.springframework:spring-web;6.2.9
springboot3_org.springframework:spring-webmvc;6.2.9
springboot3_org.testcontainers:junit-jupiter;1.21.3
springboot3_org.testcontainers:azure;1.21.3
springboot3_jakarta.annotation:jakarta.annotation-api;3.0.0
springboot3_ch.qos.logback:logback-classic;1.5.18
# Used for Spring version updates
springboot3_org.springframework.boot:spring-boot-dependencies;3.5.4
springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.0
Expand Down
10 changes: 5 additions & 5 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ com.microsoft.azure:azure-eventhubs-eph;3.3.0;3.4.0-beta.1
com.microsoft.azure:azure-servicebus;3.6.7;3.7.0-beta.1
com.microsoft.azure:azure-media;1.0.0-beta.1;1.0.0-beta.1
com.azure.spring:azure-monitor-spring-native-test;1.0.0-beta.1;1.0.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;5.23.0;5.24.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config;5.23.0;5.24.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management-web;5.23.0;5.24.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management;5.23.0;5.24.0-beta.1
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;5.23.0;5.24.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;6.0.0;6.0.0-beta.2
com.azure.spring:spring-cloud-azure-appconfiguration-config;6.0.0;6.0.0-beta.2
com.azure.spring:spring-cloud-azure-feature-management-web;6.0.0;6.0.0-beta.2
com.azure.spring:spring-cloud-azure-feature-management;6.0.0;6.0.0-beta.2
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;6.0.0;6.0.0-beta.2
com.azure.spring:spring-cloud-azure-dependencies;5.23.0;5.24.0-beta.1
com.azure.spring:spring-messaging-azure;5.23.0;5.24.0-beta.1
com.azure.spring:spring-messaging-azure-eventhubs;5.23.0;5.24.0-beta.1
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
<version>5.24.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<version>6.0.0-beta.2</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<optional>true</optional>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-actuator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
<version>5.24.0-beta.1</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<version>6.0.0-beta.2</version><!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<optional>true</optional>
</dependency>
<!-- For Testing -->
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 5.24.0-beta.1 (Unreleased)
## 6.0.0-beta.2 (Unreleased)

### Features Added

Expand Down
4 changes: 2 additions & 2 deletions sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
<version>5.24.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
<version>6.0.0-beta.2</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config-web;current} -->
Comment thread
mrm9084 marked this conversation as resolved.
<name>Spring Cloud Azure App Configuration Config Web</name>
<description>Integration of Spring Cloud Config and Azure App Configuration Service</description>
<properties>
Expand All @@ -21,7 +21,7 @@
<dependency>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
<version>5.24.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
<version>6.0.0-beta.2</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
3 changes: 2 additions & 1 deletion ...appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.lang.NonNull;
import org.springframework.web.context.support.ServletRequestHandledEvent;

import com.azure.spring.cloud.appconfiguration.config.AppConfigurationRefresh;
Expand All @@ -32,7 +33,7 @@ public AppConfigurationEventListener(AppConfigurationRefresh appConfigurationRef
}

@Override
public void onApplicationEvent(ServletRequestHandledEvent event) {
public void onApplicationEvent(@NonNull ServletRequestHandledEvent event) {
try {
if (!(event.getRequestUrl().equals(ACTUATOR + APPCONFIGURATION_REFRESH)
|| event.getRequestUrl().equals(ACTUATOR + APPCONFIGURATION_REFRESH_BUS))) {
Expand Down
3 changes: 2 additions & 1 deletion ...ion/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.lang.NonNull;

import com.azure.spring.cloud.appconfiguration.config.AppConfigurationRefresh;

Expand All @@ -31,7 +32,7 @@ public AppConfigurationBusRefreshEventListener(AppConfigurationRefresh appConfig
* @param event Event Triggering refresh, contains valid config store endpoint.
*/
@Override
public void onApplicationEvent(AppConfigurationBusRefreshEvent event) {
public void onApplicationEvent(@NonNull AppConfigurationBusRefreshEvent event) {
try {
appConfigurationRefresh.expireRefreshInterval(event.getEndpoint(), event.getSyncToken());
} catch (Exception e) {
Expand Down
8 changes: 4 additions & 4 deletions ...pconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.web.annotation.ControllerEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.cloud.context.refresh.ContextRefresher;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
import org.springframework.http.HttpStatus;
import org.springframework.lang.NonNull;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
Expand All @@ -29,8 +30,7 @@
/**
* Endpoint for requesting new configurations to be loaded.
*/
@SuppressWarnings("removal")
@ControllerEndpoint(id = APPCONFIGURATION_REFRESH)
@Endpoint(id = APPCONFIGURATION_REFRESH)
public class AppConfigurationRefreshEndpoint implements ApplicationEventPublisherAware {

private static final Logger LOGGER = LoggerFactory.getLogger(AppConfigurationRefreshEndpoint.class);
Expand Down Expand Up @@ -105,7 +105,7 @@ public String refresh(HttpServletRequest request, HttpServletResponse response,
}

@Override
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
public void setApplicationEventPublisher(@NonNull ApplicationEventPublisher applicationEventPublisher) {
this.publisher = applicationEventPublisher;
}

Expand Down
3 changes: 2 additions & 1 deletion ...iguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationListener;
import org.springframework.lang.NonNull;

import com.azure.spring.cloud.appconfiguration.config.AppConfigurationRefresh;

Expand Down Expand Up @@ -32,7 +33,7 @@ public AppConfigurationRefreshEventListener(AppConfigurationRefresh appConfigura
* @param event Event Triggering refresh, contains valid config store endpoint.
*/
@Override
public void onApplicationEvent(AppConfigurationRefreshEvent event) {
public void onApplicationEvent(@NonNull AppConfigurationRefreshEvent event) {
try {
appConfigurationRefresh.expireRefreshInterval(event.getEndpoint(), event.getSyncToken());
} catch (Exception e) {
Expand Down
100 changes: 0 additions & 100 deletions .../appconfiguration/config/web/implementation/AppConfigurationWebAutoConfigurationTest.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion sdk/spring/spring-cloud-azure-appconfiguration-config/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Release History

## 5.24.0-beta.1 (Unreleased)
## 6.0.0-beta.2 (Unreleased)

### Features Added

Expand All @@ -10,6 +10,7 @@

### Other Changes


## 5.23.0 (2025-08-05)

Please refer to [spring/CHANGELOG.md](https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/spring/CHANGELOG.md#5230-2025-08-05) for more details.
Expand Down
14 changes: 7 additions & 7 deletions sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.azure.spring</groupId>
<artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
<version>5.24.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
<version>6.0.0-beta.2</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;current} -->
<name>Spring Cloud Azure App Configuration Config</name>
<description>Integration of Spring Cloud Config and Azure App Configuration Service</description>
<properties>
Expand All @@ -29,11 +29,6 @@
<version>3.5.4</version> <!-- {x-version-update;springboot3_org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>4.3.0</version> <!-- {x-version-update;springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
Expand All @@ -45,6 +40,11 @@
<version>3.5.4</version> <!-- {x-version-update;springboot3_org.springframework.boot:spring-boot-actuator;external_dependency} -->
<scope>compile</scope>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version> <!-- {x-version-update;springboot3_jakarta.annotation:jakarta.annotation-api;external_dependency} -->
</dependency>
<!--Azure Java SDK -->
<dependency>
<groupId>com.azure</groupId>
Expand Down Expand Up @@ -183,7 +183,7 @@
<include>org.springframework.boot:spring-boot-autoconfigure:[3.5.4]</include> <!-- {x-include-update;springboot3_org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[4.3.0]</include> <!-- {x-include-update;springboot3_org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[3.5.4]</include> <!-- {x-include-update;springboot3_org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[4.3.0]</include> <!-- {x-include-update;springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>jakarta.annotation:jakarta.annotation-api:[3.0.0]</include> <!-- {x-include-update;springboot3_jakarta.annotation:jakarta.annotation-api;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
42 changes: 17 additions & 25 deletions ...ig/AppConfigurationAutoConfiguration.java → ...pConfigurationWatchAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,46 @@
// Licensed under the MIT License.
package com.azure.spring.cloud.appconfiguration.config;

import org.springframework.boot.BootstrapContext;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.endpoint.RefreshEndpoint;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableAsync;

import com.azure.spring.cloud.appconfiguration.config.implementation.AppConfigurationPullRefresh;
import com.azure.spring.cloud.appconfiguration.config.implementation.AppConfigurationRefreshUtil;
import com.azure.spring.cloud.appconfiguration.config.implementation.AppConfigurationReplicaClientFactory;
import com.azure.spring.cloud.appconfiguration.config.implementation.autofailover.ReplicaLookUp;
import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProperties;
import com.azure.spring.cloud.appconfiguration.config.implementation.properties.AppConfigurationProviderProperties;

/**
* Setup AppConfigurationRefresh when <i>spring.cloud.azure.appconfiguration.enabled</i> is enabled.
*/
@Configuration
@EnableAsync
@ConditionalOnProperty(prefix = AppConfigurationProperties.CONFIG_PREFIX, name = "enabled", matchIfMissing = true)
public class AppConfigurationAutoConfiguration {
@EnableConfigurationProperties({ AppConfigurationProperties.class })
@AutoConfiguration
@ConditionalOnClass(RefreshEndpoint.class)
public class AppConfigurationWatchAutoConfiguration {

/**
* Creates an instance of {@link AppConfigurationAutoConfiguration}
* Creates an instance of {@link AppConfigurationWatchAutoConfiguration}
*/
public AppConfigurationAutoConfiguration() {
public AppConfigurationWatchAutoConfiguration() {
Comment thread
mrm9084 marked this conversation as resolved.
}

/**
* Auto Watch
*/
@Configuration
@ConditionalOnClass(RefreshEndpoint.class)
public static class AppConfigurationWatchAutoConfiguration {

/**
* Creates an instance of {@link AppConfigurationWatchAutoConfiguration}
*/
public AppConfigurationWatchAutoConfiguration() {
}
@Bean
@ConditionalOnMissingBean
AppConfigurationRefresh appConfigurationRefresh(AppConfigurationProperties properties, BootstrapContext context) {
AppConfigurationReplicaClientFactory clientFactory = context
.get(AppConfigurationReplicaClientFactory.class);
ReplicaLookUp replicaLookUp = context.get(ReplicaLookUp.class);

@Bean
@ConditionalOnMissingBean
AppConfigurationRefresh appConfigurationRefresh(AppConfigurationProperties properties,
AppConfigurationProviderProperties appProperties, AppConfigurationReplicaClientFactory clientFactory, ReplicaLookUp replicaLookUp) {
return new AppConfigurationPullRefresh(clientFactory, properties.getRefreshInterval(),
appProperties.getDefaultMinBackoff(), replicaLookUp, new AppConfigurationRefreshUtil());
}
return new AppConfigurationPullRefresh(clientFactory, properties.getRefreshInterval(), replicaLookUp,
new AppConfigurationRefreshUtil());
}
}
Loading