From fbd35e526d6f8ab66c06c28b7bfbda10451fb6db Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 18:50:18 +0400 Subject: [PATCH 01/11] Set up Google Java style guide linter as CI step #157 --- .github/workflows/checkstyle.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .github/workflows/checkstyle.yml diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml new file mode 100644 index 00000000..6c35a0e6 --- /dev/null +++ b/.github/workflows/checkstyle.yml @@ -0,0 +1,14 @@ +name: checkstyle + +on: + pull_request: + branches: + - main +jobs: + formatting: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 # v2 minimum required + - uses: axel-op/googlejavaformat-action@v3 + with: + args: "--set-exit-if-changed" \ No newline at end of file From c9745bd8bf2414fe97368dd35ee27ae070f3e6b6 Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 18:52:49 +0400 Subject: [PATCH 02/11] temp --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4037730f..9bc8adbd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.karankumar booksapi - 0.1.0-SNAPSHOT + 0.1.0.1-SNAPSHOT booksApi GraphQL Books API From 9925caf82e20b365807c089ad34b2d995e03195c Mon Sep 17 00:00:00 2001 From: ooutofmind Date: Mon, 3 Oct 2022 18:56:51 +0400 Subject: [PATCH 03/11] Update checkstyle.yml --- .github/workflows/checkstyle.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 6c35a0e6..80af81e7 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -1,9 +1,7 @@ name: checkstyle -on: - pull_request: - branches: - - main +on: [pull_request, push] + jobs: formatting: runs-on: ubuntu-latest @@ -11,4 +9,4 @@ jobs: - uses: actions/checkout@v2 # v2 minimum required - uses: axel-op/googlejavaformat-action@v3 with: - args: "--set-exit-if-changed" \ No newline at end of file + args: "--set-exit-if-changed" From 82f1d0f657383526c4f8fbec049ce5336d7119db Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:13:59 +0400 Subject: [PATCH 04/11] use another check style action --- .github/workflows/checkstyle.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 6c35a0e6..f78ddb67 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -5,10 +5,15 @@ on: branches: - main jobs: - formatting: + checkstyle_job: runs-on: ubuntu-latest + name: Checkstyle job steps: - - uses: actions/checkout@v2 # v2 minimum required - - uses: axel-op/googlejavaformat-action@v3 + - name: Checkout + uses: actions/checkout@v2 + - name: Run check style + uses: nikitasavinov/checkstyle-action@master with: - args: "--set-exit-if-changed" \ No newline at end of file + github_token: ${{ secrets.GITHUB_TOKEN }} + reporter: 'github-pr-check' + tool_name: 'testtool' \ No newline at end of file From 69eb4e97095826b80ae4af0e44c9f440e873bad1 Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:17:47 +0400 Subject: [PATCH 05/11] invalid indentation --- .../com/karankumar/booksapi/datafetchers/BookDataFetcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java index 00b0cfcf..eaa77ab8 100644 --- a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java +++ b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java @@ -27,7 +27,7 @@ @DgsComponent public class BookDataFetcher { - private final BookService bookService; + private final BookService bookService; public BookDataFetcher(BookService bookService) { this.bookService = bookService; From 9aa0da1f2ba255abfc364cb25f9509df7ec4530c Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:27:39 +0400 Subject: [PATCH 06/11] fail on error, default tool_name --- .github/workflows/checkstyle.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index f78ddb67..4cb285ed 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -1,9 +1,7 @@ name: checkstyle -on: - pull_request: - branches: - - main +on: pull_request + jobs: checkstyle_job: runs-on: ubuntu-latest @@ -16,4 +14,4 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} reporter: 'github-pr-check' - tool_name: 'testtool' \ No newline at end of file + fail_on_error: true \ No newline at end of file From c0c196bb136deb32f706dac7aa9b52fe22ad616a Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:32:35 +0400 Subject: [PATCH 07/11] error level --- .github/workflows/checkstyle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 4cb285ed..0b648ee4 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -14,4 +14,5 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} reporter: 'github-pr-check' + level: error fail_on_error: true \ No newline at end of file From f9131e0f725a176576bda2f75158570b73fcc990 Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:34:52 +0400 Subject: [PATCH 08/11] indentation --- .../com/karankumar/booksapi/datafetchers/BookDataFetcher.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java index eaa77ab8..cd7180ba 100644 --- a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java +++ b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java @@ -27,9 +27,9 @@ @DgsComponent public class BookDataFetcher { - private final BookService bookService; + private final BookService bookService; - public BookDataFetcher(BookService bookService) { + public BookDataFetcher(BookService bookService) { this.bookService = bookService; } From 7010ae81ee4665503a42137295a7199de86f99bb Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:38:31 +0400 Subject: [PATCH 09/11] indentation --- .../datafetchers/BookDataFetcher.java | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java index cd7180ba..c704a38e 100644 --- a/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java +++ b/src/main/java/com/karankumar/booksapi/datafetchers/BookDataFetcher.java @@ -27,44 +27,46 @@ @DgsComponent public class BookDataFetcher { - private final BookService bookService; - public BookDataFetcher(BookService bookService) { - this.bookService = bookService; - } + private final BookService bookService; - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindAllBooks) - public List findAllBooks() { - return bookService.findAll(); - } + public BookDataFetcher(BookService bookService) { + this.bookService = bookService; + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindBookByIsbn13) - public Book findBookByIsbn13(@InputArgument(DgsConstants.BOOK.Isbn13) String isbn13) { - return bookService.findBookByIsbn13(isbn13); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindAllBooks) + public List findAllBooks() { + return bookService.findAll(); + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByAuthor) - public List findByAuthor(@InputArgument(DgsConstants.AUTHOR.FullName) String fullName) { - return bookService.findByAuthor(fullName); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindBookByIsbn13) + public Book findBookByIsbn13(@InputArgument(DgsConstants.BOOK.Isbn13) String isbn13) { + return bookService.findBookByIsbn13(isbn13); + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByPublisher) - public List findByPublisher(@InputArgument(DgsConstants.PUBLISHER.Name) String publisherName) { - return bookService.findByPublisher(publisherName); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByAuthor) + public List findByAuthor(@InputArgument(DgsConstants.AUTHOR.FullName) String fullName) { + return bookService.findByAuthor(fullName); + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByTitleIgnoreCase) - public List findByTitle(@InputArgument(DgsConstants.BOOK.Title) String title) { - return bookService.findByTitle(title); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByPublisher) + public List findByPublisher( + @InputArgument(DgsConstants.PUBLISHER.Name) String publisherName) { + return bookService.findByPublisher(publisherName); + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByGenre) - public List findByGenre(@InputArgument(DgsConstants.GENRE.Name) GenreName genreName) { - return bookService.findByGenre(genreName); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByTitleIgnoreCase) + public List findByTitle(@InputArgument(DgsConstants.BOOK.Title) String title) { + return bookService.findByTitle(title); + } - @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByAwardName) - public List findByAward(@InputArgument(DgsConstants.AWARD.AwardName) String awardName) { - return bookService.findByAward(awardName); - } + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByGenre) + public List findByGenre(@InputArgument(DgsConstants.GENRE.Name) GenreName genreName) { + return bookService.findByGenre(genreName); + } + + @DgsData(parentType = DgsConstants.QUERY_TYPE, field = DgsConstants.QUERY.FindByAwardName) + public List findByAward(@InputArgument(DgsConstants.AWARD.AwardName) String awardName) { + return bookService.findByAward(awardName); + } } From b796b64be2d321e31e64d58af683b54cd1759b56 Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Mon, 3 Oct 2022 19:55:39 +0400 Subject: [PATCH 10/11] revert version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9bc8adbd..4037730f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.karankumar booksapi - 0.1.0.1-SNAPSHOT + 0.1.0-SNAPSHOT booksApi GraphQL Books API From 87846fd736a69ceebfe17966c03bf2cd43150570 Mon Sep 17 00:00:00 2001 From: Vladimir Parfenov1 Date: Tue, 4 Oct 2022 09:19:03 +0400 Subject: [PATCH 11/11] change workdir --- .github/workflows/checkstyle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 0b648ee4..91ea81d5 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -15,4 +15,5 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} reporter: 'github-pr-check' level: error - fail_on_error: true \ No newline at end of file + fail_on_error: true + workdir: src \ No newline at end of file