diff --git a/build.gradle b/build.gradle index a5c0577dfd..cf83bc2fc2 100644 --- a/build.gradle +++ b/build.gradle @@ -11,6 +11,7 @@ plugins { id 'visual-studio' id 'net.ltgt.errorprone' version '1.1.1' apply false id 'com.github.johnrengelman.shadow' version '5.2.0' apply false + id 'com.diffplug.gradle.spotless' version '4.5.0' } if (project.hasProperty('buildServer')) { @@ -131,6 +132,19 @@ ext.getCurrentArch = { return NativePlatforms.desktop } +spotless { + java { + target fileTree('.') { + include '**/*.java' + exclude '**/manualTests/**', '**/build*/**' + } + googleJavaFormat() + removeUnusedImports() + trimTrailingWhitespace() + endWithNewline() + } +} + wrapper { gradleVersion = '6.0.1' } diff --git a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java index be22b263a5..3366b39979 100644 --- a/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java +++ b/cameraserver/multiCameraServer/src/main/java/edu/wpi/Main.java @@ -4,49 +4,47 @@ package edu.wpi; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.List; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; - import edu.wpi.cscore.VideoSource; import edu.wpi.first.cameraserver.CameraServer; import edu.wpi.first.networktables.NetworkTableInstance; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; /* - JSON format: - { - "team": , - "ntmode": <"client" or "server", "client" if unspecified> - "cameras": [ - { - "name": - "path": - "pixel format": <"MJPEG", "YUYV", etc> // optional - "width":