You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2021/04/26 07:15:47 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
SLING-10329 : Remove dependency to Plexus StringUtils
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new 39ee642 SLING-10329 : Remove dependency to Plexus StringUtils
39ee642 is described below
commit 39ee6425ecfaa80092381c8e739a77e49d3b581b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 26 09:15:34 2021 +0200
SLING-10329 : Remove dependency to Plexus StringUtils
---
.../cpconverter/handlers/AbstractContentPackageHandler.java | 5 ++---
.../feature/cpconverter/handlers/BundleEntryHandler.java | 11 ++++++-----
.../cpconverter/handlers/XmlConfigurationEntryHandler.java | 5 ++---
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractContentPackageHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractContentPackageHandler.java
index efd8ebf..abc5608 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractContentPackageHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/AbstractContentPackageHandler.java
@@ -28,7 +28,6 @@ import org.apache.jackrabbit.vault.fs.io.Archive;
import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
-import org.codehaus.plexus.util.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -83,9 +82,9 @@ public abstract class AbstractContentPackageHandler extends AbstractRegexEntryHa
+ "' but it does not, currently");
}
- if (StringUtils.isNotBlank(matcher.group(1))) {
+ runMode = matcher.group(1);
+ if (runMode != null) {
// there is a specified RunMode
- runMode = matcher.group(1);
logger.debug("Runmode {} was extracted from path {}", runMode, path);
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
index 8de7ae5..fa48113 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/BundleEntryHandler.java
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.vault.fs.io.Archive.Entry;
import org.apache.sling.feature.ArtifactId;
import org.apache.sling.feature.cpconverter.ContentPackage2FeatureModelConverter;
import org.apache.sling.feature.cpconverter.artifacts.InputStreamArtifactWriter;
-import org.codehaus.plexus.util.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.osgi.framework.Constants;
import org.osgi.framework.Version;
@@ -96,15 +95,17 @@ public final class BundleEntryHandler extends AbstractRegexEntryHandler {
throw new IllegalStateException("OSGi bundles are only considered if placed below a folder called 'install', but the bundle at '"+ path + "' is placed outside!");
}
- if (StringUtils.isNotBlank(matcher.group("runmode"))) {
+
+ runMode = matcher.group("runmode");
+ if (runMode != null) {
// there is a specified RunMode
- runMode = matcher.group("runmode");
logger.debug("Runmode {} was extracted from path {}", runMode, path);
}
- if (StringUtils.isNotBlank(matcher.group("startlevel"))) {
+ final String value = matcher.group("startlevel");
+ if (value != null) {
// there is a specified Start Level
- startLevel = Integer.parseInt(matcher.group("startlevel")); // NumberFormatException impossible due to RegEx
+ startLevel = Integer.parseInt(value); // NumberFormatException impossible due to RegEx
logger.debug("Start level {} was extracted from path {}", startLevel, path);
}
diff --git a/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java b/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
index 3500c6d..d9054b0 100644
--- a/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
+++ b/src/main/java/org/apache/sling/feature/cpconverter/handlers/XmlConfigurationEntryHandler.java
@@ -28,7 +28,6 @@ import org.apache.felix.cm.json.Configurations;
import org.apache.jackrabbit.util.ISO8601;
import org.apache.jackrabbit.vault.util.DocViewProperty;
import org.apache.sling.feature.cpconverter.shared.AbstractJcrNodeParser;
-import org.codehaus.plexus.util.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.xml.sax.Attributes;
@@ -93,7 +92,7 @@ public final class XmlConfigurationEntryHandler extends AbstractConfigurationEnt
case PropertyType.DOUBLE:
value = strValues.stream().map(s -> {
Double res = null;
- if (StringUtils.isNotEmpty(s)) {
+ if (!s.isEmpty()) {
res = Double.parseDouble(s);
}
return res;
@@ -102,7 +101,7 @@ public final class XmlConfigurationEntryHandler extends AbstractConfigurationEnt
case PropertyType.LONG:
value = strValues.stream().map(s -> {
Long res = null;
- if (StringUtils.isNotEmpty(s)) {
+ if (!s.isEmpty()) {
res = Long.parseLong(s);
}
return res;