Skip to content

New Data loader #43802

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 8 commits into from
Jan 23, 2025
Merged

New Data loader #43802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ee0be2b
UpdatedDataLoader
mrm9084 Jan 15, 2025
fc67f30
Review Comments
mrm9084 Jan 22, 2025
f838da0
Web Updates
mrm9084 Jan 22, 2025
b66f48c
Update ValidationsTest.java
mrm9084 Jan 22, 2025
02f19f9
Removing Validation tests. They will be updated in there own PR.
mrm9084 Jan 22, 2025
b01b4f7
Review comments
mrm9084 Jan 22, 2025
547931d
Fixing Refresh
mrm9084 Jan 23, 2025
9b54fb3
Update AzureAppConfigDataLocationResolver.java
mrm9084 Jan 23, 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
6 changes: 6 additions & 0 deletions ...loud/appconfiguration/config/web/implementation/AppConfigurationWebAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,18 @@ AppConfigurationEventListener configListener(AppConfigurationRefresh appConfigur
"org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointProperties",
"org.springframework.cloud.endpoint.RefreshEndpoint"
})
@Deprecated
static class AppConfigurationPushRefreshConfiguration {

@Bean
@Deprecated
AppConfigurationRefreshEndpoint appConfigurationRefreshEndpoint(ContextRefresher contextRefresher,
AppConfigurationProperties appConfiguration) {
return new AppConfigurationRefreshEndpoint(contextRefresher, appConfiguration);
}

@Bean
@Deprecated
AppConfigurationRefreshEventListener appConfigurationRefreshEventListener(
AppConfigurationRefresh appConfigurationRefresh) {
return new AppConfigurationRefreshEventListener(appConfigurationRefresh);
Expand All @@ -63,15 +66,18 @@ AppConfigurationRefreshEventListener appConfigurationRefreshEventListener(
"org.springframework.cloud.bus.BusProperties",
"org.springframework.cloud.bus.event.RefreshRemoteApplicationEvent",
"org.springframework.cloud.endpoint.RefreshEndpoint" })
@Deprecated
static class AppConfigurationBusConfiguration {

@Bean
@Deprecated
AppConfigurationBusRefreshEndpoint appConfigurationBusRefreshEndpoint(ApplicationContext context,
BusProperties bus, AppConfigurationProperties appConfiguration, Destination.Factory destinationFactory) {
return new AppConfigurationBusRefreshEndpoint(context, bus.getId(), destinationFactory, appConfiguration);
}

@Bean
@Deprecated
AppConfigurationBusRefreshEventListener appConfigurationBusRefreshEventListener(
AppConfigurationRefresh appConfigurationRefresh) {
return new AppConfigurationBusRefreshEventListener(appConfigurationRefresh);
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.

17 changes: 9 additions & 8 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 @@ -29,11 +29,6 @@
<version>3.4.1</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.2.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.4.1</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 @@ -177,13 +177,14 @@
<rules>
<bannedDependencies>
<includes>
<include>com.fasterxml.jackson.core:jackson-annotations:[2.18.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.18.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>jakarta.annotation:jakarta.annotation-api:[3.0.0]</include> <!-- {x-include-update;springboot3_jakarta.annotation:jakarta.annotation-api;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-annotations:[2.17.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
<include>com.fasterxml.jackson.core:jackson-databind:[2.17.2]</include> <!-- {x-include-update;springboot3_com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
<include>org.springframework.boot:spring-boot-actuator:[3.4.1]</include> <!-- {x-include-update;springboot3_org.springframework.boot:spring-boot-actuator;external_dependency} -->
<include>org.springframework.boot:spring-boot-autoconfigure:[3.4.1]</include> <!-- {x-include-update;springboot3_org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-context:[4.2.0]</include> <!-- {x-include-update;springboot3_org.springframework.cloud:spring-cloud-context;external_dependency} -->
<include>org.springframework.boot:spring-boot-configuration-processor:[3.4.1]</include> <!-- {x-include-update;springboot3_org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[4.2.0]</include> <!-- {x-include-update;springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[4.1.4]</include> <!-- {x-include-update;springboot3_org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
</includes>
</bannedDependencies>
</rules>
Expand Down
42 changes: 18 additions & 24 deletions ...ig/AppConfigurationAutoConfiguration.java → ...pConfigurationWatchAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
// 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;
Expand All @@ -20,36 +22,28 @@
/**
* 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, AppConfigurationProviderProperties.class })
@AutoConfiguration
@ConditionalOnClass(RefreshEndpoint.class)
public class AppConfigurationWatchAutoConfiguration {

/**
* Creates an instance of {@link AppConfigurationAutoConfiguration}
* Creates an instance of {@link AppConfigurationWatchAutoConfiguration}
*/
public AppConfigurationAutoConfiguration() {
public AppConfigurationWatchAutoConfiguration() {
}

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

/**
* Creates an instance of {@link AppConfigurationWatchAutoConfiguration}
*/
public AppConfigurationWatchAutoConfiguration() {
}
@Bean
@ConditionalOnMissingBean
AppConfigurationRefresh appConfigurationRefresh(AppConfigurationProperties properties,
AppConfigurationProviderProperties appProperties, 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(),
appProperties.getDefaultMinBackoff(), replicaLookUp, new AppConfigurationRefreshUtil());
}
}
6 changes: 3 additions & 3 deletions ...configuration/config/implementation/AppConfigurationApplicationSettingPropertySource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ protected void processConfigurationSettings(List<ConfigurationSetting> settings,
* @return Key Vault Secret Value
* @throws InvalidConfigurationPropertyValueException
*/
protected void handleKeyVaultReference(String key, SecretReferenceConfigurationSetting secretReference)
private void handleKeyVaultReference(String key, SecretReferenceConfigurationSetting secretReference)
throws InvalidConfigurationPropertyValueException {
// Parsing Key Vault Reference for URI
try {
Expand All @@ -129,7 +129,7 @@ void handleFeatureFlag(String key, FeatureFlagConfigurationSetting setting, List
handleJson(setting, trimStrings);
}

void handleJson(ConfigurationSetting setting, List<String> keyPrefixTrimValues)
private void handleJson(ConfigurationSetting setting, List<String> keyPrefixTrimValues)
throws InvalidConfigurationPropertyValueException {
Map<String, Object> jsonSettings = JsonConfigurationParser.parseJsonSetting(setting);
for (Entry<String, Object> jsonSetting : jsonSettings.entrySet()) {
Expand All @@ -138,7 +138,7 @@ void handleJson(ConfigurationSetting setting, List<String> keyPrefixTrimValues)
}
}

protected String trimKey(String key, List<String> trimStrings) {
private String trimKey(String key, List<String> trimStrings) {
key = key.trim();
if (trimStrings != null) {
for (String trim : trimStrings) {
Expand Down
Loading
Loading