From 97e3a3debcb6f09ed5738e8cca94234a68e9c56c Mon Sep 17 00:00:00 2001 From: Pavel Manannikov Date: Mon, 23 Nov 2020 19:42:50 +0200 Subject: [PATCH] #1284 Use local variable inference --- version-number/README.md | 8 ++++---- .../src/main/java/com/iluwatar/versionnumber/App.java | 10 +++++----- .../com/iluwatar/versionnumber/BookRepository.java | 2 +- .../com/iluwatar/versionnumber/BookRepositoryTest.java | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/version-number/README.md b/version-number/README.md index f95b1bcc7..9a7468a85 100644 --- a/version-number/README.md +++ b/version-number/README.md @@ -78,7 +78,7 @@ public class BookRepository { throw new BookNotFoundException("Not found book with id: " + book.getId()); } - Book latestBook = collection.get(book.getId()); + var latestBook = collection.get(book.getId()); if (book.getVersion() != latestBook.getVersion()) { throw new VersionMismatchException( "Tried to update stale version " + book.getVersion() @@ -107,10 +107,10 @@ public class BookRepository { Here's the concurrency control in action: ```java -long bookId = 1; +var bookId = 1; // Alice and Bob took the book concurrently -final Book aliceBook = bookRepository.get(bookId); -final Book bobBook = bookRepository.get(bookId); +final var aliceBook = bookRepository.get(bookId); +final var bobBook = bookRepository.get(bookId); aliceBook.setTitle("Kama Sutra"); // Alice has updated book title bookRepository.update(aliceBook); // and successfully saved book in database diff --git a/version-number/src/main/java/com/iluwatar/versionnumber/App.java b/version-number/src/main/java/com/iluwatar/versionnumber/App.java index 8049f1352..cffba50d4 100644 --- a/version-number/src/main/java/com/iluwatar/versionnumber/App.java +++ b/version-number/src/main/java/com/iluwatar/versionnumber/App.java @@ -53,17 +53,17 @@ public class App { BookDuplicateException, BookNotFoundException, VersionMismatchException { - long bookId = 1; + var bookId = 1; - BookRepository bookRepository = new BookRepository(); - Book book = new Book(); + var bookRepository = new BookRepository(); + var book = new Book(); book.setId(bookId); bookRepository.add(book); // adding a book with empty title and author LOGGER.info("An empty book with version {} was added to repository", book.getVersion()); // Alice and Bob took the book concurrently - final Book aliceBook = bookRepository.get(bookId); - final Book bobBook = bookRepository.get(bookId); + final var aliceBook = bookRepository.get(bookId); + final var bobBook = bookRepository.get(bookId); aliceBook.setTitle("Kama Sutra"); // Alice has updated book title bookRepository.update(aliceBook); // and successfully saved book in database diff --git a/version-number/src/main/java/com/iluwatar/versionnumber/BookRepository.java b/version-number/src/main/java/com/iluwatar/versionnumber/BookRepository.java index a0f46c30f..ef41e79ac 100644 --- a/version-number/src/main/java/com/iluwatar/versionnumber/BookRepository.java +++ b/version-number/src/main/java/com/iluwatar/versionnumber/BookRepository.java @@ -56,7 +56,7 @@ public class BookRepository { throw new BookNotFoundException("Not found book with id: " + book.getId()); } - Book latestBook = collection.get(book.getId()); + var latestBook = collection.get(book.getId()); if (book.getVersion() != latestBook.getVersion()) { throw new VersionMismatchException( "Tried to update stale version " + book.getVersion() diff --git a/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java b/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java index 869bd4b44..325dea87b 100644 --- a/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java +++ b/version-number/src/test/java/com/iluwatar/versionnumber/BookRepositoryTest.java @@ -33,17 +33,17 @@ import static org.junit.jupiter.api.Assertions.*; class BookRepositoryTest { @Test void testBookRepository() throws BookDuplicateException, BookNotFoundException, VersionMismatchException { - final long bookId = 1; + final var bookId = 1; - BookRepository bookRepository = new BookRepository(); - Book book = new Book(); + var bookRepository = new BookRepository(); + var book = new Book(); book.setId(bookId); bookRepository.add(book); assertEquals(0, book.getVersion()); - final Book aliceBook = bookRepository.get(bookId); - final Book bobBook = bookRepository.get(bookId); + final var aliceBook = bookRepository.get(bookId); + final var bobBook = bookRepository.get(bookId); assertEquals(aliceBook.getTitle(), bobBook.getTitle()); assertEquals(aliceBook.getAuthor(), bobBook.getAuthor());