Merge branch 'master' of https://github.com/chaos2418/tutorials into JIRA-7734

spring-security-modules/pom.xml

@@ -21,7 +21,6 @@
         <module>spring-ldap</module>
         <module>spring-security-acl</module>
         <module>spring-security-auth0</module>
-        <module>spring-security-config</module>
         <module>spring-security-core</module>
         <module>spring-security-ldap</module>
         <module>spring-security-legacy-oidc</module>

spring-security-modules/spring-security-config/cache-control/README.md

@@ -1,6 +0,0 @@
-## Spring Security Cache Control
-
-This module contains articles about cache control with Spring Security
-
-### Relevant Articles: 
-- [Spring Security – Cache Control Headers](https://www.baeldung.com/spring-security-cache-control-headers)

spring-security-modules/spring-security-config/cache-control/pom.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>cache-control</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <name>cache-control</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-2</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>

spring-security-modules/spring-security-config/cache-control/src/main/resources/logback.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>

spring-security-modules/spring-security-config/cors/README.md

@@ -1,7 +0,0 @@
-## Spring Security CORS
-
-This module contains articles about Spring Security with CORS (Cross Origin Requests)
-
-## Relevant Articles
-
-- [Fixing 401s with CORS Preflights and Spring Security](https://www.baeldung.com/spring-security-cors-preflight)

spring-security-modules/spring-security-config/cors/pom.xml

@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>cors</artifactId>
-    <name>cors</name>
-    <packaging>jar</packaging>
-    <description>Spring Security CORS</description>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>spring-security-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <spring-boot.version>2.1.2.RELEASE</spring-boot.version>
-    </properties>
-
-</project>

spring-security-modules/spring-security-config/pom.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-security-config</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-security-config</name>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
-    </parent>
-
-    <modules>
-        <module>cache-control</module>
-        <module>cors</module>
-    </modules>
-
-</project>

spring-security-modules/spring-security-web-boot-3/README.md

@@ -9,4 +9,6 @@ The "REST With Spring" Classes: http://github.learnspringsecurity.com
 
 - [TLS Setup in Spring](https://www.baeldung.com/spring-tls-setup)
 - [Spring Security – Request Rejected Exception](https://www.baeldung.com/spring-security-request-rejected-exception)
+- [Spring Security – Cache Control Headers](https://www.baeldung.com/spring-security-cache-control-headers)
+- [Fixing 401s with CORS Preflights and Spring Security](https://www.baeldung.com/spring-security-cors-preflight)
 - More articles: [[<-- prev]](/spring-security-modules/spring-security-web-boot-2)

spring-security-modules/spring-security-web-boot-3/src/main/java/com/baeldung/cors/basicauth/SpringBootSecurityApplication.java

@@ -1,10 +1,10 @@
-package com.baeldung.springbootsecuritycors.basicauth;
+package com.baeldung.cors.basicauth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(scanBasePackages = "com.baeldung.springbootsecuritycors")
+@SpringBootApplication(scanBasePackages = "com.baeldung.cors")
 @EnableAutoConfiguration
 public class SpringBootSecurityApplication {
 

spring-security-modules/spring-security-web-boot-3/src/main/java/com/baeldung/cors/basicauth/config/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package com.baeldung.springbootsecuritycors.basicauth.config;
+package com.baeldung.cors.basicauth.config;
 
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;

spring-security-modules/spring-security-web-boot-3/src/main/java/com/baeldung/cors/controller/ResourceController.java

@@ -1,11 +1,11 @@
-package com.baeldung.springbootsecuritycors.controller;
-
-import java.security.Principal;
+package com.baeldung.cors.controller;
 
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.security.Principal;
+
 @RestController
 @CrossOrigin("http://localhost:4200")
 public class ResourceController {

spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/cachecontrol/ResourceEndpointIntegrationTest.java

@@ -1,14 +1,13 @@
 package com.baeldung.cachecontrol;
 
-import static io.restassured.RestAssured.given;
-
+import io.restassured.http.ContentType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import io.restassured.http.ContentType;
+import static io.restassured.RestAssured.given;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = AppRunner.class)

spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/cachecontrol/SpringContextTest.java

@@ -1,12 +1,10 @@
-package com.baeldung;
+package com.baeldung.cachecontrol;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import com.baeldung.cachecontrol.AppRunner;
-
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = AppRunner.class)
 public class SpringContextTest {

spring-security-modules/spring-security-web-boot-3/src/test/java/com/baeldung/cors/ResourceControllerUnitTest.java

@@ -1,8 +1,6 @@
-package com.baeldung.springbootsecuritycors;
-
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+package com.baeldung.cors;
 
+import com.baeldung.cors.basicauth.SpringBootSecurityApplication;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,7 +12,8 @@ import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.baeldung.springbootsecuritycors.basicauth.SpringBootSecurityApplication;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.options;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { SpringBootSecurityApplication.class })