From 236a72ec53ce52873e4d524b1a01cbac7e6cd5cc Mon Sep 17 00:00:00 2001
From: Laurent Clouet <laurent@nopnop.net>
Date: Thu, 6 Jun 2024 03:04:34 +0200
Subject: [PATCH] Ref: add more PMD rule:
 bestpractices.xml/OneDeclarationPerLine

---
 rulesets/java-sheepit.xml                           | 1 +
 src/main/java/com/sheepit/client/Configuration.java | 3 ++-
 src/main/java/com/sheepit/client/Speedtest.java     | 5 ++---
 src/main/java/com/sheepit/client/os/Mac.java        | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/rulesets/java-sheepit.xml b/rulesets/java-sheepit.xml
index 6c28a97..5945aab 100644
--- a/rulesets/java-sheepit.xml
+++ b/rulesets/java-sheepit.xml
@@ -13,6 +13,7 @@
 	<rule ref="category/java/bestpractices.xml/AbstractClassWithoutAbstractMethod" />
 	<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" />
 	<rule ref="category/java/bestpractices.xml/CheckResultSet" />
+	<rule ref="category/java/bestpractices.xml/OneDeclarationPerLine" />
 	<rule ref="category/java/bestpractices.xml/PrimitiveWrapperInstantiation" />
 	<rule ref="category/java/bestpractices.xml/UnusedFormalParameter" />
 	<rule ref="category/java/bestpractices.xml/UnusedLocalVariable" />
diff --git a/src/main/java/com/sheepit/client/Configuration.java b/src/main/java/com/sheepit/client/Configuration.java
index c29f554..e0072b1 100644
--- a/src/main/java/com/sheepit/client/Configuration.java
+++ b/src/main/java/com/sheepit/client/Configuration.java
@@ -122,7 +122,8 @@ import lombok.Data;
 	 * @return string formatted with SheepIt Admin Log Viewer in mind
 	 */
 	public String toString() {
-		String c = "    CFG: ", n ="\n";
+		String c = "    CFG: ";
+		String n ="\n";
 		return
 				c + "version:                   " + getJarVersion() + n +
 				c + "configFilePath:            " + configFilePath + n +
diff --git a/src/main/java/com/sheepit/client/Speedtest.java b/src/main/java/com/sheepit/client/Speedtest.java
index 505f18c..98dddf4 100644
--- a/src/main/java/com/sheepit/client/Speedtest.java
+++ b/src/main/java/com/sheepit/client/Speedtest.java
@@ -100,10 +100,9 @@ public class Speedtest {
 	 * @throws Exception
 	 */
 	private <T> Pair<Long, T> runTimed(Callable<T> task) throws Exception {
-		long start, end;
-		start = System.nanoTime();
+		long start = System.nanoTime();
 		T callValue = task.call();
-		end = System.nanoTime();
+		long end = System.nanoTime();
 		return new Pair<>(Duration.ofNanos(end - start).toMillis(), callValue);
 	}
 	
diff --git a/src/main/java/com/sheepit/client/os/Mac.java b/src/main/java/com/sheepit/client/os/Mac.java
index efa49e8..40962f0 100644
--- a/src/main/java/com/sheepit/client/os/Mac.java
+++ b/src/main/java/com/sheepit/client/os/Mac.java
@@ -66,7 +66,8 @@ public class Mac extends OS {
 	
 	@Override public boolean isSupported() {
 		String[] ver = operatingSystem.getVersionInfo().getVersion().split("\\.");
-		int majorVer = Integer.parseInt(ver[0]), minorVer = Integer.parseInt(ver[1]);
+		int majorVer = Integer.parseInt(ver[0]);
+		int minorVer = Integer.parseInt(ver[1]);
 		return super.isSupported() && ((majorVer == 10 && minorVer >= 13) || majorVer >= 11);
 	}