You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/03/12 15:53:00 UTC
[karaf] branch karaf-4.2.x updated: Using append instead of
concatenating strings in a few places
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
new 137a1d6 Using append instead of concatenating strings in a few places
137a1d6 is described below
commit 137a1d62a82fe44be1026c6988057f11ac24aaa9
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 12 12:24:13 2019 +0000
Using append instead of concatenating strings in a few places
---
.../blueprint/internal/BlueprintStateService.java | 4 ++--
.../state/spring/internal/SpringStateService.java | 2 +-
.../apache/karaf/jndi/internal/JndiServiceImpl.java | 4 ++--
.../karaf/maven/command/MavenConfigurationSupport.java | 4 ++--
.../karaf/maven/command/RepositoryAddCommand.java | 10 +++++-----
.../apache/karaf/maven/core/MavenRepositoryURL.java | 18 +++++++++---------
.../apache/karaf/shell/console/impl/Converters.java | 2 +-
.../karaf/shell/impl/console/osgi/Converters.java | 2 +-
8 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java b/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java
index dbab501..8646d0e 100644
--- a/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java
+++ b/bundle/blueprintstate/src/main/java/org/apache/karaf/bundle/state/blueprint/internal/BlueprintStateService.java
@@ -65,7 +65,7 @@ public class BlueprintStateService implements org.osgi.service.blueprint.contain
StringBuilder message = new StringBuilder();
Date date = new Date(event.getTimestamp());
SimpleDateFormat df = new SimpleDateFormat();
- message.append(df.format(date) + "\n");
+ message.append(df.format(date)).append("\n");
if (event.getCause() != null) {
message.append("Exception: \n");
addMessages(message, event.getCause());
@@ -73,7 +73,7 @@ public class BlueprintStateService implements org.osgi.service.blueprint.contain
if (event.getDependencies() != null) {
message.append("Missing dependencies: \n");
for (String dep : event.getDependencies()) {
- message.append(dep + " ");
+ message.append(dep).append(" ");
}
message.append("\n");
}
diff --git a/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java b/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java
index 857364f..84b34f1 100644
--- a/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java
+++ b/bundle/springstate/src/main/java/org/apache/karaf/bundle/state/spring/internal/SpringStateService.java
@@ -68,7 +68,7 @@ public class SpringStateService
StringBuilder message = new StringBuilder();
Date date = new Date(event.getTimestamp());
SimpleDateFormat df = new SimpleDateFormat();
- message.append(df.format(date) + "\n");
+ message.append(df.format(date)).append("\n");
if (event instanceof BootstrappingDependencyEvent) {
message.append(getServiceInfo((BootstrappingDependencyEvent)event));
}
diff --git a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
index 9df0f33..d28e804 100644
--- a/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
+++ b/jndi/src/main/java/org/apache/karaf/jndi/internal/JndiServiceImpl.java
@@ -87,7 +87,7 @@ public class JndiServiceImpl implements JndiService {
StringBuilder sb = new StringBuilder();
if (pair.getName().contains(":"))
sb.append(pair.getName());
- else sb.append("/" + pair.getName());
+ else sb.append("/").append(pair.getName());
names((Context) o, sb, map);
} else {
if (pair.getName().contains(":"))
@@ -117,7 +117,7 @@ public class JndiServiceImpl implements JndiService {
}
if (o instanceof Context) {
StringBuilder sb = new StringBuilder();
- sb.append("/" + pair.getName());
+ sb.append("/").append(pair.getName());
contexts((Context) o, sb, contexts);
}
}
diff --git a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
index 92af642..af38863 100644
--- a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
+++ b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
@@ -493,7 +493,7 @@ public abstract class MavenConfigurationSupport implements Action {
if (repo.getReleases() != null) {
if (!repo.getReleases().isEnabled()) {
- builder.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_DISALLOW_RELEASES);
+ builder.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_DISALLOW_RELEASES);
}
SourceAnd<String> up = updatePolicy(repo.getReleases().getUpdatePolicy());
addPolicy(builder, "".equals(up.val()) ? "never" : up.val(), ServiceConstants.OPTION_RELEASES_UPDATE);
@@ -502,7 +502,7 @@ public abstract class MavenConfigurationSupport implements Action {
}
if (repo.getSnapshots() != null) {
if (repo.getSnapshots().isEnabled()) {
- builder.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
+ builder.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
}
SourceAnd<String> up = updatePolicy(repo.getSnapshots().getUpdatePolicy());
addPolicy(builder, "".equals(up.val()) ? "never" : up.val(), ServiceConstants.OPTION_SNAPSHOTS_UPDATE);
diff --git a/maven/core/src/main/java/org/apache/karaf/maven/command/RepositoryAddCommand.java b/maven/core/src/main/java/org/apache/karaf/maven/command/RepositoryAddCommand.java
index 5ab8092..e0bc57d 100644
--- a/maven/core/src/main/java/org/apache/karaf/maven/command/RepositoryAddCommand.java
+++ b/maven/core/src/main/java/org/apache/karaf/maven/command/RepositoryAddCommand.java
@@ -117,15 +117,15 @@ public class RepositoryAddCommand extends RepositoryEditCommandSupport {
StringBuilder sb = new StringBuilder();
sb.append(urlResolved.val());
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_ID + "=").append(id);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_ID).append("=").append(id);
if (snapshots) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
}
if (noReleases) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_DISALLOW_RELEASES);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_DISALLOW_RELEASES);
}
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_UPDATE + "=").append(updatePolicy);
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_CHECKSUM + "=").append(checksumPolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_UPDATE).append("=").append(updatePolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_CHECKSUM).append("=").append(checksumPolicy);
MavenRepositoryURL newRepository = new MavenRepositoryURL(sb.toString());
List<MavenRepositoryURL> newRepos = new LinkedList<>(Arrays.asList(pidRepos));
diff --git a/maven/core/src/main/java/org/apache/karaf/maven/core/MavenRepositoryURL.java b/maven/core/src/main/java/org/apache/karaf/maven/core/MavenRepositoryURL.java
index 7bc5a73..28b4a7b 100644
--- a/maven/core/src/main/java/org/apache/karaf/maven/core/MavenRepositoryURL.java
+++ b/maven/core/src/main/java/org/apache/karaf/maven/core/MavenRepositoryURL.java
@@ -403,41 +403,41 @@ public class MavenRepositoryURL
sb.append(m_repositoryURL.toString());
if (m_id != null) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_ID + "=" + m_id);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_ID).append("=").append(m_id);
}
if (!m_releasesEnabled) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_DISALLOW_RELEASES);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_DISALLOW_RELEASES);
}
if (m_snapshotsEnabled) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_ALLOW_SNAPSHOTS);
}
if (m_releasesEnabled) {
if (!m_snapshotsEnabled) {
if (m_releasesUpdatePolicy != null) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_RELEASES_UPDATE + "=" + m_releasesUpdatePolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_RELEASES_UPDATE).append("=").append(m_releasesUpdatePolicy);
}
if (m_releasesChecksumPolicy != null) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_RELEASES_CHECKSUM + "=" + m_releasesChecksumPolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_RELEASES_CHECKSUM).append("=").append(m_releasesChecksumPolicy);
}
}
}
if (m_snapshotsEnabled) {
if (!m_releasesEnabled) {
if (m_snapshotsUpdatePolicy != null) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_SNAPSHOTS_UPDATE + "=" + m_snapshotsUpdatePolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_SNAPSHOTS_UPDATE).append("=").append(m_snapshotsUpdatePolicy);
}
if (m_snapshotsChecksumPolicy != null) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_SNAPSHOTS_CHECKSUM + "=" + m_snapshotsChecksumPolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_SNAPSHOTS_CHECKSUM).append("=").append(m_snapshotsChecksumPolicy);
}
}
}
if (m_snapshotsEnabled && m_releasesEnabled) {
// compact snapshots & release update & checksum policies
if (m_releasesUpdatePolicy != null && Objects.equals(m_releasesUpdatePolicy, m_snapshotsUpdatePolicy)) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_UPDATE + "=" + m_releasesUpdatePolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_UPDATE).append("=").append(m_releasesUpdatePolicy);
}
if (m_releasesChecksumPolicy != null && Objects.equals(m_releasesChecksumPolicy, m_snapshotsChecksumPolicy)) {
- sb.append(ServiceConstants.SEPARATOR_OPTIONS + ServiceConstants.OPTION_CHECKSUM + "=" + m_releasesChecksumPolicy);
+ sb.append(ServiceConstants.SEPARATOR_OPTIONS).append(ServiceConstants.OPTION_CHECKSUM).append("=").append(m_releasesChecksumPolicy);
}
}
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
index 0000b91..7a9c9d0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/impl/Converters.java
@@ -76,7 +76,7 @@ public class Converters implements Converter
String del = "";
for (String s : list)
{
- sb.append(del + getShortName(s));
+ sb.append(del).append(getShortName(s));
del = " | ";
}
return sb;
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
index e52247f..8f5b14c 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/Converters.java
@@ -78,7 +78,7 @@ public class Converters implements Converter
String del = "";
for (String s : list)
{
- sb.append(del + getShortName(s));
+ sb.append(del).append(getShortName(s));
del = " | ";
}
return sb;