Merge branch 'develop' into feature/guard-or

Author: plm-ohki

.github/workflows/auto-format.yml

@@ -27,10 +27,10 @@ jobs:
       # コードフォーマットの実行(※1)
       - name: Code format
         run: |
-          sudo apt install npm
-          npm install .
-          npx prettier --write "**/*.java"
-
+          shopt -s globstar
+          wget -q -O google-java-format.jar \
+            https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar
+          java -jar google-java-format.jar --replace --skip-javadoc-formatting src/**/*.java
       # 上の例ではすべての変更に対してフォーマッタを加えております。
       # プルリクエスト時の変更を取る場合はgit log
       # で変更差分のみ取得してフォーマッタをかけましょう。(※2)

README.md

@@ -45,14 +45,14 @@ Any contributions you make are **greatly appreciated**.
 
 ### Formatting
 
-We are currently using prettier-java.
+We are currently using google-java-format.
 
 ```sh
-npm install # install prettier
-npx prettier --write "**/*.java"
+wget https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar
+java -jar /path/to/google-java-format-1.15.0-all-deps.jar --replace --skip-javadoc-formatting [files...]
 ```
 
-See <https://github.com/jhipster/prettier-java> for more detailed information.
+See <https://github.com/google/google-java-format> for more detailed information.
 
 ### Directory structure