App Config Sample updates (#812)

* Updating to latest version

* More updates

Author: mrm9084

appconfiguration/spring-cloud-azure-appconfiguration-config/spring-cloud-azure-appconfiguration-config-convert-sample/spring-cloud-azure-appconfiguration-config-convert-sample-initial/README.md

@@ -191,73 +191,9 @@ In this section, you clone a containerized Spring Boot application and test it l
    <dependency>
      <groupId>com.azure.spring</groupId>
      <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
-     <version>4.19.0</version>
+     <version>6.1.0</version>
    </dependency>
     ```
-    
-1. Create a new file called *AzureCredentials.java* and add the code below.
-
-    ```java
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License. See LICENSE in the project root for
-     * license information.
-     */
-    package sample.convert;
-
-    import com.azure.core.credential.TokenCredential;
-    import com.azure.identity.EnvironmentCredentialBuilder;
-    import com.microsoft.azure.spring.cloud.config.AppConfigurationCredentialProvider;
-    import com.microsoft.azure.spring.cloud.config.KeyVaultCredentialProvider;
-
-    public class AzureCredentials implements AppConfigurationCredentialProvider, KeyVaultCredentialProvider{
-
-        @Override
-        public TokenCredential getKeyVaultCredential(String uri) {
-            return getCredential();
-        }
-
-        @Override
-        public TokenCredential getAppConfigCredential(String uri) {
-            return getCredential();
-        }
-
-        private TokenCredential getCredential() {
-            return new EnvironmentCredentialBuilder().build();
-        }
-
-    }
-    ```
-
-    1. Create a new file called *AppConfiguration.java*. And add the code below.
-
-    ```java
-    /*
-     * Copyright (c) Microsoft Corporation. All rights reserved.
-     * Licensed under the MIT License. See LICENSE in the project root for
-     * license information.
-     */
-    package sample.convert;
-
-    import org.springframework.context.annotation.Bean;
-    import org.springframework.context.annotation.Configuration;
-
-    @Configuration
-    public class AppConfiguration {
-
-        @Bean
-        public AzureCredentials azureCredentials() {
-            return new AzureCredentials();
-        }
-    }
-    ```
-
-1. Create a new folder in your resources directory called META-INF. Then in that folder create a file called *spring.factories* and add.
-
-    ```factories
-    org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-    sample.convert.AppConfiguration
-    ```
 
 ### Run the updated sample
 

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/pom.xml

@@ -49,6 +49,10 @@
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-thymeleaf</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>spring-cloud-azure-appconfiguration-config-web</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.azure.spring</groupId>
       <artifactId>spring-cloud-azure-feature-management-web</artifactId>

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/FeatureFilter.java

@@ -4,18 +4,18 @@
 
 import java.io.IOException;
 
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 import com.azure.spring.cloud.feature.management.FeatureManager;
+
 import jakarta.servlet.Filter;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 @Component
 public class FeatureFilter implements Filter {
@@ -28,7 +28,7 @@ public class FeatureFilter implements Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
-        if (!featureManager.isEnabledAsync("Beta").block()) {
+        if (!featureManager.isEnabled("beta")) {
             chain.doFilter(request, response);
             return;
         }

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/HelloController.java

@@ -2,22 +2,20 @@
 // Licensed under the MIT License.
 package com.example;
 
-import com.azure.spring.cloud.feature.management.FeatureManager;
-import com.azure.spring.cloud.feature.management.web.FeatureGate;
-import com.azure.spring.cloud.feature.management.web.FeatureManagerSnapshot;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+import com.azure.spring.cloud.feature.management.web.FeatureGate;
+import com.azure.spring.cloud.feature.management.web.FeatureManagerSnapshot;
+
 
 @Controller
 @ConfigurationProperties("controller")
 public class HelloController {
-    private static final Logger LOGGER = LoggerFactory.getLogger(HelloController.class);
 
     @Autowired
     private FeatureManager featureManager;
@@ -27,10 +25,10 @@ public class HelloController {
 
     @GetMapping("/privacy")
     public String getRequestBased(Model model) {
-        model.addAttribute("Beta", featureManager.isEnabledAsync("beta").block());
-        model.addAttribute("isDarkThemeS1", featureManagerSnapshot.isEnabledAsync("dark-theme").block());
-        model.addAttribute("isDarkThemeS2", featureManagerSnapshot.isEnabledAsync("dark-theme").block());
-        model.addAttribute("isDarkThemeS3", featureManagerSnapshot.isEnabledAsync("dark-theme").block());
+        model.addAttribute("Beta", featureManager.isEnabled("beta"));
+        model.addAttribute("isDarkThemeS1", featureManagerSnapshot.isEnabled("dark-theme"));
+        model.addAttribute("isDarkThemeS2", featureManagerSnapshot.isEnabled("dark-theme"));
+        model.addAttribute("isDarkThemeS3", featureManagerSnapshot.isEnabled("dark-theme"));
         return "privacy";
     }
 
@@ -47,7 +45,7 @@ public String getRedirected(Model model) {
 
     @GetMapping(value = {"", "/", "/welcome"})
     public String mainWithParam(Model model) {
-        model.addAttribute("Beta", featureManager.isEnabledAsync("beta").block());
+        model.addAttribute("Beta", featureManager.isEnabled("beta"));
         return "welcome";
     }
 }

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/TestComponent.java

@@ -4,18 +4,19 @@
 
 import java.util.concurrent.ExecutionException;
 
-import com.azure.spring.cloud.feature.management.FeatureManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import com.azure.spring.cloud.feature.management.FeatureManager;
+
 @Component
 public class TestComponent {
 
     @Autowired
     private FeatureManager featureManager;
 
     public String test() throws InterruptedException, ExecutionException {
-        if (featureManager.isEnabledAsync("Beta").block()) {
+        if (featureManager.isEnabled("beta")) {
             return "Beta";
         }
         return "Original";

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/java/com/example/filters/Random.java

@@ -2,9 +2,10 @@
 // Licensed under the MIT License.
 package com.example.filters;
 
+import org.springframework.stereotype.Component;
+
 import com.azure.spring.cloud.feature.management.filters.FeatureFilter;
 import com.azure.spring.cloud.feature.management.models.FeatureFilterEvaluationContext;
-import org.springframework.stereotype.Component;
 
 @Component("Random")
 public class Random implements FeatureFilter {

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/resources/application.yml

@@ -1,38 +1,18 @@
 spring:
   thymeleaf:
     cache: false
+  config:
+    import: azureAppConfiguration
   cloud:
     azure:
       appconfiguration:
-        watch:
-          enabled: True
-          delay: 5s
-config:
-  message: Hi
-feature-management:
-  feature-flags:
-    -
-      id: beta
-      enabled: true
-    -
-      id: dark-theme
-      enabled: true
-      conditions:
-        client-filters:
-          -
-            name: Random
-            parameters:
-              chance: "50"
-    -
-      id: beta-ab
-      enabled: true
-      conditions:
-        client-filters:
-          -
-            name: Random
-            parameters:
-              chance: "50"
-          -
-            name: ClientFilter
-            parameters:
-              clientIp: 10.0.0.1 
+        stores:
+          - 
+            endpoint: ${CONFIGSTORE_ENDPOINT}
+            feature-flags:
+              enabled: true
+            monitoring:
+              enabled: true
+              triggers:
+                -
+                  key: sentinel

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/resources/data/sample-data.yml

@@ -1,4 +1,21 @@
-.appconfig:
-  featureflag/Beta: >-
-    {"id":"Beta","description":"Test
-    Feature","enabled":true,"conditions":{"client_filters":[{"name":"Random","parameters":{"chance":"50"}}]}}
+feature_management:
+  feature_flags:
+    - id: beta
+      enabled: true
+    - id: beta-ab
+      enabled: true
+      conditions:
+        client_filters:
+          - name: Random
+            parameters:
+              chance: '50'
+          - name: ClientFilter
+            parameters:
+              clientIp: 10.0.0.1
+    - id: dark-theme
+      enabled: true
+      conditions:
+        client_filters:
+          - name: Random
+            parameters:
+              chance: '50'

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/resources/templates/BetaA.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Feature Management with Spring Cloud Azure</title>
 
-    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" th:href="@{/css/main.css}">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>

appconfiguration/spring-cloud-azure-feature-management-web/spring-cloud-azure-feature-management-web-sample/src/main/resources/templates/BetaB.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Feature Management with Spring Cloud Azure</title>
 
-    <link rel="stylesheet" href="/css/main.css">
+    <link rel="stylesheet" th:href="@{/css/main.css}">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>