diff --git a/.github/workflows/java-ci-lint.yaml b/.github/workflows/java-ci-lint.yaml index 53ddb0cc7e..d85f04b70f 100644 --- a/.github/workflows/java-ci-lint.yaml +++ b/.github/workflows/java-ci-lint.yaml @@ -25,8 +25,8 @@ jobs: run: | sh ./style-guide/google-format-ci-v0.1.sh env: - GOOGLE_JAR_VERSION: 1.11.0 - GOOGLE_JAR_NAME: google-java-format-1.11.0-all-deps.jar + GOOGLE_JAR_VERSION: 1.22.0 + GOOGLE_JAR_NAME: google-java-format-1.22.0-all-deps.jar - name: Checkstyle run: | diff --git a/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/service/ScheduleManager.java b/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/service/ScheduleManager.java index ae58e6576b..06afbee55f 100644 --- a/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/service/ScheduleManager.java +++ b/src/scheduler/src/main/java/org/cloudfoundry/autoscaler/scheduler/service/ScheduleManager.java @@ -288,6 +288,7 @@ private SpecificDateScheduleEntity createCompensatorySchedule( return compenstatorySchedule; } + /** * Calls private helper methods to delete the schedules from the database and calls * ScalingJobManager to delete scaling action jobs. diff --git a/style-guide/google-format-ci-v0.1.sh b/style-guide/google-format-ci-v0.1.sh index f2249bc9cf..444f0c8b37 100755 --- a/style-guide/google-format-ci-v0.1.sh +++ b/style-guide/google-format-ci-v0.1.sh @@ -4,22 +4,17 @@ export PATH=${HOME}/go/bin:${PATH} ################################################################################################### # This script downloads google formatter and displays formatting issues on Github actions ################################################################################################### -GOOGLE_JAR_VERSION=${GOOGLE_JAR_VERSION:-"1.11.0"} +GOOGLE_JAR_VERSION=${GOOGLE_JAR_VERSION:-"1.22.0"} GOOGLE_JAR_NAME=${GOOGLE_JAR_NAME:-"google-java-format-${GOOGLE_JAR_VERSION}-all-deps.jar"} ! [ -e "$GOOGLE_JAR_NAME" ] && \ curl -fLJO "https://github.com/google/google-java-format/releases/download/v$GOOGLE_JAR_VERSION/$GOOGLE_JAR_NAME" +# shellcheck disable=SC2046 files_to_be_formatted=$(java \ - --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ - --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ - -jar "${GOOGLE_JAR_NAME}" -n --skip-javadoc-formatting $(find . -name '*.java') ) - + -jar "${GOOGLE_JAR_NAME}" --dry-run --skip-javadoc-formatting $(find src/scheduler -name '*.java')) if [ -n "$files_to_be_formatted" ]; then echo "Formatter Results..." echo "Files require reformatting:" echo "${files_to_be_formatted}" exit 1 -fi \ No newline at end of file +fi