Checkstyles update

.github/workflows/checkstyle-and-build.yml

@@ -0,0 +1,38 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Maven
+
+on: [pull_request, push]
+
+jobs:
+  checkstyle_job:
+    runs-on: ubuntu-latest
+    name: Checkstyle
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Run check style
+        uses: nikitasavinov/checkstyle-action@master
+        with:
+          fail_on_error: true
+          reporter: 'github-pr-check'
+          tool_name: 'checkstyle'
+          level: error
+          filter_mode: nofilter
+          checkstyle_config: checkstyle.xml
+
+  build:
+    runs-on: ubuntu-latest
+    name: Build
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 16
+        uses: actions/setup-java@v2
+        with:
+          java-version: '16'
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: mvn package
+      - name: Test with Maven
+        run: mvn test

pom.xml

@@ -1,105 +1,104 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>edu.whimc</groupId>
-	<artifactId>WHIMC-Observations</artifactId>
-	<version>2.4.5</version>
-	<name>WHIMC Observations</name>
-	<description>Create holographic observations in worlds</description>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>edu.whimc</groupId>
+    <artifactId>WHIMC-Observations</artifactId>
+    <version>2.5.1</version>
+    <name>WHIMC Observations</name>
+    <description>Create holographic observations in worlds</description>
 
-	<repositories>
-		<!-- This adds the Spigot Maven repository to the build -->
-		<repository>
-			<id>spigot-repo</id>
-			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
-		</repository>
-		<!-- Maven repo for Holographic Displays -->
-		<repository>
-			<id>codemc-repo</id>
-			<url>https://repo.codemc.io/repository/maven-public/</url>
-		</repository>
-		<!-- Elmakers repo for Quests -->
-		<repository>
-			<id>elmakers-repo</id>
-			<url>https://maven.elmakers.com/repository/</url>
-		</repository>
-		<!-- Maven repo for ProtocolLib -->
-		<repository>
-			<id>dmulloy2-repo</id>
-			<url>https://repo.dmulloy2.net/repository/public/</url>
-		</repository>
-	</repositories>
+    <repositories>
+        <!-- This adds the Spigot Maven repository to the build -->
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+        <!-- Maven repo for Holographic Displays -->
+        <repository>
+            <id>codemc-repo</id>
+            <url>https://repo.codemc.io/repository/maven-public/</url>
+        </repository>
+        <!-- Maven repo for Quests -->
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <!-- Maven repo for ProtocolLib -->
+        <repository>
+            <id>dmulloy2-repo</id>
+            <url>https://repo.dmulloy2.net/repository/public/</url>
+        </repository>
+    </repositories>
 
-	<dependencies>
-		<!--This adds the Spigot API artifact to the build -->
-		<dependency>
-			<groupId>org.spigotmc</groupId>
-			<artifactId>spigot-api</artifactId>
-			<version>1.14.4-R0.1-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- Add HolographicDisplays to the build -->
-		<dependency>
-			<groupId>com.gmail.filoghost.holographicdisplays</groupId>
-			<artifactId>holographicdisplays-api</artifactId>
-			<version>2.4.0</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- Add Quests to the build -->
-		<dependency>
-			<groupId>me.blackvein.quests</groupId>
-			<artifactId>quests</artifactId>
-			<version>3.6.2</version>
-			<scope>provided</scope>
-		</dependency>
-		<!-- Add ProtocolLib to the build-->
-		<dependency>
-			<groupId>com.comphenix.protocol</groupId>
-			<artifactId>ProtocolLib</artifactId>
-			<version>4.7.0</version>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
+    <dependencies>
+        <!--This adds the Spigot API artifact to the build -->
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.14.4-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Add HolographicDisplays to the build -->
+        <dependency>
+            <groupId>com.gmail.filoghost.holographicdisplays</groupId>
+            <artifactId>holographicdisplays-api</artifactId>
+            <version>2.4.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <!-- Add Quests to the build -->
+        <dependency>
+            <groupId>com.github.PikaMug.Quests</groupId>
+            <artifactId>quests-main</artifactId>
+            <version>4.0.8</version>
+        </dependency>
+        <!-- Add ProtocolLib to the build-->
+        <dependency>
+            <groupId>com.comphenix.protocol</groupId>
+            <artifactId>ProtocolLib</artifactId>
+            <version>4.7.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
-	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
+    <properties>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
-	<!-- Repo for plugin -->
-	<scm>
-		<connection>scm:git:[email protected]:whimc/Observation-Displayer.git</connection>
-		<tag>HEAD</tag>
-	</scm>
+    <!-- Repo for plugin -->
+    <scm>
+        <connection>scm:git:[email protected]:whimc/Observation-Displayer.git</connection>
+        <tag>HEAD</tag>
+    </scm>
 
-	<build>
-		<!-- Allow pom.xml value substitution in plugin.yml -->
-		<resources>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
-		</resources>
+    <build>
+        <!-- Allow pom.xml value substitution in plugin.yml -->
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
 
