Spring cloud azure 6.0 (#45222)

* Spring Feature Management - RemoveV1Schema (#43405)

* RemoveV1Schema

* Removed targeting change

* extra java doc removed

* Review comments

* Update FeatureManagementException.java

* New Data loader (#43802)

* UpdatedDataLoader

* Review Comments

* Web Updates

* Update ValidationsTest.java

* Removing Validation tests. They will be updated in there own PR.

* Review comments

* Fixing Refresh

* Update AzureAppConfigDataLocationResolver.java

* Fix Endian (#43932)

* FixEndian

* rename method

* Feature context and Async Filters (#43435)

* Object Context and AsyncFilters

* Apply suggestions from code review

Co-authored-by: Ross Grambo <[email protected]>

* Review comments

* Review comments

* Review Comments

---------

Co-authored-by: Ross Grambo <[email protected]>

* Push Refresh Telemetry (#44170)

* Updating to use Context to pass around telemetry + added pushRefreshEnabled

* Updated to PUSH_REFRESH + tests

* Update to use Evaluation Event (#44070)

* Adding Default Filters (#43935)

* Adding Default Filters

* Fixing Feature flag loading after both redesigns

* Fixing issues after just 2.0 schema and properties

* Clearing up feature return

* fixing usage of default min backoff

* Removed dead code + tests

* Update TargetingContextAccessorTestConfiguration.java

* Update FeatureManagementConfiguration.java

* Variants (#42853)

* variants

* Fixing Targeting Filter

* off by one

* Fixing Variant assignment

* review comments

* Default Timeout

* Update sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/filters/ContextualFeatureFilterAsync.java

Co-authored-by: Copilot <[email protected]>

* Review comments

* Fixing Merge Issues

* Update TargetingFilterTest.java

* Fixing doc comments and  removed ContextualAccessor

* fixed missing headers

* Removed dead code

* Update FeatureManager.java

* Update FeatureManager.java

* Update FeatureManager.java

---------

Co-authored-by: Copilot <[email protected]>

* Removed feature flags from configuration (#44558)

* Feature management Snapshot (#44621)

* Feature Snapshot support

* Removing dead code

* Missing copyright

* Adding back Feature Filter telemetry

* Adding tests and simplifying code

* Update URI usage

* Update AzureAppConfigDataLoader.java

* Adding missing java docs (#45169)

* Feature Management Telemetry (#45073)

* Feature Snapshot support

* Removing dead code

* Missing copyright

* Adding back Feature Filter telemetry

* Adding tests and simplifying code

* TelemetryPublisher

* Updating tests

* Added telemetry object

* Fixing tests

* Added more tests plus fixes

* Added publish telemetry tests

* Update sdk/spring/spring-cloud-azure-feature-management/src/main/java/com/azure/spring/cloud/feature/management/FeatureManager.java

Co-authored-by: Copilot <[email protected]>

* Adding Constants + Telemetry Package

* Fixing endpoint usage + isEnabled

* Remove Feature Id

* Update FeatureFlagClientTest.java

* FeatureId

* Removing featureflagid

* Adding allocation id

* fixed tests

* Updating Telemetry usage

* Fixing tests

* fixing build issues

* Update LoggerTelemetryPublisherTest.java

* Fix loading

---------

Co-authored-by: Copilot <[email protected]>

* Update external_dependencies.txt

* fixing external dependencies

* Update external_dependencies.txt

* Update external_dependencies.txt

* pom update

* Fix Log

* Fixing some bugs

* Adding missing java docs (#45551)

* App Config 6.0 bug fixes (#45568)

* Simple Fixes

* Fixing Startup Failover logging

* Cleaned up resolver validation

* Update ConnectionManager.java

* Cleaning up telemetry publishing

* Fix format issues

* fix build issues

* Updating poms

* Update external_dependencies.txt

* Fixing poms

* Update pom.xml

* try to fix pom

* Increment package versions for spring releases (#45589)

* Undoing change from beta release

* Updating provider readme

* Update version_client.txt

* Update external_dependencies.txt

* Update pom.xml

* Update pom.xml

* Update pom.xml

* Fixing deprecation

* Copilot fixes

* Update LoggerTelemetryPublisher.java

* code review items

* Fixing feature name setting + adding tests

---------

Co-authored-by: Ross Grambo <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Azure SDK Bot <[email protected]>

Author: 4 people

eng/versioning/external_dependencies.txt

@@ -383,7 +383,6 @@ springboot3_org.springframework.boot:spring-boot-test;3.5.5
 springboot3_org.springframework.boot:spring-boot-testcontainers;3.5.5
 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
@@ -412,6 +411,8 @@ springboot3_org.springframework:spring-web;6.2.10
 springboot3_org.springframework:spring-webmvc;6.2.10
 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.5
 springboot3_org.springframework.cloud:spring-cloud-dependencies;2025.0.0

eng/versioning/version_client.txt

@@ -211,11 +211,11 @@ com.microsoft.azure:azure-eventhubs;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

sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml

@@ -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>
 

sdk/spring/spring-cloud-azure-actuator/pom.xml

@@ -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 -->

sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Release History
 
-## 5.24.0-beta.1 (Unreleased)
+## 6.0.0-beta.2 (Unreleased)
 
 ### Features Added
 

sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml

@@ -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} -->
   <name>Spring Cloud Azure App Configuration Config Web</name>
   <description>Integration of Spring Cloud Config and Azure App Configuration Service</description>
   <properties>
@@ -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>

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pullrefresh/AppConfigurationEventListener.java

@@ -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;
@@ -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))) {

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushbusrefresh/AppConfigurationBusRefreshEventListener.java

@@ -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;
 
@@ -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) {

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEndpoint.java

@@ -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;
@@ -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);
@@ -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;
     }
 

sdk/spring/spring-cloud-azure-appconfiguration-config-web/src/main/java/com/azure/spring/cloud/appconfiguration/config/web/implementation/pushrefresh/AppConfigurationRefreshEventListener.java

@@ -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;
 
@@ -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) {