From 08c0b590b04b5e23018fe5846cd282e81201731a Mon Sep 17 00:00:00 2001
From: Loredana Crusoveanu <loredana.crusoveanu@yahoo.com>
Date: Tue, 8 May 2018 22:04:21 +0300
Subject: [PATCH] upgrade bootstrap project

---
 spring-boot-bootstrap/pom.xml                 |  4 ++--
 .../org/baeldung/config/SecurityConfig.java   | 20 +++++++++++++++++++
 .../persistence/repo/BookRepository.java      |  1 -
 .../java/org/baeldung/web/BookController.java | 12 ++++++-----
 .../src/main/resources/application.properties |  6 ++----
 .../SpringBootBootstrapIntegrationTest.java   | 10 +++-------
 6 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 spring-boot-bootstrap/src/main/java/org/baeldung/config/SecurityConfig.java

diff --git a/spring-boot-bootstrap/pom.xml b/spring-boot-bootstrap/pom.xml
index 1ec9af8189..03ce9b6906 100644
--- a/spring-boot-bootstrap/pom.xml
+++ b/spring-boot-bootstrap/pom.xml
@@ -9,10 +9,10 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <artifactId>parent-boot-5</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-5</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <!-- add dependency management if you have a different parent pom
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/config/SecurityConfig.java b/spring-boot-bootstrap/src/main/java/org/baeldung/config/SecurityConfig.java
new file mode 100644
index 0000000000..fd37d2ad54
--- /dev/null
+++ b/spring-boot-bootstrap/src/main/java/org/baeldung/config/SecurityConfig.java
@@ -0,0 +1,20 @@
+package org.baeldung.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig extends WebSecurityConfigurerAdapter {
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authorizeRequests()
+            .anyRequest()
+            .permitAll()
+            .and().csrf().disable();
+    }
+
+}
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/persistence/repo/BookRepository.java b/spring-boot-bootstrap/src/main/java/org/baeldung/persistence/repo/BookRepository.java
index 5dead9c930..011f3dcb60 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/persistence/repo/BookRepository.java
+++ b/spring-boot-bootstrap/src/main/java/org/baeldung/persistence/repo/BookRepository.java
@@ -8,5 +8,4 @@ import java.util.Optional;
 
 public interface BookRepository extends CrudRepository<Book, Long> {
     List<Book> findByTitle(String title);
-    Optional<Book> findOne(long id);
 }
diff --git a/spring-boot-bootstrap/src/main/java/org/baeldung/web/BookController.java b/spring-boot-bootstrap/src/main/java/org/baeldung/web/BookController.java
index 68393fe5ce..44129fc7f8 100644
--- a/spring-boot-bootstrap/src/main/java/org/baeldung/web/BookController.java
+++ b/spring-boot-bootstrap/src/main/java/org/baeldung/web/BookController.java
@@ -6,6 +6,7 @@ import org.baeldung.web.exception.BookIdMismatchException;
 import org.baeldung.web.exception.BookNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,21 +38,22 @@ public class BookController {
 
     @GetMapping("/{id}")
     public Book findOne(@PathVariable long id) {
-        return bookRepository.findOne(id)
+        return bookRepository.findById(id)
           .orElseThrow(BookNotFoundException::new);
     }
 
     @PostMapping
     @ResponseStatus(HttpStatus.CREATED)
     public Book create(@RequestBody Book book) {
-        return bookRepository.save(book);
+        Book book1 = bookRepository.save(book);
+        return book1;
     }
 
     @DeleteMapping("/{id}")
     public void delete(@PathVariable long id) {
-        bookRepository.findOne(id)
+        bookRepository.findById(id)
           .orElseThrow(BookNotFoundException::new);
-        bookRepository.delete(id);
+        bookRepository.deleteById(id);
     }
 
     @PutMapping("/{id}")
@@ -59,7 +61,7 @@ public class BookController {
         if (book.getId() != id) {
             throw new BookIdMismatchException();
         }
-        bookRepository.findOne(id)
+        bookRepository.findById(id)
           .orElseThrow(BookNotFoundException::new);
         return bookRepository.save(book);
     }
diff --git a/spring-boot-bootstrap/src/main/resources/application.properties b/spring-boot-bootstrap/src/main/resources/application.properties
index b7e6b1e80e..e50268d32c 100644
--- a/spring-boot-bootstrap/src/main/resources/application.properties
+++ b/spring-boot-bootstrap/src/main/resources/application.properties
@@ -7,10 +7,8 @@ spring.thymeleaf.enabled=true
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
 
-security.basic.enabled=true
-security.user.name=john
-security.user.password=123
-
+spring.security.user.name=john
+spring.security.user.password=123
 
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.url=jdbc:h2:mem:bootapp;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
diff --git a/spring-boot-bootstrap/src/test/java/org/baeldung/SpringBootBootstrapIntegrationTest.java b/spring-boot-bootstrap/src/test/java/org/baeldung/SpringBootBootstrapIntegrationTest.java
index b14dc2cbd0..204725d891 100644
--- a/spring-boot-bootstrap/src/test/java/org/baeldung/SpringBootBootstrapIntegrationTest.java
+++ b/spring-boot-bootstrap/src/test/java/org/baeldung/SpringBootBootstrapIntegrationTest.java
@@ -1,6 +1,5 @@
 package org.baeldung;
 
-import static io.restassured.RestAssured.preemptive;
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
 import static org.junit.Assert.assertEquals;
@@ -11,7 +10,6 @@ import io.restassured.response.Response;
 import java.util.List;
 
 import org.baeldung.persistence.model.Book;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -24,11 +22,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 @SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.DEFINED_PORT)
 public class SpringBootBootstrapIntegrationTest {
 
-    @Before
-    public void setUp() {
-        RestAssured.authentication = preemptive().basic("john", "123");
-    }
-
     private static final String API_ROOT = "http://localhost:8081/api/books";
 
     @Test
@@ -94,6 +87,8 @@ public class SpringBootBootstrapIntegrationTest {
         final Book book = createRandomBook();
         final String location = createBookAsUri(book);
 
+        System.out.println(location);
+        
         book.setId(Long.parseLong(location.split("api/books/")[1]));
         book.setAuthor("newAuthor");
         Response response = RestAssured.given()
@@ -135,6 +130,7 @@ public class SpringBootBootstrapIntegrationTest {
             .contentType(MediaType.APPLICATION_JSON_VALUE)
             .body(book)
             .post(API_ROOT);
+        System.out.println(response.asString());
         return API_ROOT + "/" + response.jsonPath()
             .get("id");
     }