You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/09/15 09:59:34 UTC
[2/2] karaf git commit: Optimize string operations
Optimize string operations
# Conflicts:
# features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/356b839f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/356b839f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/356b839f
Branch: refs/heads/karaf-4.0.x
Commit: 356b839f1260d5f60356d4c9842582e63c32e741
Parents: 5aa6a38
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Sep 15 08:01:25 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Sep 15 11:49:51 2017 +0200
----------------------------------------------------------------------
.../org/apache/karaf/features/internal/model/Feature.java | 8 ++++----
.../org/apache/karaf/features/internal/region/Subsystem.java | 2 +-
.../karaf/features/internal/service/FeaturesServiceImpl.java | 8 +++++---
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/356b839f/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
index 8ea59f1..938eacc 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/model/Feature.java
@@ -124,10 +124,10 @@ public class Feature extends Content implements org.apache.karaf.features.Featur
public static org.apache.karaf.features.Feature valueOf(String str) {
- if (str.contains(VERSION_SEPARATOR)) {
- String strName = str.substring(0, str.indexOf(VERSION_SEPARATOR));
- String strVersion = str.substring(str.indexOf(VERSION_SEPARATOR)
- + VERSION_SEPARATOR.length(), str.length());
+ int idx = str.indexOf(VERSION_SEPARATOR);
+ if (idx >= 0) {
+ String strName = str.substring(0, idx);
+ String strVersion = str.substring(idx + VERSION_SEPARATOR.length(), str.length());
return new Feature(strName, strVersion);
} else {
return new Feature(str);
http://git-wip-us.apache.org/repos/asf/karaf/blob/356b839f/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
index ae7e769..445f7b9 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
@@ -229,7 +229,7 @@ public class Subsystem extends ResourceImpl {
}
public void require(String requirement) throws BundleException {
- int idx = requirement.indexOf(":");
+ int idx = requirement.indexOf(':');
String type, req;
if (idx >= 0) {
type = requirement.substring(0, idx);
http://git-wip-us.apache.org/repos/asf/karaf/blob/356b839f/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
index b60a8fe..4f3e0e5 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/service/FeaturesServiceImpl.java
@@ -97,6 +97,8 @@ import org.osgi.service.resolver.Resolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.karaf.features.internal.model.Feature.DEFAULT_VERSION;
+import static org.apache.karaf.features.internal.model.Feature.VERSION_SEPARATOR;
import static org.apache.karaf.features.internal.service.StateStorage.toStringStringSetMap;
import static org.apache.karaf.features.internal.util.MapUtils.add;
import static org.apache.karaf.features.internal.util.MapUtils.addToMapSet;
@@ -1056,10 +1058,10 @@ public class FeaturesServiceImpl implements FeaturesService, Deployer.DeployCall
}
protected String normalize(String feature) {
- if (!feature.contains("/")) {
- feature += "/0.0.0";
+ int idx = feature.indexOf(VERSION_SEPARATOR);
+ if (idx < 0) {
+ return feature + VERSION_SEPARATOR + DEFAULT_VERSION;
}
- int idx = feature.indexOf("/");
String name = feature.substring(0, idx);
String version = feature.substring(idx + 1);
return name + "/" + VersionCleaner.clean(version);