From 1b3cf096d1ac9c437321464da14a3fcb47839ae8 Mon Sep 17 00:00:00 2001
From: Laurent Clouet <4409640-laurent.clouet@users.noreply.gitlab.com>
Date: Thu, 6 Jun 2024 01:05:27 +0000
Subject: [PATCH] Ref: add new static analyser rule:
bestpractices.xml/UnusedAssignment
---
rulesets/java-sheepit.xml | 1 +
src/main/java/com/sheepit/client/Job.java | 2 +-
src/main/java/com/sheepit/client/Log.java | 3 +--
src/main/java/com/sheepit/client/Server.java | 21 +++++++------------
.../com/sheepit/client/SettingsLoader.java | 3 +--
src/main/java/com/sheepit/client/Utils.java | 8 +++----
.../client/hardware/gpu/nvidia/Nvidia.java | 8 +++----
.../java/com/sheepit/client/os/Windows.java | 3 +--
8 files changed, 20 insertions(+), 29 deletions(-)
diff --git a/rulesets/java-sheepit.xml b/rulesets/java-sheepit.xml
index 6c28a97..ba604b5 100644
--- a/rulesets/java-sheepit.xml
+++ b/rulesets/java-sheepit.xml
@@ -9,6 +9,7 @@
SheepIt client custom rules
+
diff --git a/src/main/java/com/sheepit/client/Job.java b/src/main/java/com/sheepit/client/Job.java
index 9288816..da3bfa3 100644
--- a/src/main/java/com/sheepit/client/Job.java
+++ b/src/main/java/com/sheepit/client/Job.java
@@ -163,7 +163,7 @@ import java.util.regex.Pattern;
gui.status("Rendering");
RenderProcess process = getProcessRender();
Timer timerOfMaxRenderTime = null;
- String core_script = "";
+ String core_script;
// When sending Ctrl+C to the terminal it also get's sent to all subprocesses e.g. also the render process.
// The java program handles Ctrl+C but the renderer quits on Ctrl+C.
// This script causes the renderer to ignore Ctrl+C.
diff --git a/src/main/java/com/sheepit/client/Log.java b/src/main/java/com/sheepit/client/Log.java
index 4b2dc85..04d16e0 100644
--- a/src/main/java/com/sheepit/client/Log.java
+++ b/src/main/java/com/sheepit/client/Log.java
@@ -85,13 +85,12 @@ public class Log {
if (LEVEL_DEBUG.equals(level_) && this.debugLevel == false) {
return;
}
- String line = null;
try {
int checkpointToWrite = (point_ > 0 ? point_ : this.lastCheckPoint);
if (msg_.equals("") == false) {
- line = this.dateFormat.format(new Date()) + " (" + level_ + ") " + msg_;
+ String line = this.dateFormat.format(new Date()) + " (" + level_ + ") " + msg_;
if (this.checkpoints.containsKey(checkpointToWrite) && this.checkpoints.get(checkpointToWrite) != null) {
this.checkpoints.get(checkpointToWrite).add(line);
}
diff --git a/src/main/java/com/sheepit/client/Server.java b/src/main/java/com/sheepit/client/Server.java
index d20a34b..f5599af 100644
--- a/src/main/java/com/sheepit/client/Server.java
+++ b/src/main/java/com/sheepit/client/Server.java
@@ -197,7 +197,7 @@ public class Server extends Thread {
public Error.Type getConfiguration() {
OS os = OS.getOS();
- String publickey = null;
+ String publickey;
try {
HttpUrl.Builder remoteURL = Objects.requireNonNull(HttpUrl.parse(this.base_url + "/server/config.php")).newBuilder();
FormBody formBody = new FormBody.Builder()
@@ -240,12 +240,9 @@ public class Server extends Thread {
if (ServerCode.fromInt(serverConfig.getStatus()) != ServerCode.OK) {
return Error.ServerCodeToType(ServerCode.fromInt(serverConfig.getStatus()));
}
-
+
publickey = serverConfig.getPublickey();
- if (publickey.isEmpty()) {
- publickey = null;
- }
- else {
+ if (publickey.isEmpty() == false) {
this.user_config.setPassword(publickey);
}
}
@@ -442,12 +439,11 @@ public class Server extends Thread {
}
Request request = builder.build();
- Response response = null;
try {
- response = httpClient.newCall(request).execute();
+ Response response = httpClient.newCall(request).execute();
- if (!response.isSuccessful()) {
+ if (response.isSuccessful() == false) {
this.log.error("Received unsuccessful HTTP response " + response);
}
@@ -470,10 +466,9 @@ public class Server extends Thread {
}
Request request = builder.build();
- Response response = null;
-
+
try {
- response = httpClient.newCall(request).execute();
+ Response response = httpClient.newCall(request).execute();
if (checkIsSuccessful && !response.isSuccessful()) {
throw new IOException("Unexpected code " + response);
@@ -509,7 +504,7 @@ public class Server extends Thread {
long size = response.body().contentLength();
// only update the gui every 1MB
byte[] buffer = new byte[1024 * 1024];
- int len = 0;
+ int len;
long written = 0;
if (size != -1) {
diff --git a/src/main/java/com/sheepit/client/SettingsLoader.java b/src/main/java/com/sheepit/client/SettingsLoader.java
index 993cb81..3159bd1 100644
--- a/src/main/java/com/sheepit/client/SettingsLoader.java
+++ b/src/main/java/com/sheepit/client/SettingsLoader.java
@@ -256,9 +256,8 @@ public class SettingsLoader {
Properties configFileProp = new Properties();
if (new File(path).exists()) {
- InputStream input = null;
try {
- input = new FileInputStream(path);
+ InputStream input = new FileInputStream(path);
configFileProp.load(input);
} catch (IOException e) {
e.printStackTrace();
diff --git a/src/main/java/com/sheepit/client/Utils.java b/src/main/java/com/sheepit/client/Utils.java
index 504eb62..9f3cb37 100644
--- a/src/main/java/com/sheepit/client/Utils.java
+++ b/src/main/java/com/sheepit/client/Utils.java
@@ -112,7 +112,7 @@ public class Utils {
if (password != null) {
zipInputStream.setPassword(password);
}
- LocalFileHeader fileHeader = null;
+ LocalFileHeader fileHeader;
while ((fileHeader = zipInputStream.getNextEntry()) != null) {
String outFilePath = destinationDirectory + File.separator + fileHeader.getFileName();
File outFile = new File(outFilePath);
@@ -130,7 +130,7 @@ public class Utils {
FileOutputStream os = new FileOutputStream(outFile);
- int readLen = -1;
+ int readLen;
byte[] buff = new byte[1024];
//Loop until End of File and write the contents to the output stream
@@ -354,8 +354,8 @@ public class Utils {
* Examples: 4,20GB, 20,00TB, 3,69MB
*/
public static String formatDataConsumption(long bytes) {
- float divider = 0;
- String suffix = "";
+ float divider;
+ String suffix;
if (bytes > 1099511627776f) { // 1TB
divider = 1099511627776f;
diff --git a/src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java
index 100dbe2..1e07d0e 100644
--- a/src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java
+++ b/src/main/java/com/sheepit/client/hardware/gpu/nvidia/Nvidia.java
@@ -164,7 +164,7 @@ public class Nvidia implements GPULister {
if (path == null) {
return null;
}
- CUDA cudalib = null;
+ CUDA cudalib;
try {
cudalib = (CUDA) Native.load(path, CUDA.class);
}
@@ -180,9 +180,7 @@ public class Nvidia implements GPULister {
return null;
}
- int result = CUresult.CUDA_ERROR_UNKNOWN;
-
- result = cudalib.cuInit(0);
+ int result = cudalib.cuInit(0);
if (result != CUresult.CUDA_SUCCESS) {
System.out.println("Nvidia::getGpus cuInit failed: " + getCudaErrorString(result) + " (" + result + ")");
if (result == CUresult.CUDA_ERROR_UNKNOWN) {
@@ -269,7 +267,7 @@ public class Nvidia implements GPULister {
return null;
}
- NVML nvml = null;
+ NVML nvml;
try {
nvml = Native.load(os.getNVMLLib(), NVML.class);
}
diff --git a/src/main/java/com/sheepit/client/os/Windows.java b/src/main/java/com/sheepit/client/os/Windows.java
index 027f0d1..ba54033 100644
--- a/src/main/java/com/sheepit/client/os/Windows.java
+++ b/src/main/java/com/sheepit/client/os/Windows.java
@@ -48,9 +48,8 @@ public class Windows extends OS {
@Override public Process exec(List command, Map env) throws IOException {
// disable a popup because the renderer might crash (seg fault)
- Kernel32Lib kernel32lib = null;
try {
- kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class);
+ Kernel32Lib kernel32lib = (Kernel32Lib) Native.load(Kernel32Lib.path, Kernel32Lib.class);
kernel32lib.SetErrorMode(Kernel32Lib.SEM_NOGPFAULTERRORBOX);
}
catch (UnsatisfiedLinkError e) {