Merge branch 'BAEL-19790' of https://github.com/kwoyke/tutorials into BAEL-19790

spring-cloud/spring-cloud-config/client/src/main/java/com/baeldung/spring/cloud/config/client/ConfigClient.java

@@ -4,9 +4,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 @SpringBootApplication
@@ -22,7 +21,7 @@ public class ConfigClient {
         SpringApplication.run(ConfigClient.class, args);
     }
 
-    @RequestMapping(value = "/whoami/{username}", method = RequestMethod.GET, produces = MediaType.TEXT_PLAIN_VALUE)
+    @GetMapping(value = "/whoami/{username}", produces = MediaType.TEXT_PLAIN_VALUE)
     public String whoami(@PathVariable("username") String username) {
         return String.format("Hello %s! You are a(n) %s and your password is '%s'.\n", username, role, password);
     }

spring-cloud/spring-cloud-config/server/src/main/java/com/baeldung/spring/cloud/config/server/SecurityConfiguration.java

@@ -5,11 +5,14 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 
 @Configuration
-public class SecurityConfigurer extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
+
     @Override
     public void configure(HttpSecurity http) throws Exception {
         http.csrf()
-                .disable()
-                .httpBasic();
+                .ignoringAntMatchers("/encrypt/**")
+                .ignoringAntMatchers("/decrypt/**");
+
+        super.configure(http);
     }
 }

spring-cloud/spring-cloud-config/server/src/main/resources/application.properties

@@ -1,5 +1,5 @@
 server.port=8888
-spring.cloud.config.server.git.uri=file:///${user.home}/config-repo
+spring.cloud.config.server.git.uri=
 spring.cloud.config.server.git.clone-on-start=true
 spring.security.user.name=root
 spring.security.user.password=s3cr3t

spring-cloud/spring-cloud-config/server/src/main/resources/bootstrap.properties

@@ -1,4 +1,4 @@
 encrypt.keyStore.location=classpath:/config-server.jks
 encrypt.keyStore.password=my-s70r3-s3cr3t
 encrypt.keyStore.alias=config-server-key
-encrypt.keyStore.secret=my-k34-s3cr3t
+encrypt.keyStore.secret=my-k34-s3cr3t