iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add update to rest api (#1401)

Browse Source 
* upgrade to spring boot 1.5.2

* add full update to REST API
This commit is contained in:
Doha2012 2017-03-15 10:59:55 +02:00 committed by Eugen
parent 52ef5b3803
commit 61660f5d37
4 changed files with 83 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookController.java
View File

@ -1,11 +1,19 @@
package com.baeldung.spring.cloud.bootstrap.svcbook.book; package com.baeldung.spring.cloud.bootstrap.svcbook.book;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/books") @RequestMapping("/books")
public class BookController { public class BookController {
@ -13,7 +21,7 @@ public class BookController {
@Autowired @Autowired
private BookService bookService; private BookService bookService;
@GetMapping("") @GetMapping
public List<Book> findAllBooks() { public List<Book> findAllBooks() {
return bookService.findAllBooks(); return bookService.findAllBooks();
} }
@ -23,7 +31,7 @@ public class BookController {
return bookService.findBookById(bookId); return bookService.findBookById(bookId);
} }
@PostMapping("") @PostMapping
public Book createBook(@RequestBody Book book) { public Book createBook(@RequestBody Book book) {
return bookService.createBook(book); return bookService.createBook(book);
} }
@ -33,7 +41,12 @@ public class BookController {
bookService.deleteBook(bookId); bookService.deleteBook(bookId);
} }
@PatchMapping("/{bookId") @PutMapping("/{bookId}")
public Book updateBook(@RequestBody Book book, @PathVariable Long bookId) {
return bookService.updateBook(book, bookId);
}
@PatchMapping("/{bookId}")
public Book updateBook(@RequestBody Map<String, String> updates, @PathVariable Long bookId) { public Book updateBook(@RequestBody Map<String, String> updates, @PathVariable Long bookId) {
return bookService.updateBook(updates, bookId); return bookService.updateBook(updates, bookId);
} }

39
spring-cloud/spring-cloud-bootstrap/svc-book/src/main/java/com/baeldung/spring/cloud/bootstrap/svcbook/book/BookService.java
View File

@ -1,13 +1,15 @@
package com.baeldung.spring.cloud.bootstrap.svcbook.book; package com.baeldung.spring.cloud.bootstrap.svcbook.book;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import com.google.common.base.Preconditions;
import java.util.Map;
import java.util.Optional;
@Service @Service
@Transactional(readOnly = true) @Transactional(readOnly = true)
@ -27,7 +29,7 @@ public class BookService {
@Transactional(propagation = Propagation.REQUIRED) @Transactional(propagation = Propagation.REQUIRED)
public Book createBook(Book book) { public Book createBook(Book book) {
Book newBook = new Book(); final Book newBook = new Book();
newBook.setTitle(book.getTitle()); newBook.setTitle(book.getTitle());
newBook.setAuthor(book.getAuthor()); newBook.setAuthor(book.getAuthor());
return bookRepository.save(newBook); return bookRepository.save(newBook);
@ -40,16 +42,25 @@ public class BookService {
@Transactional(propagation = Propagation.REQUIRED) @Transactional(propagation = Propagation.REQUIRED)
public Book updateBook(Map<String, String> updates, Long bookId) { public Book updateBook(Map<String, String> updates, Long bookId) {
Book book = findBookById(bookId); final Book book = findBookById(bookId);
updates.keySet().forEach(key -> { updates.keySet()
switch (key) { .forEach(key -> {
case "author": switch (key) {
book.setAuthor(updates.get(key)); case "author":
break; book.setAuthor(updates.get(key));
case "title": break;
book.setTitle(updates.get(key)); case "title":
} book.setTitle(updates.get(key));
}); }
});
return bookRepository.save(book);
}
@Transactional(propagation = Propagation.REQUIRED)
public Book updateBook(Book book, Long bookId) {
Preconditions.checkNotNull(book);
Preconditions.checkState(book.getId() == bookId);
Preconditions.checkNotNull(bookRepository.findOne(bookId));
return bookRepository.save(book); return bookRepository.save(book);
} }
} }

26
spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingController.java
View File

@ -1,11 +1,20 @@
package com.baeldung.spring.cloud.bootstrap.svcrating.rating; package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/ratings") @RequestMapping("/ratings")
public class RatingController { public class RatingController {
@ -13,7 +22,7 @@ public class RatingController {
@Autowired @Autowired
private RatingService ratingService; private RatingService ratingService;
@GetMapping("") @GetMapping
public List<Rating> findRatingsByBookId(@RequestParam(required = false, defaultValue = "0") Long bookId) { public List<Rating> findRatingsByBookId(@RequestParam(required = false, defaultValue = "0") Long bookId) {
if (bookId.equals(0L)) { if (bookId.equals(0L)) {
return ratingService.findAllRatings(); return ratingService.findAllRatings();
@ -21,7 +30,7 @@ public class RatingController {
return ratingService.findRatingsByBookId(bookId); return ratingService.findRatingsByBookId(bookId);
} }
@PostMapping("") @PostMapping
public Rating createRating(@RequestBody Rating rating) { public Rating createRating(@RequestBody Rating rating) {
return ratingService.createRating(rating); return ratingService.createRating(rating);
} }
@ -31,7 +40,12 @@ public class RatingController {
ratingService.deleteRating(ratingId); ratingService.deleteRating(ratingId);
} }
@PatchMapping("/{ratingId") @PutMapping("/{ratingId}")
public Rating updateRating(@RequestBody Rating rating, @PathVariable Long ratingId) {
return ratingService.updateRating(rating, ratingId);
}
@PatchMapping("/{ratingId}")
public Rating updateRating(@RequestBody Map<String, String> updates, @PathVariable Long ratingId) { public Rating updateRating(@RequestBody Map<String, String> updates, @PathVariable Long ratingId) {
return ratingService.updateRating(updates, ratingId); return ratingService.updateRating(updates, ratingId);
} }

28
spring-cloud/spring-cloud-bootstrap/svc-rating/src/main/java/com/baeldung/spring/cloud/bootstrap/svcrating/rating/RatingService.java
View File

@ -1,13 +1,15 @@
package com.baeldung.spring.cloud.bootstrap.svcrating.rating; package com.baeldung.spring.cloud.bootstrap.svcrating.rating;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.List; import com.google.common.base.Preconditions;
import java.util.Map;
import java.util.Optional;
@Service @Service
@Transactional(readOnly = true) @Transactional(readOnly = true)
@ -31,7 +33,7 @@ public class RatingService {
@Transactional(propagation = Propagation.REQUIRED) @Transactional(propagation = Propagation.REQUIRED)
public Rating createRating(Rating rating) { public Rating createRating(Rating rating) {
Rating newRating = new Rating(); final Rating newRating = new Rating();
newRating.setBookId(rating.getBookId()); newRating.setBookId(rating.getBookId());
newRating.setStars(rating.getStars()); newRating.setStars(rating.getStars());
return ratingRepository.save(newRating); return ratingRepository.save(newRating);
@ -44,14 +46,22 @@ public class RatingService {
@Transactional(propagation = Propagation.REQUIRED) @Transactional(propagation = Propagation.REQUIRED)
public Rating updateRating(Map<String, String> updates, Long ratingId) { public Rating updateRating(Map<String, String> updates, Long ratingId) {
Rating rating = findRatingById(ratingId); final Rating rating = findRatingById(ratingId);
updates.keySet().forEach(key -> { updates.keySet()
switch (key) { .forEach(key -> {
switch (key) {
case "stars": case "stars":
rating.setStars(Integer.parseInt(updates.get(key))); rating.setStars(Integer.parseInt(updates.get(key)));
break; break;
} }
}); });
return ratingRepository.save(rating);
}
public Rating updateRating(Rating rating, Long ratingId) {
Preconditions.checkNotNull(rating);
Preconditions.checkState(rating.getId() == ratingId);
Preconditions.checkNotNull(ratingRepository.findOne(ratingId));
return ratingRepository.save(rating); return ratingRepository.save(rating);
} }
} }