From e3c8af7e54d00537c31feeeb49f048a9d64d423b Mon Sep 17 00:00:00 2001 From: sbplat <71648843+sbplat@users.noreply.github.com> Date: Fri, 29 Dec 2023 21:34:36 -0500 Subject: [PATCH] chore: use spotless googleJavaFormat --- build.gradle | 42 +++++++++++++------ .../api/misc/FakeScanControllerWIP.java | 8 ++-- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 8002ee7a9..95a0930da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.1.2' - id 'io.spring.dependency-management' version '1.1.3' - id 'org.springdoc.openapi-gradle-plugin' version '1.8.0' - id "io.swagger.swaggerhub" version "1.3.2" - id 'edu.sc.seis.launch4j' version '3.0.5' + id 'java' + id 'org.springframework.boot' version '3.1.2' + id 'io.spring.dependency-management' version '1.1.3' + id 'org.springdoc.openapi-gradle-plugin' version '1.8.0' + id "io.swagger.swaggerhub" version "1.3.2" + id 'edu.sc.seis.launch4j' version '3.0.5' + id 'com.diffplug.spotless' version '6.23.3' } group = 'stirling.software' @@ -12,7 +13,7 @@ version = '0.18.1' sourceCompatibility = '17' repositories { - mavenCentral() + mavenCentral() } sourceSets { @@ -61,12 +62,27 @@ launch4j { messagesInstanceAlreadyExists="Stirling-PDF is already running." } +spotless { + java { + target project.fileTree('src/main/java') + + googleJavaFormat('1.19.1').aosp().reorderImports(false) + + importOrder('java', 'javax', 'org', 'com', 'net', 'io') + toggleOffOn() + formatAnnotations() + trimTrailingWhitespace() + indentWithSpaces() + endWithNewline() + } +} + dependencies { - //security updates - implementation 'ch.qos.logback:logback-classic:1.4.14' - implementation 'ch.qos.logback:logback-core:1.4.14' - implementation 'org.springframework:spring-webmvc:6.0.15' - + //security updates + implementation 'ch.qos.logback:logback-classic:1.4.14' + implementation 'ch.qos.logback:logback-core:1.4.14' + implementation 'org.springframework:spring-webmvc:6.0.15' + implementation 'org.yaml:snakeyaml:2.1' implementation 'org.springframework.boot:spring-boot-starter-web:3.2.1' implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.1' @@ -164,7 +180,7 @@ jar { } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } task printVersion { diff --git a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java index 099e84116..9e9d8ba63 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java +++ b/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanControllerWIP.java @@ -3,21 +3,21 @@ package stirling.software.SPDF.controller.api.misc; import java.awt.Color; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; -//Required for image manipulation + import java.awt.image.BufferedImage; import java.awt.image.BufferedImageOp; import java.awt.image.ConvolveOp; import java.awt.image.Kernel; import java.awt.image.RescaleOp; import java.io.ByteArrayOutputStream; -//Required for file input/output + import java.io.File; import java.io.IOException; import java.security.SecureRandom; -//Other required classes + import java.util.Random; -//Required for image input/output + import javax.imageio.ImageIO; import org.apache.pdfbox.pdmodel.PDDocument;