This is an automated email from the ASF dual-hosted git repository.
sseifert pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-base.git
The following commit(s) were added to refs/heads/master by this push:
new 4d13e47 SLING-12537 Strings and Boxed types should be compared using
"equals()" (#6)
4d13e47 is described below
commit 4d13e473116e0df0e0c0514182809b04bd9f6a18
Author: Haris Adzemovic <[email protected]>
AuthorDate: Tue Dec 10 13:08:42 2024 +0100
SLING-12537 Strings and Boxed types should be compared using "equals()" (#6)
This fixes 14 Sonarqube violations of rule S4973:
https://rules.sonarsource.com/java/RSPEC-4973
---
src/main/java/org/apache/sling/launchpad/app/Main.java | 18 +++++++++---------
.../apache/sling/launchpad/base/app/MainDelegate.java | 10 +++++-----
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/sling/launchpad/app/Main.java
b/src/main/java/org/apache/sling/launchpad/app/Main.java
index 8296478..3422239 100644
--- a/src/main/java/org/apache/sling/launchpad/app/Main.java
+++ b/src/main/java/org/apache/sling/launchpad/app/Main.java
@@ -718,7 +718,7 @@ public class Main {
String value = arg.getValue();
switch (arg.getKey().charAt(0)) {
case 'j':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-j", "Missing host:port value");
errorArg = true;
continue;
@@ -727,7 +727,7 @@ public class Main {
break;
case 'l':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-l", "Missing log level value");
errorArg = true;
continue;
@@ -736,7 +736,7 @@ public class Main {
break;
case 'f':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-f", "Missing log file value");
errorArg = true;
continue;
@@ -747,7 +747,7 @@ public class Main {
break;
case 'c':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-c", "Missing directory value");
errorArg = true;
continue;
@@ -756,7 +756,7 @@ public class Main {
break;
case 'i':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-i", "Missing launchpad directory
value");
errorArg = true;
continue;
@@ -765,7 +765,7 @@ public class Main {
break;
case 'a':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-a", "Missing address value");
errorArg = true;
continue;
@@ -774,7 +774,7 @@ public class Main {
break;
case 'p':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-p", "Missing port value");
errorArg = true;
continue;
@@ -790,7 +790,7 @@ public class Main {
break;
case 'r':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-r", "Missing root path value");
errorArg = true;
continue;
@@ -803,7 +803,7 @@ public class Main {
break;
case 'D':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
errorArg("-D", "Missing property assignment");
errorArg = true;
continue;
diff --git
a/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
b/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
index e4fbabd..6f2705c 100644
--- a/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
+++ b/src/main/java/org/apache/sling/launchpad/base/app/MainDelegate.java
@@ -233,7 +233,7 @@ public class MainDelegate implements Launcher {
String value = arg.getValue();
switch (arg.getKey().charAt(0)) {
case 'l':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
terminate("Missing log level value", 1);
continue;
}
@@ -241,7 +241,7 @@ public class MainDelegate implements Launcher {
break;
case 'f':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
terminate("Missing log file value", 1);
continue;
} else if ("-".equals(value)) {
@@ -251,7 +251,7 @@ public class MainDelegate implements Launcher {
break;
case 'c':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
terminate("Missing directory value", 1);
continue;
}
@@ -259,7 +259,7 @@ public class MainDelegate implements Launcher {
break;
case 'p':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
terminate("Missing port value", 1);
continue;
}
@@ -273,7 +273,7 @@ public class MainDelegate implements Launcher {
break;
case 'a':
- if (value == arg.getKey()) {
+ if (value.equals(arg.getKey())) {
terminate("Missing address value", 1);
continue;
}
