You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/05 09:39:51 UTC
[camel] branch main updated: String.equalsTo("") replaced with String.isEmpty() in core and tooling (#9817)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c1f51ac68c3 String.equalsTo("") replaced with String.isEmpty() in core and tooling (#9817)
c1f51ac68c3 is described below
commit c1f51ac68c3762fa8bae5f380d558ae8735ac154
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Wed Apr 5 12:39:44 2023 +0300
String.equalsTo("") replaced with String.isEmpty() in core and tooling (#9817)
* String.equalsTo("") replaced with String.isEmpty(). The latter is more efficient. Separate commit for core and tooling
* Restored erroneously fused blocks of code and deleted assignment
---------
Co-authored-by: dk2k <dk...@ya.ru>
---
.../src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java | 4 ++--
.../main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java | 4 ++--
.../src/main/java/org/apache/camel/tooling/maven/MavenGav.java | 4 ++--
.../main/java/org/apache/camel/tooling/maven/support/DIRegistry.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
index 081377ffef5..5945599fe73 100644
--- a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
+++ b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/MultiCompile.java
@@ -108,10 +108,10 @@ public final class MultiCompile {
String cp = System.getProperty("java.class.path");
String mp = System.getProperty("jdk.module.path");
- if (cp != null && !"".equals(cp)) {
+ if (cp != null && !cp.isEmpty()) {
classpath.append(cp);
}
- if (mp != null && !"".equals(mp)) {
+ if (mp != null && !mp.isEmpty()) {
classpath.append(mp);
}
diff --git a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
index b7f5fde89b9..5d16b14fdb6 100644
--- a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
+++ b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
@@ -731,10 +731,10 @@ public class MavenDownloaderImpl extends ServiceSupport implements MavenDownload
// 3) ${user.home}/.m2/repository (if exists)
// 4) /tmp/.m2/repository
String localRepository = System.getProperty("maven.repo.local");
- if (localRepository == null || "".equals(localRepository.trim())) {
+ if (localRepository == null || localRepository.trim().isEmpty()) {
localRepository = settings.getLocalRepository();
}
- if (localRepository == null || "".equals(localRepository.trim())) {
+ if (localRepository == null || localRepository.trim().isEmpty()) {
Path m2Repository = Paths.get(System.getProperty("user.home"), ".m2/repository");
if (!m2Repository.toFile().isDirectory()) {
m2Repository = Paths.get(System.getProperty("java.io.tmpdir"), UUID.randomUUID().toString());
diff --git a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenGav.java b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenGav.java
index a42287d1051..e28fec5ed37 100644
--- a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenGav.java
+++ b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenGav.java
@@ -46,10 +46,10 @@ public final class MavenGav {
answer.groupId = groupId;
answer.artifactId = artifactId;
answer.version = version;
- if (classifier != null && !"".equals(classifier)) {
+ if (classifier != null && !classifier.isEmpty()) {
answer.classifier = classifier;
}
- if (packaging != null && !"".equals(packaging)) {
+ if (packaging != null && !packaging.isEmpty()) {
answer.packaging = packaging;
}
return answer;
diff --git a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
index 2eec2f85c05..afababa029f 100644
--- a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
+++ b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/support/DIRegistry.java
@@ -131,7 +131,7 @@ public class DIRegistry extends SupplierRegistry {
for (Annotation ann : type.getAnnotations()) {
if (isNamedAnnotation(ann)) {
name = getNamedAnnotationValue(type);
- if (name == null || "".equals(name.trim())) {
+ if (name == null || name.trim().isEmpty()) {
name = key.getName();
}
}