-		<!-- Github release settings -->
-		<plugins>
-			<plugin>
-				<groupId>de.jutzig</groupId>
-				<artifactId>github-release-plugin</artifactId>
-				<version>1.1.1</version>
-				<configuration>
-					<description>Release for v${project.version}</description>
-					<releaseName>${project.artifactId}-${project.version}</releaseName>
-					<tag>${project.version}</tag>
-					<fileSets>
-						<fileSet>
-							<directory>${project.build.directory}</directory>
-						</fileSet>
-					</fileSets>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
+        <!-- Github release settings -->
+        <plugins>
+            <plugin>
+                <groupId>de.jutzig</groupId>
+                <artifactId>github-release-plugin</artifactId>
+                <version>1.1.1</version>
+                <configuration>
+                    <description>Release for v${project.version}</description>
+                    <releaseName>${project.artifactId}-${project.version}</releaseName>
+                    <tag>${project.version}</tag>
+                    <fileSets>
+                        <fileSet>
+                            <directory>${project.build.directory}</directory>
+                        </fileSet>
+                    </fileSets>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

src/main/java/edu/whimc/observations/Observations.java

@@ -73,7 +73,8 @@ public SignMenuFactory getSignMenuFactory() {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
-        Utils.msg(sender, "&cThis plugin is disabled because it was unable to connect to the configured database. " +
+        Utils.msg(sender, "&cThis plugin is disabled because it was unable to connect to the configured database. "
+                +
                 "Please modify the config to ensure the credentials are correct then restart the server.");
         return true;
     }

src/main/java/edu/whimc/observations/commands/AbstractSubCommand.java

@@ -2,19 +2,18 @@
 
 import edu.whimc.observations.Observations;
 import edu.whimc.observations.utils.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.Permission;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
 
 public abstract class AbstractSubCommand {
 
@@ -53,9 +52,9 @@ protected void description(String desc) {
     }
 
     protected void arguments(String args) {
-        String[] parsed_replaced = parseArgs(args, "[", "]", true);
+        String[] parsedReplaced = parseArgs(args, "[", "]", true);
         String[] parsed = parseArgs(args, "[", "]", false);
-        this.arguments.add(parsed_replaced);
+        this.arguments.add(parsedReplaced);
         this.minArgs = 0;
         for (String arg : parsed) {
             if (arg.startsWith("[") && arg.endsWith("]")) {

src/main/java/edu/whimc/observations/commands/ObserveCommand.java

@@ -4,6 +4,11 @@
 import edu.whimc.observations.models.Observation;
 import edu.whimc.observations.models.ObserveEvent;
 import edu.whimc.observations.utils.Utils;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -13,12 +18,6 @@
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.sql.Timestamp;
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.List;
-
 public class ObserveCommand implements CommandExecutor, TabCompleter {
 
     public static final String TEMPLATED_PERM = Observations.PERM_PREFIX + ".observe";
@@ -35,7 +34,8 @@ public static void makeObservation(Observations plugin, String observation, Play
         int days = plugin.getConfig().getInt("expiration-days");
         Timestamp expiration = Timestamp.from(Instant.now().plus(days, ChronoUnit.DAYS));
 
-        Observation obs = Observation.createObservation(plugin, player, player.getLocation(), observation, expiration, null);
+        Observation obs = Observation.createObservation(plugin, player, player.getLocation(), observation,
+                expiration, null);
         Utils.msg(player,
                 "&7Your observation has been placed:",
                 "  &8\"&f&l" + observation + "&8\"");

src/main/java/edu/whimc/observations/commands/observations/ObservationsCommand.java

@@ -3,16 +3,15 @@
 import edu.whimc.observations.Observations;
 import edu.whimc.observations.commands.AbstractSubCommand;
 import edu.whimc.observations.utils.Utils;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabCompleter;
 
 public class ObservationsCommand implements CommandExecutor, TabCompleter {
 

src/main/java/edu/whimc/observations/commands/observations/ObservationsInfo.java

@@ -4,9 +4,8 @@
 import edu.whimc.observations.commands.AbstractSubCommand;
 import edu.whimc.observations.models.Observation;
 import edu.whimc.observations.utils.Utils;
-import org.bukkit.command.CommandSender;
-
 import java.util.List;
+import org.bukkit.command.CommandSender;
 
 public class ObservationsInfo extends AbstractSubCommand {
 
@@ -19,15 +18,22 @@ public ObservationsInfo(Observations plugin, String baseCommand, String subComma
     @Override
     protected boolean onCommand(CommandSender sender, String[] args) {
         Observation obs = Utils.getObervationWithError(sender, args[0]);
-        if (obs == null) return true;
+        if (obs == null) {
+            return true;
+        }
 
         Utils.msgNoPrefix(sender,
                 "&7&m-----------------&r &9&lObservation Info&r &7&m------------------",
-                "  &9ID: &7" + obs.getId(),
-                "  &9Created: &7" + Utils.getDate(obs.getTimestamp()),
-                "  &9Expires: &7" + (obs.getExpiration() == null ? "Never" : Utils.getDate(obs.getExpiration())),
-                "  &9Player: &7" + obs.getPlayer(),
-                "  &9Observation: &8\"&f&l" + obs.getObservation() + "&8\"",
+                "  &9ID: &7"
+                        + obs.getId(),
+                "  &9Created: &7"
+                        + Utils.getDate(obs.getTimestamp()),
+                "  &9Expires: &7"
+                        + (obs.getExpiration() == null ? "Never" : Utils.getDate(obs.getExpiration())),
+                "  &9Player: &7"
+                        + obs.getPlayer(),
+                "  &9Observation: &8\"&f&l" + obs.getObservation()
+                        + "&8\"",
                 "",
                 "  &9Holo Location:",
                 "    " + Utils.locationString(obs.getHoloLocation(), false),
@@ -42,4 +48,4 @@ protected List<java.lang.String> onTabComplete(CommandSender sender, java.lang.S
         return Observation.getObservationsTabComplete(args[0]);
     }
 
-}
+}